chore: bump version to 0.13.4

* docs(concepts): document the spec-of-specs feature breakdown approach (#3423)

Add a dedicated "Spec of Specs" concept page describing how to decompose a
large feature into a roadmap of smaller, independently-specified sub-features
using the existing Spec Kit flow. Covers the roadmap pass, the roadmap
artifact template, specifying each sub-feature, bidirectional sub-spec/roadmap
linking, keeping them in sync, a worked example, and optional automation.

Link the new page from the "Handling Complex Features" decomposition section
and add it to the docs table of contents.

Closes #3423

Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous)
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: f236bc38-a7c6-4063-a79c-6ba81aa685b5

* Potential fix for pull request finding

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

---------

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

.devcontainer/post-create.sh

@@ -97,6 +97,17 @@ echo -e "\n🤖 Installing CodeBuddy CLI..."
 run_command "npm install -g @tencent-ai/codebuddy-code@latest"
 echo "✅ Done"
 
+echo -e "\n🤖 Installing Factory Droid CLI..."
+run_command "npm install -g droid@latest"
+
+if ! command -v droid >/dev/null 2>&1; then
+  echo -e "\033[0;31m[ERROR] Droid CLI installation did not create 'droid' in PATH.\033[0m" >&2
+  exit 1
+fi
+
+run_command "droid --version > /dev/null"
+echo "✅ Done"
+
 # Installing UV (Python package manager)
 echo -e "\n🐍 Installing UV - Python Package Manager..."
 run_command "pipx install uv"

.github/ISSUE_TEMPLATE/agent_request.yml

@@ -8,7 +8,7 @@ body:
       value: |
         Thanks for requesting a new agent! Before submitting, please check if the agent is already supported.
 
-        **Currently supported agents**: Amp, Antigravity, Auggie CLI, Claude Code, Cline, CodeBuddy, Codex CLI, Cursor, Devin for Terminal, Firebender, Forge, Gemini CLI, GitHub Copilot, Goose, Grok Build, 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
+        **Currently supported agents**: Amp, Antigravity, Auggie CLI, Claude Code, Cline, CodeBuddy, Codex CLI, Cursor, Devin for Terminal, Factory Droid, Firebender, Forge, Gemini CLI, GitHub Copilot, Goose, Grok Build, 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
 
   - type: input
     id: agent-name

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -71,6 +71,7 @@ body:
         - Codex CLI
         - Cursor
         - Devin for Terminal
+        - Factory Droid
         - Firebender
         - Forge
         - Gemini CLI

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -65,6 +65,7 @@ body:
         - Codex CLI
         - Cursor
         - Devin for Terminal
+        - Factory Droid
         - Firebender
         - Forge
         - Gemini CLI

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 <!-- insert new changelog below this comment -->
 
+## [0.13.4] - 2026-07-22
+
+### Changed
+
+- docs(concepts): document the spec-of-specs feature breakdown approach (#3648)
+- fix(scripts): git-ext PowerShell emits the '# To persist' SPECIFY_FEATURE hint (parity) (#3632)
+- fix(integrations): validate cached catalog shape before returning it (#3627)
+- fix(bundler): reject non-list 'catalogs' in bundle-catalogs.yml with a clean error (#3623)
+- fix(bundler): guard lazy .hostname ValueError in catalog add_source (#3644)
+- Add Intake Authoring Governance preset to community catalog (#3643)
+- feat: add Factory Droid CLI integration (#822) (#3587)
+- docs(installation): document the 'py' (Python) script type (#3640)
+- fix(init): show hyphenated /speckit-<name> in Next Steps for Forge projects (#3642)
+- fix(extensions): render hyphenated hook invocations for Forge projects (#3641)
+- fix(workflows): workflow add detects local YAML files case-insensitively (#3633)
+- fix(workflows): list-literal expression ignores trailing/empty commas (#3631)
+- fix(workflows): StepRegistry.add tolerates a corrupted non-dict existing entry (#3630)
+- fix(bundler): reject non-mapping 'integration' in a bundle manifest (#3629)
+- fix(workflows): command/prompt steps fail cleanly on a non-string integration (#3626)
+- docs(core): document the 'py' (Python) --script type in the init option table (#3625)
+- fix(workflows): gate prompt uses isdecimal() so a superscript digit doesn't crash (#3624)
+- fix(integrations): Cline dispatches hyphenated /speckit-<cmd> invocations (#3622)
+- docs(upgrade): document integration upgrade / extension update as the project-files upgrade path (#3326)
+- chore: release 0.13.3, begin 0.13.4.dev0 development (#3645)
+
 ## [0.13.3] - 2026-07-22
 
 ### Changed

docs/community/presets.md

@@ -19,6 +19,7 @@ The following community-contributed presets customize how Spec Kit behaves — o
 | Explicit Task Dependencies | Adds explicit `(depends on T###)` dependency declarations and an Execution Wave DAG to tasks.md for parallel scheduling | 1 template, 1 command | — | [spec-kit-preset-explicit-task-dependencies](https://github.com/Quratulain-bilal/spec-kit-preset-explicit-task-dependencies) |
 | Fiction Book Writing | It adapts the Spec-Driven Development workflow for storytelling to create books or audiobooks (with annotations) in 12 languages: features become story elements, specs become story briefs, plans become story structures, and tasks become scene-by-scene writing tasks. Supports single and multi-POV, all major plot structure frameworks, and two style modes: an author voice sample or humanized AI prose principles. Supports interactive elements like brainstorming, interview, roleplay, and extras like statistics, cover builder, illustration builder, and bio command. Export with templates for KDP, D2D, etc. | 26 templates, 34 commands, 2 scripts | — | [speckit-preset-fiction-book-writing](https://github.com/adaumann/speckit-preset-fiction-book-writing) |
 | Game Narrative Writing | Preset for game narrative design and interactive storytelling. It adapts the Spec-Driven Development workflow for game narratives: features become story mechanics, specs become narrative briefs, plans become story maps, and tasks become dialogue and scene-writing tasks. Supports branching narratives, player agency systems, state machines, and interactive dialogue trees. | 37 templates, 34 commands, 5 scripts | — | [speckit-preset-game-narrative-writing](https://github.com/adaumann/speckit-preset-game-narrative-writing) |
+| Intake Authoring Governance | Creates traceable Spec Kit intake files and receipts from ordered text sources while preserving clarification, update, and delivery-authority boundaries. | 7 templates, 2 commands, 2 scripts | — | [spec-kit-preset-intake-authoring-governance](https://github.com/hindermath/spec-kit-preset-intake-authoring-governance) |
 | Intake Review Governance | Adds hash-bound review, repair, and status gates for single, series, and campaign intake files before interactive, autonomous, or parallel Spec Kit execution. | 8 templates, 3 commands, 2 scripts | — | [spec-kit-preset-intake-review-governance](https://github.com/hindermath/spec-kit-preset-intake-review-governance) |
 | iSAQB Architecture Governance | Adds general iSAQB/CPSA-F and arc42 software-architecture governance, including audit-ready Spec Kit run evidence for architecture goals, views, quality scenarios, ADRs, risks, and technical debt. | 13 templates, 3 commands | — | [spec-kit-preset-isaqb-architecture-governance](https://github.com/hindermath/spec-kit-preset-isaqb-architecture-governance) |
 | Jira Issue Tracking | Overrides `speckit.taskstoissues` to create Jira epics, stories, and tasks instead of GitHub Issues via Atlassian MCP tools | 1 command | — | [spec-kit-preset-jira](https://github.com/luno/spec-kit-preset-jira) |

docs/concepts/complex-features.md

@@ -63,10 +63,14 @@ independently specified sub-features. Each sub-feature gets its own
 `spec.md`, `plan.md`, and `tasks.md`, and runs through its own
 specify/plan/tasks/implement cycle.
 
-This is the "spec of specs" approach: the first iteration breaks a massive
-feature into smaller, self-contained specs that can each be implemented without
-overwhelming the model. It adds the most overhead, so reserve it for features
-that are too large to handle any other way.
+This is the "spec of specs" approach: a first pass breaks a massive feature into
+smaller, self-contained specs that can each be implemented without overwhelming the
+model. It adds the most overhead, so reserve it for features that are too large to
+handle any other way.
+
+See [Spec of Specs](spec-of-specs.md) for the full procedure — how to run the
+roadmap pass, structure the roadmap artifact, link sub-specs back to it, and a worked
+example.
 
 ## Which Approach to Choose
 

docs/concepts/spec-of-specs.md

@@ -0,0 +1,171 @@
+# Spec of Specs
+
+When a feature is too large to run through a single
+`/speckit.specify` → `/speckit.plan` → `/speckit.tasks` → `/speckit.implement`
+cycle without the model losing track mid-implementation, you can break it into a
+**roadmap** of smaller, independently-specified sub-features. This is the "spec of
+specs" approach: one up-front pass decomposes a massive feature into self-contained
+specs, and each of those runs through its own specify/plan/tasks/implement cycle.
+
+> **When to reach for this.** Decomposition adds the most overhead of any strategy
+> in [Handling Complex Features](complex-features.md). Use it **only when the lighter
+> options there are insufficient** — first try limiting how many tasks run per
+> `/speckit.implement` invocation, then sub-agent delegation, then a combination.
+> Reach for a spec of specs only when even a single phase is too large to handle in
+> one run.
+
+The rest of this page describes *how* to do it with the tools you already have. No
+new commands or extensions are required.
+
+## The roadmap pass
+
+Before writing any sub-spec, do a single decomposition pass to produce a roadmap.
+Treat this as a lightweight planning conversation with your agent, not a full spec:
+
+1. **State the whole feature.** Describe the large feature (the "epic") in a
+   sentence or two so the agent has the full picture up front.
+2. **Identify independent slices.** Ask the agent to propose a small set of
+   sub-features that each deliver a coherent piece of the epic and can be specified
+   on their own. Aim for slices that are independently testable — implementing just
+   one should leave you with something demonstrable.
+3. **Draw the boundaries.** For each slice, write one line of intent and an explicit
+   scope boundary (what is in, what is deferred to a sibling slice). Sharp
+   boundaries are what keep each sub-spec small enough to fit in context.
+4. **Order by dependency.** Note which slices depend on others and sequence them so
+   prerequisites come first. Slices with no dependency on each other can be built in
+   any order. To build independent slices in parallel, use separate worktrees so each
+   run has isolated active-feature state.
+5. **Record the result as a roadmap.** Capture the slices in a durable roadmap file
+   (below) so every later sub-spec can point back to it.
+
+The roadmap is deliberately shallow: it names and orders the sub-features but does
+**not** design them. The design happens when each slice runs through its own
+`/speckit.specify`.
+
+## The roadmap artifact
+
+The roadmap is an ordinary Markdown file you author and keep under version control —
+there is no special tooling behind it. Put it where the sub-specs can find it:
+
+- For a feature-scoped epic: `specs/<epic-slug>/roadmap.md`.
+- For a larger, cross-cutting epic: a top-level `ROADMAP.md`.
+
+Each roadmap entry carries a stable id (used later for linking), a name, its intent,
+its scope boundary, its dependencies, a status, and — once the sub-spec exists — a
+link to it. A minimal template:
+
+```markdown
+# Roadmap: <epic name>
+
+<One or two sentences: what the epic is and why it is being decomposed.>
+
+**Status legend**: planned · in-progress · done
+
+| ID | Sub-feature | Intent | Scope boundary | Depends on | Status | Sub-spec |
+|----|-------------|--------|----------------|-----------|--------|----------|
+| R1 | <name>      | <one line> | <in / deferred> | —      | planned | — |
+| R2 | <name>      | <one line> | <in / deferred> | R1     | planned | — |
+| R3 | <name>      | <one line> | <in / deferred> | R1     | planned | — |
+```
+
+Keep the `ID` column immutable once a sub-spec references it — it is the anchor for
+traceability. Fill in the `Sub-spec` column with the path to each sub-feature's spec
+directory as you create it, and update `Status` as work progresses.
+
+## Specifying each sub-feature
+
+With the roadmap in hand, work through the entries one at a time using the normal
+Spec Kit flow — nothing new to learn:
+
+1. Pick the next roadmap entry whose dependencies are already `done` (or have none).
+2. Run `/speckit.specify` for just that slice, describing only its intent and scope
+   from the roadmap entry. Because the slice is bounded, its spec, plan, and tasks
+   stay well within the context window.
+3. Run `/speckit.plan`, `/speckit.tasks`, and `/speckit.implement` for that slice as
+   usual.
+4. Mark the roadmap entry `done` and move to the next one.
+
+Each slice is a complete, independent Spec Kit feature with its own
+`spec.md`/`plan.md`/`tasks.md`. The roadmap is what ties them together.
+
+## Linking sub-specs to the roadmap
+
+To keep scope and intent from drifting across separate runs, every sub-spec
+references its roadmap entry, and the roadmap links back — a simple, greppable,
+bidirectional convention:
+
+- **Sub-spec → roadmap.** In the sub-feature's `spec.md`, name the parent roadmap
+  and entry id in the `Input` / summary line, for example:
+
+  ```markdown
+  **Input**: Parent roadmap: `specs/<epic>/roadmap.md` → entry **R3**. <feature description>
+  ```
+
+- **Roadmap → sub-spec.** In the roadmap table, set the entry's `Sub-spec` column to
+  the sub-feature's directory, e.g. `specs/<epic>-part-3/`.
+
+Because both directions are plain text, you can trace any sub-spec back to its place
+in the epic (and find its siblings) with a quick search — no tooling, no metadata
+schema.
+
+## Keeping the roadmap and sub-specs in sync
+
+The roadmap is a living document. As you learn more, keep it and the sub-specs
+aligned:
+
+- **Roadmap first, then reconcile.** When scope shifts, update the roadmap entry
+  first, then update any sub-specs it affects. The roadmap is the source of truth for
+  how the epic is divided.
+- **Respect dependencies and ordering.** If a slice depends on another, build the
+  prerequisite first and cross-reference the dependent sub-spec so the relationship
+  is visible from both sides.
+- **Recurse when a slice is still too big.** If a sub-feature turns out to be too
+  large to specify in one cycle, give it its own roadmap and decompose it further —
+  the same approach applies one level down. Recursion adds overhead, so only go as
+  deep as the context problem actually requires.
+
+## Worked example
+
+Suppose the epic is **"Add a self-service billing portal"** — far too large for a
+single cycle. The roadmap pass breaks it into three independently-specifiable
+slices.
+
+`specs/billing-portal/roadmap.md`:
+
+```markdown
+# Roadmap: Self-service billing portal
+
+Let customers view invoices, manage payment methods, and change plans without
+contacting support. Too large for one cycle, so it is split into independent slices.
+
+**Status legend**: planned · in-progress · done
+
+| ID | Sub-feature        | Intent                                   | Scope boundary                              | Depends on | Status  | Sub-spec |
+|----|--------------------|------------------------------------------|---------------------------------------------|-----------|---------|----------|
+| R1 | Invoice history    | Customers view and download past invoices | Read-only; no payment actions               | —         | done    | specs/billing-invoices/ |
+| R2 | Payment methods    | Add, remove, and set a default card       | No plan changes; assumes invoices exist     | R1        | in-progress | specs/billing-payment-methods/ |
+| R3 | Plan changes       | Upgrade/downgrade the subscription plan   | Uses R2's default payment method            | R1, R2    | planned | — |
+```
+
+Each slice is then specified on its own. For example, the **R2** sub-feature's
+`spec.md` opens with a back-reference:
+
+```markdown
+# Feature Specification: Billing — payment methods
+
+**Input**: Parent roadmap: `specs/billing-portal/roadmap.md` → entry **R2**.
+Let customers add, remove, and set a default payment method in the billing portal.
+```
+
+From here a reader can trace **R2** back to the roadmap, see that it depends on
+**R1** (invoice history, already `done`), and see that **R3** (plan changes) is
+waiting on it. Building R1, then R2, then R3 keeps every run small while the roadmap
+preserves the shape of the whole epic.
+
+## For automation (optional)
+
+If you would rather automate roadmap capture and consistency checks than maintain
+the file by hand, the community-maintained
+[Spec Roadmap extension](https://github.com/srobroek/speckit-roadmap) explores that
+direction. It is a third-party extension and is not required — the manual convention
+above is enough on its own.

docs/installation.md

@@ -77,9 +77,9 @@ specify init <project_name> --integration pi
 specify init <project_name> --integration omp
 ```
 
-### Specify Script Type (Shell vs PowerShell)
+### Specify Script Type (Shell, PowerShell, or Python)
 
-All automation scripts now have both Bash (`.sh`) and PowerShell (`.ps1`) variants.
+Automation scripts are available as Bash (`.sh`), PowerShell (`.ps1`), and Python (`.py`) variants.
 
 Auto behavior:
 
@@ -92,6 +92,7 @@ Force a specific script type:
 ```bash
 specify init <project_name> --script sh
 specify init <project_name> --script ps
+specify init <project_name> --script py
 ```
 
 ### Ignore Agent Tools Check
@@ -131,6 +132,7 @@ Scripts are installed into a variant subdirectory matching the chosen script typ
 
 - `.specify/scripts/bash/` — contains `.sh` scripts (default on Linux/macOS)
 - `.specify/scripts/powershell/` — contains `.ps1` scripts (default on Windows)
+- `.specify/scripts/python/` — contains `.py` scripts (chosen with `--script py`; also installs the platform shell fallback)
 
 ## Troubleshooting
 

docs/reference/core.md

@@ -12,7 +12,7 @@ specify init [<project_name>]
 | ------------------------ | ------------------------------------------------------------------------ |
 | `--integration <key>`    | AI coding agent integration to use (e.g. `copilot`, `claude`, `gemini`). See the [Integrations reference](integrations.md) for all available keys |
 | `--integration-options`  | Options for the integration (e.g. `--integration-options="--commands-dir .myagent/cmds"`) |
-| `--script sh\|ps`        | Script type: `sh` (bash/zsh) or `ps` (PowerShell)                       |
+| `--script sh\|ps\|py`    | Script type: `sh` (bash/zsh), `ps` (PowerShell), or `py` (Python)       |
 | `--here`                 | Initialize in the current directory instead of creating a new one        |
 | `--force`                | Force merge/overwrite when initializing in an existing directory         |
 | `--ignore-agent-tools`   | Skip checks for AI coding agent CLI tools                                |

docs/reference/integrations.md

@@ -15,6 +15,7 @@ The Specify CLI supports a wide range of AI coding agents. When you run `specify
 | [Codex CLI](https://github.com/openai/codex)                                         | `codex`          | Skills-based integration; installs skills into `.agents/skills` and invokes them as `$speckit-<command>` |
 | [Cursor](https://cursor.sh/)                                                         | `cursor-agent`   |                                                                                                                                           |
 | [Devin for Terminal](https://cli.devin.ai/docs)                                      | `devin`          | Skills-based integration; installs skills into `.devin/skills/` and invokes them as `/speckit-<command>` |
+| [Factory Droid](https://docs.factory.ai/cli/getting-started/overview)               | `droid`          | Skills-based integration; installs skills into `.factory/skills/` and invokes them as `/speckit-<command>`                               |
 | [Firebender](https://firebender.com/)                                                | `firebender`     | IDE-based agent for Android Studio / IntelliJ                                                                                             |
 | [Forge](https://forgecode.dev/)                                                      | `forge`          |                                                                                                                                           |
 | [Gemini CLI](https://github.com/google-gemini/gemini-cli)                            | `gemini`         |                                                                                                                                           |

docs/toc.yml

@@ -55,6 +55,8 @@
       href: concepts/spec-persistence.md
     - name: Handling Complex Features
       href: concepts/complex-features.md
+    - name: Spec of Specs
+      href: concepts/spec-of-specs.md
 
 # Development workflows
 - name: Development

docs/upgrade.md

@@ -12,7 +12,7 @@
 | **CLI Tool — pin a version** | `specify self upgrade --tag vX.Y.Z[suffix]` | Upgrade to a specific release tag instead of the latest stable. Suffixes are limited to dev, alpha/beta/rc, and/or build metadata forms. |
 | **CLI Tool — manual fallback** | `uv tool install specify-cli --force --from git+https://github.com/github/spec-kit.git@vX.Y.Z` | When `specify self upgrade` isn't available (older installs) or when you want explicit control. |
 | **CLI Tool — manual fallback (pipx)** | `pipx install --force git+https://github.com/github/spec-kit.git@vX.Y.Z` | Same as above, for pipx installs. |
-| **Project Files** | `specify init --here --force --integration <your-agent>` | Update slash commands, templates, and scripts in your project |
+| **Project Files** | Run `specify integration upgrade <key>`, then `specify extension update` | Refresh installed integration files and extensions in your project |
 | **Both** | Run CLI upgrade, then project update | Recommended for major version updates |
 
 ---
@@ -89,91 +89,94 @@ specify self check
 
 ## Part 2: Updating Project Files
 
-When Spec Kit releases new features (like new slash commands or updated templates), you need to refresh your project's Spec Kit files.
+When Spec Kit releases new features (like new slash commands, updated templates, or extension changes), you need to refresh the Spec Kit files that were installed into your project.
 
 ### What gets updated?
 
-Running `specify init --here --force` will update:
+For existing Spec Kit projects, use the manifest-aware upgrade path first:
 
-- ✅ **Slash command files** (`.claude/commands/`, `.github/prompts/`, etc.)
-- ✅ **Script files** (`.specify/scripts/`) — **only with `--force`**; without it, only missing files are added
-- ✅ **Template files** (`.specify/templates/`) — **only with `--force`**; without it, only missing files are added
-- ✅ **Shared memory files** (`.specify/memory/`) - **⚠️ See warnings below**
+- ✅ **Integration command/skill files** (`.claude/skills/`, `.github/prompts/`, `.agents/skills/`, etc.)
+- ✅ **Managed shared scripts and templates** (`.specify/scripts/`, `.specify/templates/`) when they are unchanged from the previous managed copy
+- ✅ **Installed extensions** when you run `specify extension update`
+
+The integration upgrade command uses the install manifest to detect local edits. If a managed integration file was modified after install, the command stops and asks you to inspect the change or rerun with `--force`.
 
 ### What stays safe?
 
-These files are **never touched** by the upgrade—the template packages don't even contain them:
+These files are **never touched** by the manifest-aware integration/extension upgrade path:
 
 - ✅ **Your specifications** (`specs/001-my-feature/spec.md`, etc.) - **CONFIRMED SAFE**
 - ✅ **Your implementation plans** (`specs/001-my-feature/plan.md`, `tasks.md`, etc.) - **CONFIRMED SAFE**
+- ✅ **Your constitution** (`.specify/memory/constitution.md`) when using `specify integration upgrade`
 - ✅ **Your source code** - **CONFIRMED SAFE**
 - ✅ **Your git history** - **CONFIRMED SAFE**
 
 The `specs/` directory is completely excluded from template packages and will never be modified during upgrades.
 
-### Update command
+### 1. Check installed integrations
 
 Run this inside your project directory:
 
+```bash
+specify integration status
+```
+
+This reports the default integration, all installed integrations, and any modified or missing managed files. You can also inspect `.specify/integration.json`; installed integrations are listed under `installed_integrations`.
+
+### 2. Upgrade each installed integration
+
+Run this inside your project directory:
+
+```bash
+specify integration upgrade <key>
+```
+
+Replace `<key>` with an installed integration key such as `copilot`, `claude`, or `codex`. In projects with multiple installed integrations, run the command once per installed key.
+
+**Example:**
+
+```bash
+specify integration upgrade claude
+specify integration upgrade codex
+```
+
+See the [integration reference](reference/integrations.md#upgrade-an-integration) for options such as `--script`, `--integration-options`, and `--force`.
+
+### 3. Update installed extensions
+
+Run:
+
+```bash
+specify extension update
+```
+
+With no extension argument, this updates all installed extensions. Use `specify extension update <extension-id-or-name>` to update only one extension. See the [extensions reference](reference/extensions.md#update-extensions) for details.
+
+### Fallback: re-run init
+
+If a project predates manifests, has missing integration metadata, or needs a broader recovery, you can still re-run init:
+
 ```bash
 specify init --here --force --integration <your-agent>
 ```
 
-Replace `<your-agent>` with your AI coding agent. Refer to this list of [Supported AI Coding Agent Integrations](reference/integrations.md)
-
-**Example:**
-
-```bash
-specify init --here --force --integration copilot
-```
-
-### Understanding the `--force` flag
-
-Without `--force`, the CLI warns you and asks for confirmation:
-
-```text
-Warning: Current directory is not empty (25 items)
-Template files will be merged with existing content and may overwrite existing files
-Proceed? [y/N]
-```
-
-With `--force`, it skips the confirmation and proceeds immediately. It also **overwrites shared infrastructure files** (`.specify/scripts/` and `.specify/templates/`) with the latest versions from the installed Spec Kit release.
-
-Without `--force`, shared infrastructure files that already exist are skipped — the CLI will print a warning listing the skipped files so you know which ones were not updated.
-
-**Important: Your `specs/` directory is always safe.** The `--force` flag only affects template files (commands, scripts, templates, memory). Your feature specifications, plans, and tasks in `specs/` are never included in upgrade packages and cannot be overwritten.
-
----
+Use this as an escape hatch rather than the default project-file upgrade path. It refreshes the selected integration and shared project scaffolding, but it does not use the same per-integration manifest checks before overwriting files.
 
 ## ⚠️ Important Warnings
 
-### 1. Constitution file will be overwritten
+### 1. Constitution file and memory customizations
 
-**Known issue:** `specify init --here --force` currently overwrites `.specify/memory/constitution.md` with the default template, erasing any customizations you made.
+`specify integration upgrade <key>` does not update `.specify/memory/constitution.md`.
 
-**Workaround:**
+The fallback `specify init --here --force --integration <your-agent>` path also preserves an existing `.specify/memory/constitution.md`; if the file is missing, init creates it from the current constitution template. You do not need a constitution backup/restore step for the manifest-aware upgrade path.
 
-```bash
-# 1. Back up your constitution before upgrading
-cp .specify/memory/constitution.md .specify/memory/constitution-backup.md
+As with any broad fallback refresh, commit or back up local customizations before using `init --here --force` so you can review the resulting diff.
 
-# 2. Run the upgrade
-specify init --here --force --integration copilot
+### 2. Custom integration, script, or template modifications
 
-# 3. Restore your customized constitution
-mv .specify/memory/constitution-backup.md .specify/memory/constitution.md
-```
+`specify integration upgrade <key>` blocks when manifest-tracked integration files were modified locally, unless you pass `--force`.
 
-Or use git to restore it:
-
-```bash
-# After upgrade, restore from git history
-git restore .specify/memory/constitution.md
-```
-
-### 2. Custom script or template modifications
-
-If you customized files in `.specify/scripts/` or `.specify/templates/`, the `--force` flag will overwrite them. Back them up first:
+Shared scripts and templates are refreshed when they still match the previously recorded managed copy. Local customizations are preserved unless you explicitly use a force/refresh option that overwrites them. If you customized files in `.specify/scripts/` or `.specify/templates/`, commit or back them up first:
 
 ```bash
 # Back up custom templates and scripts
@@ -215,29 +218,29 @@ Restart your IDE to refresh the command list.
 # Upgrade CLI (auto-detects uv tool vs pipx install)
 specify self upgrade
 
-# Update project files to get new commands
-specify init --here --force --integration copilot
+# Inspect installed integrations
+specify integration status
 
-# Restore your constitution if customized
-git restore .specify/memory/constitution.md
+# Update project files to get new commands
+specify integration upgrade <key>
+specify extension update
 ```
 
 ### Scenario 2: "I customized templates and constitution"
 
 ```bash
-# 1. Back up customizations
-cp .specify/memory/constitution.md /tmp/constitution-backup.md
+# 1. Commit or back up customizations
+git status
 cp -r .specify/templates /tmp/templates-backup
 
 # 2. Upgrade CLI
 specify self upgrade
 
-# 3. Update project
-specify init --here --force --integration copilot
+# 3. Use the manifest-aware project update first
+specify integration upgrade <key>
+specify extension update
 
-# 4. Restore customizations
-mv /tmp/constitution-backup.md .specify/memory/constitution.md
-# Manually merge template changes if needed
+# 4. If the upgrade reports modified managed files, inspect the diff before using --force
 ```
 
 ### Scenario 3: "I see duplicate slash commands in my IDE"
@@ -262,14 +265,14 @@ rm speckit.old-command-name.md
 The git extension is now opt-in, so upgrades do not install it unless you add it explicitly.
 
 ```bash
-# Manually back up files you customized
-cp .specify/memory/constitution.md .specify/memory/constitution.backup.md
+# Upgrade CLI
+specify self upgrade
 
-# Run upgrade
-specify init --here --force --integration copilot
+# Refresh integration files and installed extensions
+specify integration upgrade <key>
+specify extension update
 
-# Restore customizations
-mv .specify/memory/constitution.backup.md .specify/memory/constitution.md
+# The git extension is not added unless you run `specify extension add git`
 ```
 
 If you later decide you want the git extension's commands and hooks, install it explicitly:
@@ -315,19 +318,21 @@ Alternatively, run the `/speckit.specify` command which creates `.specify/featur
    - Codex requires `CODEX_HOME` environment variable
    - Some agents need workspace restart or cache clearing
 
-### "I lost my constitution customizations"
+### "Will init overwrite my constitution customizations?"
 
-**Fix:** Restore from git or backup:
+Current `specify init --here --force` preserves an existing `.specify/memory/constitution.md`; it creates the file from the template only when it is missing.
+
+If you previously lost constitution changes through an older workflow or manual replacement, restore from git or backup:
 
 ```bash
-# If you committed before upgrading
+# If you committed the customized constitution
 git restore .specify/memory/constitution.md
 
 # If you backed up manually
 cp /tmp/constitution-backup.md .specify/memory/constitution.md
 ```
 
-**Prevention:** Always commit or back up `constitution.md` before upgrading.
+**Prevention:** Use `specify integration upgrade <key>` for routine project-file updates. If you need the fallback `specify init --here --force` path, commit first so you can review the full diff afterward.
 
 ### "Warning: Current directory is not empty"
 
@@ -354,7 +359,7 @@ Only Spec Kit infrastructure files:
 - Agent command files (`.claude/commands/`, `.github/prompts/`, etc.)
 - Scripts in `.specify/scripts/`
 - Templates in `.specify/templates/`
-- Memory files in `.specify/memory/` (including constitution)
+- Missing memory files such as `.specify/memory/constitution.md` may be created from templates; an existing constitution is preserved
 
 **What stays untouched:**
 
@@ -365,7 +370,7 @@ Only Spec Kit infrastructure files:
 
 **How to respond:**
 
-- **Type `y` and press Enter** - Proceed with the merge (recommended if upgrading)
+- **Type `y` and press Enter** - Proceed with the merge when using the fallback init path
 - **Type `n` and press Enter** - Cancel the operation
 - **Use `--force` flag** - Skip this confirmation entirely:
 
@@ -375,11 +380,11 @@ Only Spec Kit infrastructure files:
 
 **When you see this warning:**
 
-- ✅ **Expected** when upgrading an existing Spec Kit project
+- ✅ **Expected** when using the fallback init path in an existing Spec Kit project
 - ✅ **Expected** when adding Spec Kit to an existing codebase
 - ⚠️ **Unexpected** if you thought you were creating a new project in an empty directory
 
-**Prevention tip:** Before upgrading, commit or back up your `.specify/memory/constitution.md` if you customized it.
+**Prevention tip:** Before using the fallback init path, commit your current work so any refreshed files are easy to review or restore.
 
 ### "CLI upgrade doesn't seem to work"
 
@@ -418,14 +423,15 @@ uv tool install specify-cli --from git+https://github.com/github/spec-kit.git
 
 ### "Do I need to run specify every time I open my project?"
 
-**Short answer:** No, you only run `specify init` once per project (or when upgrading).
+**Short answer:** No, you only run `specify init` once per project, or later as a fallback recovery path.
 
 **Explanation:**
 
 The `specify` CLI tool is used for:
 
 - **Initial setup:** `specify init` to bootstrap Spec Kit in your project
-- **Upgrades:** `specify init --here --force` to update templates and commands
+- **Routine project-file upgrades:** `specify integration upgrade <key>` and `specify extension update`
+- **Fallback recovery:** `specify init --here --force` when integration metadata is missing or the manifest-aware path cannot be used
 - **Diagnostics:** `specify check` to verify tool installation
 
 Once you've run `specify init`, the slash commands (like `/speckit.specify`, `/speckit.plan`, etc.) are **permanently installed** in your project's agent folder (`.claude/`, `.github/prompts/`, `.pi/prompts/`, `.omp/commands/`, etc.). Your AI coding agent reads these command files directly—no need to run `specify` again.

extensions/git/scripts/powershell/create-new-feature-branch.ps1

@@ -565,6 +565,12 @@ if (-not $DryRun) {
     $env:SPECIFY_FEATURE = $branchName
 }
 
+# Build the PowerShell-idiomatic persist hint, mirroring the core
+# create-new-feature.ps1 twin (and the bash/python twins of this script), which
+# all emit "# To persist in your shell: ...".
+$quotedBranchName = "'" + $branchName.Replace("'", "''") + "'"
+$featureAssignment = '$env:SPECIFY_FEATURE = ' + $quotedBranchName
+
 if ($Json) {
     $obj = [PSCustomObject]@{
         BRANCH_NAME = $branchName
@@ -581,6 +587,6 @@ if ($Json) {
     Write-Output "BRANCH_NAME: $branchName"
     Write-Output "FEATURE_NUM: $featureNum"
     if (-not $DryRun) {
-        Write-Output "SPECIFY_FEATURE environment variable set to: $branchName"
+        Write-Output "# To persist in your shell: $featureAssignment"
     }
 }

integrations/catalog.json

@@ -1,6 +1,6 @@
 {
   "schema_version": "1.0",
-  "updated_at": "2026-07-15T00:00:00Z",
+  "updated_at": "2026-07-17T00:00:00Z",
   "catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/integrations/catalog.json",
   "integrations": {
     "claude": {
@@ -48,6 +48,15 @@
       "repository": "https://github.com/github/spec-kit",
       "tags": ["ide"]
     },
+    "droid": {
+      "id": "droid",
+      "name": "Factory Droid",
+      "version": "1.0.0",
+      "description": "Factory Droid CLI skills-based integration",
+      "author": "spec-kit-core",
+      "repository": "https://github.com/github/spec-kit",
+      "tags": ["cli", "skills", "factory"]
+    },
     "amp": {
       "id": "amp",
       "name": "Amp",

presets/catalog.community.json

@@ -364,6 +364,35 @@
       "created_at": "2026-05-05T08:00:00Z",
       "updated_at": "2026-06-22T00:00:00Z"
     },
+    "intake-authoring-governance": {
+      "name": "Intake Authoring Governance",
+      "id": "intake-authoring-governance",
+      "version": "0.1.0",
+      "description": "Creates traceable Spec Kit intake files and receipts from ordered text sources while preserving clarification, update, and delivery-authority boundaries.",
+      "author": "Thorsten Hindermann",
+      "repository": "https://github.com/hindermath/spec-kit-preset-intake-authoring-governance",
+      "download_url": "https://github.com/hindermath/spec-kit-preset-intake-authoring-governance/archive/refs/tags/v0.1.0.zip",
+      "homepage": "https://github.com/hindermath/spec-kit-preset-intake-authoring-governance",
+      "documentation": "https://github.com/hindermath/spec-kit-preset-intake-authoring-governance/blob/v0.1.0/README.md",
+      "license": "MIT",
+      "requires": {
+        "speckit_version": ">=0.8.3"
+      },
+      "provides": {
+        "templates": 7,
+        "commands": 2,
+        "scripts": 2
+      },
+      "tags": [
+        "intake",
+        "authoring",
+        "governance",
+        "traceability",
+        "clarification"
+      ],
+      "created_at": "2026-07-22T00:00:00Z",
+      "updated_at": "2026-07-22T00:00:00Z"
+    },
     "intake-review-governance": {
       "name": "Intake Review Governance",
       "id": "intake-review-governance",

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "specify-cli"
-version = "0.13.3"
+version = "0.13.4"
 description = "Specify CLI, part of GitHub Spec Kit. A tool to bootstrap your projects for Spec-Driven Development (SDD)."
 readme = "README.md"
 requires-python = ">=3.11"

src/specify_cli/bundler/commands_impl/catalog_config.py

@@ -143,6 +143,13 @@ def add_source(
         raise BundlerError("A catalog url is required.")
     try:
         parsed = urlparse(url)
+        # Read .hostname inside the try: a bracketed-but-invalid IPv6 authority
+        # (e.g. "https://[not-an-ip]/c.json") parses cleanly under urlparse() on
+        # Python < 3.14 but raises ValueError lazily on the first .hostname access
+        # (the raise moved eager into urlparse() only in 3.14). Reading it here
+        # keeps that ValueError inside the guard instead of leaking a raw
+        # traceback past the CLI's `except BundlerError`. Reuse the value below.
+        hostname = parsed.hostname
     except ValueError as exc:
         raise BundlerError(f"Invalid catalog url: '{url}'.") from exc
     if not (parsed.scheme or parsed.path):
@@ -161,13 +168,13 @@ def add_source(
         # netloc — netloc is truthy for host-less URLs like "https://:8080"
         # or "https://user@". Validating here keeps junk out of
         # bundle-catalogs.yml instead of failing later at fetch time.
-        is_localhost = parsed.hostname in ("localhost", "127.0.0.1", "::1")
+        is_localhost = hostname in ("localhost", "127.0.0.1", "::1")
         if parsed.scheme.lower() != "https" and not is_localhost:
             raise BundlerError(
                 f"Catalog url must use HTTPS (got {parsed.scheme}://). "
                 "HTTP is only allowed for localhost."
             )
-        if not parsed.hostname:
+        if not hostname:
             raise BundlerError(f"Catalog url must be a valid URL with a host: {url}")
 
     url = _canonicalize_url(url)

src/specify_cli/bundler/models/catalog.py

@@ -251,8 +251,22 @@ def _merge_config(by_id: dict[str, CatalogSource], config_path: Path, scope: Sco
         return
     data = load_yaml(config_path)
     catalogs = data.get("catalogs") if isinstance(data, dict) else None
-    if not catalogs:
+    if catalogs is None:
         return
+    if not isinstance(catalogs, list):
+        # Treat only an absent/``None`` ``catalogs`` as "nothing to merge"; any
+        # other non-list value (``catalogs: 5``, ``false``, ``0``, ``''``,
+        # ``{}``) is a malformed config and must raise, not be silently skipped
+        # by a falsy check. Otherwise a truthy scalar would raise a raw
+        # ``TypeError: 'int' object is not iterable`` from the loop below, while
+        # falsy non-lists would be swallowed. Report the same actionable
+        # BundlerError the sibling reader of this file raises
+        # (commands_impl/catalog_config.py) so both readers of
+        # bundle-catalogs.yml agree. An empty list stays valid (loop is a no-op).
+        raise BundlerError(
+            f"Malformed catalog config at {config_path}: 'catalogs' must be a "
+            f"list, got {type(catalogs).__name__}."
+        )
     for raw in catalogs:
         src = CatalogSource.from_dict(raw, scope)
         by_id[src.id] = src

src/specify_cli/bundler/models/manifest.py

@@ -122,6 +122,11 @@ class BundleManifest:
 
         integration = None
         integration_raw = data.get("integration")
+        # Mirror the requires/provides guards above: a present-but-non-mapping
+        # 'integration' (e.g. a bare string "copilot") was silently dropped,
+        # leaving the bundle wrongly integration-agnostic. Reject it instead.
+        if integration_raw is not None and not isinstance(integration_raw, dict):
+            raise BundlerError("'integration' must be a mapping when present.")
         if isinstance(integration_raw, dict) and integration_raw.get("id"):
             integration = IntegrationRef(id=str(integration_raw["id"]).strip())
 

src/specify_cli/commands/init.py

@@ -700,6 +700,7 @@ def register(app: typer.Typer) -> None:
         zed_skill_mode = selected_ai == "zed" and _is_skills_integration
         grok_skill_mode = selected_ai == "grok" and _is_skills_integration
         cline_skill_mode = selected_ai == "cline"
+        forge_skill_mode = selected_ai == "forge"
         bob_skill_mode = selected_ai == "bob" and _is_skills_integration
         native_skill_mode = (
             codex_skill_mode
@@ -776,6 +777,7 @@ def register(app: typer.Typer) -> None:
             if (
                 _is_slash_skills_agent(selected_ai, _ai_skills_enabled)
                 or cline_skill_mode
+                or forge_skill_mode
             ):
                 return f"/speckit-{name}"
             return f"/speckit.{name}"

src/specify_cli/extensions/__init__.py

@@ -3608,6 +3608,7 @@ class HookExecutor:
         dollar_skill_mode = is_dollar_skills_agent(selected_ai, ai_skills_enabled)
         kimi_skill_mode = selected_ai == "kimi"
         cline_mode = selected_ai == "cline"
+        forge_mode = selected_ai == "forge"
 
         skill_name = self._skill_name_from_command(command_id)
         if dollar_skill_mode and skill_name:
@@ -3618,6 +3619,10 @@ class HookExecutor:
             from ..integrations.cline import format_cline_command_name
 
             return f"/{format_cline_command_name(command_id)}"
+        if forge_mode:
+            from ..integrations.forge import format_forge_command_name
+
+            return f"/{format_forge_command_name(command_id)}"
 
         use_slash = is_slash_skills_agent(selected_ai, ai_skills_enabled)
 

src/specify_cli/integrations/__init__.py

@@ -58,6 +58,7 @@ def _register_builtins() -> None:
     from .copilot import CopilotIntegration
     from .cursor_agent import CursorAgentIntegration
     from .devin import DevinIntegration
+    from .droid import DroidIntegration
     from .firebender import FirebenderIntegration
     from .forge import ForgeIntegration
     from .gemini import GeminiIntegration
@@ -95,6 +96,7 @@ def _register_builtins() -> None:
     _register(CopilotIntegration())
     _register(CursorAgentIntegration())
     _register(DevinIntegration())
+    _register(DroidIntegration())
     _register(FirebenderIntegration())
     _register(ForgeIntegration())
     _register(GeminiIntegration())

src/specify_cli/integrations/catalog.py

@@ -40,6 +40,25 @@ class IntegrationDescriptorError(Exception):
     """Raised when an integration.yml descriptor is invalid."""
 
 
+def _catalog_shape_error(payload: Any) -> Optional[str]:
+    """Return a human-readable reason if *payload* is not a valid integration
+    catalog document, else ``None``.
+
+    Shared by the fresh-fetch and cache-read paths so both enforce the same
+    format contract: a JSON object carrying ``schema_version`` and a mapping
+    ``integrations``. Keeping a single validator prevents the two paths from
+    drifting (e.g. a cache that skips the ``schema_version`` check and lets an
+    older/poisoned payload bypass validation).
+    """
+    if not isinstance(payload, dict):
+        return "expected a JSON object"
+    if "schema_version" not in payload or "integrations" not in payload:
+        return "missing required 'schema_version' or 'integrations' key"
+    if not isinstance(payload.get("integrations"), dict):
+        return "'integrations' must be a JSON object"
+    return None
+
+
 # ---------------------------------------------------------------------------
 # IntegrationCatalogEntry
 # ---------------------------------------------------------------------------
@@ -153,7 +172,18 @@ class IntegrationCatalog(CatalogStackBase):
                     cached_at = cached_at.replace(tzinfo=timezone.utc)
                 age = (datetime.now(timezone.utc) - cached_at).total_seconds()
                 if age < self.CACHE_DURATION:
-                    return json.loads(cache_file.read_text(encoding="utf-8"))
+                    cached = json.loads(cache_file.read_text(encoding="utf-8"))
+                    # A poisoned/older-format cache must clear the SAME shape
+                    # contract as a fresh fetch (via the shared validator) —
+                    # otherwise a payload like [], {"integrations": []}, or one
+                    # missing "schema_version" is returned and later crashes on
+                    # .items()/.get() or silently bypasses the format contract.
+                    # The ValueError is caught just below, which drops the
+                    # corrupt cache and refetches from source.
+                    shape_error = _catalog_shape_error(cached)
+                    if shape_error is not None:
+                        raise ValueError(f"cached catalog has invalid shape: {shape_error}")
+                    return cached
             except (json.JSONDecodeError, ValueError, KeyError, TypeError, AttributeError, OSError, UnicodeError):
                 # Cache is invalid or stale metadata; delete and refetch from source.
                 try:
@@ -172,20 +202,10 @@ class IntegrationCatalog(CatalogStackBase):
                     self._validate_catalog_url(final_url)
                 catalog_data = json.loads(resp.read())
 
-            if not isinstance(catalog_data, dict):
+            shape_error = _catalog_shape_error(catalog_data)
+            if shape_error is not None:
                 raise IntegrationCatalogError(
-                    f"Invalid catalog format from {entry.url}: expected a JSON object"
-                )
-            if (
-                "schema_version" not in catalog_data
-                or "integrations" not in catalog_data
-            ):
-                raise IntegrationCatalogError(
-                    f"Invalid catalog format from {entry.url}"
-                )
-            if not isinstance(catalog_data.get("integrations"), dict):
-                raise IntegrationCatalogError(
-                    f"Invalid catalog format from {entry.url}: 'integrations' must be a JSON object"
+                    f"Invalid catalog format from {entry.url}: {shape_error}"
                 )
 
             try:

src/specify_cli/integrations/cline/__init__.py

@@ -77,6 +77,19 @@ class ClineIntegration(MarkdownIntegration):
         """Cline uses hyphenated filenames (e.g. speckit-git-commit.md)."""
         return format_cline_command_name(template_name) + ".md"
 
+    def build_command_invocation(self, command_name: str, args: str = "") -> str:
+        """Cline installs hyphenated slash-commands (``/speckit-<name>``), so the
+        dispatch invocation must match. The inherited MarkdownIntegration default
+        builds the dotted ``/speckit.<name>``, which references a command Cline
+        never registered. Reuse the same hyphenation as command_filename /
+        the injected frontmatter name (see ``format_cline_command_name``),
+        mirroring the forge integration.
+        """
+        invocation = "/" + format_cline_command_name(command_name)
+        if args:
+            invocation = f"{invocation} {args}"
+        return invocation
+
     def process_template(self, *args, **kwargs):
         """Ensure shared templates render Cline command references with hyphens."""
         kwargs.setdefault("invoke_separator", self.invoke_separator)

src/specify_cli/integrations/droid/__init__.py

@@ -0,0 +1,135 @@
+"""Factory Droid CLI integration — skills-based agent.
+
+Droid discovers project skills from
+``.factory/skills/speckit-<name>/SKILL.md``. Spec Kit installs into that
+native tree so the generated skills are visible to Droid without extra
+configuration.
+
+See: https://docs.factory.ai/cli/configuration/skills
+"""
+
+from __future__ import annotations
+
+from ..base import SkillsIntegration
+
+
+class DroidIntegration(SkillsIntegration):
+    """Integration for Factory Droid CLI."""
+
+    key = "droid"
+    config = {
+        "name": "Factory Droid",
+        "folder": ".factory/",
+        "commands_subdir": "skills",
+        "install_url": "https://docs.factory.ai/cli/getting-started/overview",
+        "requires_cli": True,
+    }
+    registrar_config = {
+        "dir": ".factory/skills",
+        "format": "markdown",
+        "args": "$ARGUMENTS",
+        "extension": "/SKILL.md",
+    }
+    multi_install_safe = True
+
+    @staticmethod
+    def _inject_frontmatter_flag(content: str, key: str, value: str = "true") -> str:
+        """Insert ``key: value`` before the closing ``---`` if not already present.
+
+        Mirrors the helper used by ``ClaudeIntegration`` / ``VibeIntegration``
+        so per-agent frontmatter injection stays consistent across skills-based
+        integrations. Pre-scans for the key to keep injection idempotent.
+        """
+        lines = content.splitlines(keepends=True)
+
+        # Pre-scan: bail out if already present in frontmatter
+        dash_count = 0
+        for line in lines:
+            stripped = line.rstrip("\n\r")
+            if stripped == "---":
+                dash_count += 1
+                if dash_count == 2:
+                    break
+                continue
+            if dash_count == 1 and stripped.startswith(f"{key}:"):
+                return content
+
+        # Inject before the closing --- of frontmatter. Always emit a
+        # newline after the injected key so the key and the closing ---
+        # stay on separate lines even when the closing delimiter is the
+        # last line of the file with no trailing newline.
+        out: list[str] = []
+        dash_count = 0
+        injected = False
+        for line in lines:
+            stripped = line.rstrip("\n\r")
+            if stripped == "---":
+                dash_count += 1
+                if dash_count == 2 and not injected:
+                    out.append(f"{key}: {value}\n")
+                    injected = True
+            out.append(line)
+        return "".join(out)
+
+    def post_process_skill_content(self, content: str) -> str:
+        """Inject Droid-specific skill frontmatter flags.
+
+        Applies the shared hook-command normalization note (skills agents use
+        hyphenated ``/speckit-<name>`` invocations, not dotted ``/speckit.<name>``)
+        and the Droid-specific ``user-invocable`` / ``disable-model-invocation``
+        frontmatter flags so skills are both user- and Droid-invocable.
+        """
+        updated = super().post_process_skill_content(content)
+        updated = self._inject_frontmatter_flag(updated, "user-invocable")
+        updated = self._inject_frontmatter_flag(updated, "disable-model-invocation", "false")
+        return updated
+
+    def build_exec_args(
+        self,
+        prompt: str,
+        *,
+        model: str | None = None,
+        output_json: bool = True,
+    ) -> list[str] | None:
+        """Build CLI arguments for non-interactive ``droid`` execution.
+
+        Uses ``droid exec "<prompt>"`` for headless dispatch. Spec Kit does
+        not auto-apply any permission-bypass flag: operators who want to
+        skip interactive confirmation can pass it through
+        ``SPECKIT_INTEGRATION_DROID_EXTRA_ARGS`` (e.g.
+        ``SPECKIT_INTEGRATION_DROID_EXTRA_ARGS="--skip-permissions-unsafe"``).
+
+        Output format and model selection mirror the documented CLI flags:
+        ``--output-format json`` (when ``output_json`` is set) and
+        ``--model <id>``. Operator-supplied extra args via
+        ``SPECKIT_INTEGRATION_DROID_EXTRA_ARGS`` are appended after the
+        canonical Spec Kit flags so the canonical flags are guaranteed to
+        be present in argv. Note that with duplicate-flag CLI parsing the
+        later (operator-supplied) value may take precedence over the
+        canonical one, so operators can still override ``--model`` or
+        ``--output-format``.
+        """
+        if not self.config or not self.config.get("requires_cli"):
+            return None
+        args = [
+            self._resolve_executable(),
+            "exec",
+            prompt,
+        ]
+        # Operator-injected extra args are appended after Spec Kit's
+        # canonical --model / --output-format flags so the canonical
+        # flags are guaranteed to be present in argv regardless of
+        # whatever the operator passes via SPECKIT_INTEGRATION_DROID_EXTRA_ARGS.
+        # This is a deliberate inversion of the cursor-agent / opencode /
+        # codex ordering (which all apply extra args first, then append
+        # canonical flags so the canonical values win under duplicate-flag
+        # parsing). For Droid the canonical flag values are written into
+        # argv first, then the operator-supplied values follow; with
+        # duplicate-flag parsing the later (operator) value may therefore
+        # take precedence.
+        if model:
+            args.extend(["--model", model])
+        if output_json:
+            args.extend(["--output-format", "json"])
+        self._apply_extra_args_env_var(args)
+        return args

src/specify_cli/workflows/_commands.py

@@ -1555,7 +1555,7 @@ def workflow_add(
     # precedence over --from so a URL that would be ignored is never fetched.
     if dev:
         dev_path = Path(source).expanduser()
-        if dev_path.is_file() and dev_path.suffix in (".yml", ".yaml"):
+        if dev_path.is_file() and dev_path.suffix.lower() in (".yml", ".yaml"):
             _validate_and_install_local(dev_path, str(dev_path))
             return
         if dev_path.is_dir():
@@ -1714,7 +1714,7 @@ def workflow_add(
     # Try as a local file/directory
     source_path = Path(source)
     if source_path.exists():
-        if source_path.is_file() and source_path.suffix in (".yml", ".yaml"):
+        if source_path.is_file() and source_path.suffix.lower() in (".yml", ".yaml"):
             _validate_and_install_local(source_path, str(source_path))
             return
         elif source_path.is_dir():

src/specify_cli/workflows/catalog.py

@@ -894,7 +894,11 @@ class StepRegistry:
         import copy
         from datetime import datetime, timezone
 
-        existing = self.data["steps"].get(step_id, {})
+        raw_existing = self.data["steps"].get(step_id)
+        # Corrupted-but-parseable registries may hold non-dict entries; treat
+        # them as absent rather than crashing on existing.get() (mirrors
+        # WorkflowRegistry.add).
+        existing = raw_existing if isinstance(raw_existing, dict) else {}
         metadata_to_store = copy.deepcopy(metadata)
         metadata_to_store["installed_at"] = existing.get(
             "installed_at", datetime.now(timezone.utc).isoformat()

src/specify_cli/workflows/expressions.py

@@ -535,6 +535,10 @@ def _evaluate_simple_expression(expr: str, namespace: dict[str, Any]) -> Any:
         items = [
             _evaluate_simple_expression(i.strip(), namespace)
             for i in _split_top_level_commas(inner)
+            # Drop empty segments from trailing/leading/double commas ([1, 2,] ->
+            # [1, 2], not [1, 2, None]). An intentional empty-string element
+            # ('') strips to "''" (truthy), so ['', 'a'] is preserved.
+            if i.strip()
         ]
         return items
 

src/specify_cli/workflows/steps/command/__init__.py

@@ -189,7 +189,11 @@ class CommandStep(StepBase):
         not possible (integration not found, CLI not installed, or
         dispatch not supported).
         """
-        if not integration_key:
+        if not integration_key or not isinstance(integration_key, str):
+            # A non-string integration (a list/dict/expression that resolved to
+            # one) would raise TypeError: unhashable type from get_integration's
+            # dict lookup below and abort the whole run. Treat it as "not
+            # dispatchable" so execute() falls through to its FAILED StepResult.
             return None
 
         try:

src/specify_cli/workflows/steps/gate/__init__.py

@@ -168,7 +168,11 @@ class GateStep(StepBase):
             except (EOFError, KeyboardInterrupt):
                 print()
                 return options[-1]  # default to last (usually reject)
-            if raw.isdigit() and 1 <= int(raw) <= len(options):
+            # isdecimal() (not isdigit()): int() accepts exactly the decimal-digit
+            # set, whereas isdigit() also returns True for superscripts/subscripts
+            # (e.g. "²") that int() then rejects with ValueError — crashing
+            # this interactive loop.
+            if raw.isdecimal() and 1 <= int(raw) <= len(options):
                 return options[int(raw) - 1]
             # Also accept the option name directly
             if raw.lower() in [o.lower() for o in options]:

src/specify_cli/workflows/steps/prompt/__init__.py

@@ -138,7 +138,10 @@ class PromptStep(StepBase):
         context: StepContext,
     ) -> dict[str, Any] | None:
         """Dispatch *prompt* directly through the integration CLI."""
-        if not integration_key or not prompt:
+        if not integration_key or not isinstance(integration_key, str) or not prompt:
+            # A non-string integration would raise TypeError: unhashable type
+            # from get_integration's dict lookup and abort the run; treat it as
+            # not dispatchable so execute() falls through to its FAILED result.
             return None
 
         try:

tests/contract/test_catalog_schema.py

@@ -43,6 +43,42 @@ def test_builtin_default_stack_when_no_config(tmp_path: Path):
     assert all(s.scope is Scope.BUILTIN for s in sources)
 
 
+def test_non_list_catalogs_raises_actionable_error(tmp_path: Path):
+    """A scalar ``catalogs:`` value raises a clean BundlerError, not a raw
+    'int object is not iterable' TypeError — matching what the sibling reader
+    (bundle catalog list) already reports for the same file."""
+    make_project(tmp_path)
+    (tmp_path / ".specify" / "bundle-catalogs.yml").write_text(
+        "catalogs: 5\n", encoding="utf-8"
+    )
+    with pytest.raises(BundlerError, match="must be a list"):
+        load_source_stack(tmp_path)
+
+
+@pytest.mark.parametrize("value", ["false", "0", "''", "{}"])
+def test_falsy_non_list_catalogs_still_raises(tmp_path: Path, value: str):
+    """A *falsy* non-list ``catalogs:`` value (false/0/''/{}) must also raise —
+    only an absent/``None`` value means "nothing to merge". A plain falsy check
+    would silently swallow these, diverging from the sibling reader."""
+    make_project(tmp_path)
+    (tmp_path / ".specify" / "bundle-catalogs.yml").write_text(
+        f"catalogs: {value}\n", encoding="utf-8"
+    )
+    with pytest.raises(BundlerError, match="must be a list"):
+        load_source_stack(tmp_path)
+
+
+@pytest.mark.parametrize("body", ["catalogs:\n", "catalogs: []\n"])
+def test_absent_or_empty_catalogs_is_noop(tmp_path: Path, body: str):
+    """An absent (``None``) or empty-list ``catalogs:`` is valid: it contributes
+    no project sources and falls back to the built-in default stack."""
+    make_project(tmp_path)
+    (tmp_path / ".specify" / "bundle-catalogs.yml").write_text(body, encoding="utf-8")
+    # Does not raise; still yields the built-in defaults.
+    sources = load_source_stack(tmp_path)
+    assert len(sources) > 0
+
+
 def test_project_config_overrides_same_id(tmp_path: Path):
     make_project(tmp_path)
     config = {

tests/contract/test_manifest_schema.py

@@ -124,3 +124,13 @@ def test_string_mcp_rejected_not_split_per_character():
     data["requires"]["mcp"] = "github"
     with pytest.raises(BundlerError, match="'requires.mcp' must be a list of strings"):
         BundleManifest.from_dict(data)
+
+
+def test_string_integration_rejected_not_silently_dropped():
+    # A present-but-non-mapping 'integration' (a bare string) was silently
+    # dropped, leaving the bundle wrongly integration-agnostic. Reject it like
+    # the sibling requires/provides mapping fields.
+    data = valid_manifest_dict()
+    data["integration"] = "copilot"
+    with pytest.raises(BundlerError, match="'integration' must be a mapping when present"):
+        BundleManifest.from_dict(data)

tests/extensions/git/test_git_extension.py

@@ -698,6 +698,22 @@ class TestCreateFeaturePowerShell:
         assert rt.returncode == 0, rt.stderr
         assert "HAS_GIT" not in rt.stdout
 
+    def test_persist_hint_matches_twins(self, tmp_path: Path):
+        """The non-JSON SPECIFY_FEATURE hint must use the '# To persist in your
+        shell: $env:SPECIFY_FEATURE = '<name>' form — matching the core
+        create-new-feature.ps1 twin and the bash/python twins of this script —
+        not the old 'environment variable set to:' wording (the env var is only
+        set in this child process, so the actionable output is the persist hint)."""
+        project = _setup_project(tmp_path)
+        result = _run_pwsh(
+            "create-new-feature-branch.ps1", project,
+            "-ShortName", "persist", "Persist hint feature",
+        )
+        assert result.returncode == 0, result.stderr
+        assert "# To persist in your shell:" in result.stdout
+        assert "$env:SPECIFY_FEATURE = '001-persist'" in result.stdout
+        assert "environment variable set to:" not in result.stdout
+
     def test_help_documents_branch_prefix(self, tmp_path: Path):
         """-Help documents both template config knobs."""
         project = _setup_project(tmp_path)

tests/integrations/test_base.py

@@ -236,6 +236,24 @@ class TestBuildCommandInvocation:
             == "/speckit-git-commit fix typo"
         )
 
+    def test_cline_core_command_hyphenated(self):
+        """Cline installs hyphenated slash-commands (/speckit-<name>), so the
+        dispatch invocation must be hyphenated too — not the dotted default it
+        would inherit from MarkdownIntegration."""
+        from specify_cli.integrations import get_integration
+        i = get_integration("cline")
+        assert i.build_command_invocation("speckit.plan") == "/speckit-plan"
+        assert i.build_command_invocation("plan") == "/speckit-plan"
+
+    def test_cline_extension_command_hyphenated(self):
+        from specify_cli.integrations import get_integration
+        i = get_integration("cline")
+        assert i.build_command_invocation("speckit.git.commit") == "/speckit-git-commit"
+        assert (
+            i.build_command_invocation("speckit.git.commit", "fix typo")
+            == "/speckit-git-commit fix typo"
+        )
+
 
 class TestResolveCommandRefs:
     """Tests for __SPECKIT_COMMAND_<NAME>__ placeholder resolution."""

tests/integrations/test_integration_catalog.py

@@ -13,9 +13,34 @@ from specify_cli.integrations.catalog import (
     IntegrationDescriptor,
     IntegrationDescriptorError,
     IntegrationValidationError,
+    _catalog_shape_error,
 )
 
 
+class TestCatalogShapeValidator:
+    """The shared shape validator used by BOTH the fresh-fetch and cache-read
+    paths, so a poisoned/older cache can't bypass the format contract the fresh
+    fetch enforces (dict + 'schema_version' + dict 'integrations')."""
+
+    def test_valid_payload_returns_none(self):
+        assert _catalog_shape_error({"schema_version": "1.0", "integrations": {}}) is None
+
+    def test_missing_schema_version_is_rejected(self):
+        # The exact bypass the two paths used to disagree on: a dict with a dict
+        # 'integrations' but no 'schema_version'.
+        assert _catalog_shape_error({"integrations": {}}) is not None
+
+    def test_missing_integrations_is_rejected(self):
+        assert _catalog_shape_error({"schema_version": "1.0"}) is not None
+
+    def test_non_dict_integrations_is_rejected(self):
+        assert _catalog_shape_error({"schema_version": "1.0", "integrations": []}) is not None
+
+    @pytest.mark.parametrize("payload", [[], "x", 5, None])
+    def test_non_dict_payload_is_rejected(self, payload):
+        assert _catalog_shape_error(payload) is not None
+
+
 # ---------------------------------------------------------------------------
 # IntegrationCatalogEntry
 # ---------------------------------------------------------------------------
@@ -251,6 +276,48 @@ class TestCatalogFetch:
         ids = [r["id"] for r in results]
         assert "acme-coder" in ids
 
+    def test_poisoned_cache_shape_is_dropped_and_refetched(self, tmp_path, monkeypatch):
+        """A fresh-but-mis-shaped cache (e.g. integrations as a list) must be
+        dropped and refetched, not returned — otherwise it later crashes on
+        .items(). The cache path must clear the same shape checks as a fresh
+        fetch."""
+        monkeypatch.setenv("HOME", str(tmp_path))
+        monkeypatch.setenv("USERPROFILE", str(tmp_path))
+        monkeypatch.delenv("SPECKIT_INTEGRATION_CATALOG_URL", raising=False)
+        (tmp_path / ".specify").mkdir()
+        cat = IntegrationCatalog(tmp_path)
+
+        catalog = {
+            "schema_version": "1.0",
+            "updated_at": "2026-01-01T00:00:00Z",
+            "integrations": {
+                "acme-coder": {
+                    "id": "acme-coder", "name": "Acme Coder", "version": "2.0.0",
+                    "description": "Community integration", "author": "acme-org",
+                    "tags": ["cli"],
+                },
+            },
+        }
+        self._patch_urlopen(monkeypatch, catalog)
+        cat.search()  # populate the cache legitimately
+
+        # Poison the cached payload (integrations as a list), keeping the fresh
+        # metadata so the age check passes and the cache branch is taken.
+        cache_dir = tmp_path / ".specify" / "integrations" / ".cache"
+        data_files = [
+            f for f in cache_dir.glob("catalog-*.json")
+            if not f.name.endswith("-metadata.json")
+        ]
+        assert data_files, "cache was not populated"
+        data_files[0].write_text(
+            json.dumps({"schema_version": "1.0", "integrations": []}),
+            encoding="utf-8",
+        )
+
+        # The poisoned cache is dropped and the (valid) source is refetched.
+        results = cat.search()
+        assert "acme-coder" in [r["id"] for r in results]
+
     def test_search_by_tag(self, tmp_path, monkeypatch):
         monkeypatch.setenv("HOME", str(tmp_path))
         monkeypatch.setenv("USERPROFILE", str(tmp_path))

tests/integrations/test_integration_droid.py

@@ -0,0 +1,262 @@
+"""Tests for DroidIntegration (Factory Droid CLI)."""
+
+from urllib.parse import urlparse
+
+import pytest
+
+from specify_cli.integrations import get_integration
+from specify_cli.integrations.droid import DroidIntegration
+from specify_cli.integrations.manifest import IntegrationManifest
+
+from .test_integration_base_skills import SkillsIntegrationTests
+
+
+class TestDroidIntegration(SkillsIntegrationTests):
+    KEY = "droid"
+    FOLDER = ".factory/"
+    COMMANDS_SUBDIR = "skills"
+    REGISTRAR_DIR = ".factory/skills"
+
+    def test_options_include_skills_flag(self):
+        """Not applicable — Droid only supports the skills layout."""
+        pytest.skip("Droid is always skills-based and does not expose a --skills option")
+
+    def test_options_do_not_include_skills_flag(self):
+        """Droid is always skills-based; no --skills option is exposed."""
+        i = get_integration(self.KEY)
+        assert i is not None
+        opts = i.options()
+        skills_opts = [o for o in opts if o.name == "--skills"]
+        assert len(skills_opts) == 0, (
+            "Droid is always skills-based and should not expose a --skills option"
+        )
+
+    def test_requires_cli_is_true(self):
+        """Droid is a CLI tool; requires_cli must be True."""
+        i = get_integration(self.KEY)
+        assert i is not None
+        assert i.config["requires_cli"] is True
+        assert i.config["name"] == "Factory Droid"
+
+    def test_multi_install_safe_is_true(self):
+        """Droid uses an isolated .factory/ root — safe to install alongside others."""
+        i = get_integration(self.KEY)
+        assert i.multi_install_safe is True
+
+    def test_install_url_points_to_factory(self):
+        i = get_integration(self.KEY)
+        url = i.config.get("install_url")
+        assert url is not None
+        host = (urlparse(url).hostname or "").lower()
+        assert host == "factory.ai" or host.endswith(".factory.ai"), (
+            f"install_url must point at the Factory domain, got: {url}"
+        )
+
+
+class TestDroidInitFlow:
+    """--integration droid creates expected files."""
+
+    def test_integration_droid_creates_skills(self, tmp_path):
+        """--integration droid should create skills under .factory/skills."""
+        from typer.testing import CliRunner
+
+        from specify_cli import app
+
+        runner = CliRunner()
+        target = tmp_path / "test-proj"
+        result = runner.invoke(
+            app,
+            [
+                "init",
+                str(target),
+                "--integration",
+                "droid",
+                "--ignore-agent-tools",
+                "--script",
+                "sh",
+            ],
+            catch_exceptions=False,
+        )
+
+        assert result.exit_code == 0, f"init --integration droid failed: {result.output}"
+        assert (target / ".factory" / "skills" / "speckit-plan" / "SKILL.md").exists()
+        assert (target / ".factory" / "skills" / "speckit-specify" / "SKILL.md").exists()
+
+
+class TestDroidBuildExecArgs:
+    """Droid non-interactive execution argument building."""
+
+    def test_default_argv_uses_exec_subcommand(self):
+        """Default argv: ``droid exec <prompt> --output-format json``.
+
+        No permission-bypass flag is auto-applied — operators who need it
+        must pass it through ``SPECKIT_INTEGRATION_DROID_EXTRA_ARGS``.
+        """
+        i = get_integration("droid")
+        args = i.build_exec_args("/speckit-specify some-feature")
+        assert args == [
+            "droid",
+            "exec",
+            "/speckit-specify some-feature",
+            "--output-format",
+            "json",
+        ]
+        assert "--skip-permissions-unsafe" not in args, (
+            "Spec Kit must not auto-apply --skip-permissions-unsafe; "
+            "it is a dangerous flag and operators must opt in explicitly"
+        )
+
+    def test_text_output_omits_format_flag(self):
+        i = get_integration("droid")
+        args = i.build_exec_args("/speckit-plan", output_json=False)
+        assert args == [
+            "droid",
+            "exec",
+            "/speckit-plan",
+        ]
+        assert "--skip-permissions-unsafe" not in args
+
+    def test_model_is_appended(self):
+        i = get_integration("droid")
+        args = i.build_exec_args(
+            "/speckit-specify", model="claude-opus-4-7", output_json=False
+        )
+        assert args == [
+            "droid",
+            "exec",
+            "/speckit-specify",
+            "--model",
+            "claude-opus-4-7",
+        ]
+        assert "--skip-permissions-unsafe" not in args
+
+    def test_extra_args_inserted_after_canonical_flags(self, monkeypatch):
+        """Operator-injected extra args land after Spec Kit's canonical
+        ``--model`` / ``--output-format`` flags so the canonical flags are
+        always present in argv regardless of operator override."""
+        from specify_cli.integrations import get_integration
+
+        i = get_integration("droid")
+        monkeypatch.setenv("SPECKIT_INTEGRATION_DROID_EXTRA_ARGS", "--foo bar")
+        args = i.build_exec_args(
+            "/speckit-plan", model="claude-sonnet", output_json=True
+        )
+
+        assert "--foo" in args
+        assert "bar" in args
+        assert args.index("bar") == args.index("--foo") + 1
+        # Extra args land AFTER the canonical flags so the canonical flags
+        # are always present in argv.
+        assert args.index("--model") < args.index("--foo")
+        assert args.index("--output-format") < args.index("--foo")
+        assert args[args.index("--model") + 1] == "claude-sonnet"
+        assert args[args.index("--output-format") + 1] == "json"
+
+    def test_executable_override(self, monkeypatch):
+        """``SPECKIT_INTEGRATION_DROID_EXECUTABLE`` overrides argv[0]."""
+        monkeypatch.setenv(
+            "SPECKIT_INTEGRATION_DROID_EXECUTABLE", "/custom/droid"
+        )
+        i = get_integration("droid")
+        args = i.build_exec_args("/speckit-plan", output_json=False)
+        assert args[0] == "/custom/droid"
+        # No dangerous permission-bypass flag should leak in via the override path.
+        assert "--skip-permissions-unsafe" not in args
+
+    def test_returns_none_when_requires_cli_is_false(self, monkeypatch):
+        """When ``requires_cli`` is False, ``build_exec_args`` returns None."""
+        i = get_integration("droid")
+        monkeypatch.setitem(i.config, "requires_cli", False)
+        assert i.build_exec_args("/speckit-plan") is None
+
+
+class TestDroidFrontmatter:
+    """Every generated SKILL.md must carry Droid-specific frontmatter flags."""
+
+    def test_skills_carry_user_invocable_true(self, tmp_path):
+        i = get_integration("droid")
+        m = IntegrationManifest("droid", tmp_path)
+        i.setup(tmp_path, m, script_type="sh")
+
+        skill_files = [
+            f
+            for f in (tmp_path / ".factory" / "skills").rglob("SKILL.md")
+        ]
+        assert skill_files, "expected at least one SKILL.md"
+        for f in skill_files:
+            content = f.read_text(encoding="utf-8")
+            assert "user-invocable: true" in content, (
+                f"{f} missing user-invocable: true"
+            )
+
+    def test_skills_carry_disable_model_invocation_false(self, tmp_path):
+        i = get_integration("droid")
+        m = IntegrationManifest("droid", tmp_path)
+        i.setup(tmp_path, m, script_type="sh")
+
+        skill_files = [
+            f
+            for f in (tmp_path / ".factory" / "skills").rglob("SKILL.md")
+        ]
+        assert skill_files, "expected at least one SKILL.md"
+        for f in skill_files:
+            content = f.read_text(encoding="utf-8")
+            assert "disable-model-invocation: false" in content, (
+                f"{f} missing disable-model-invocation: false"
+            )
+
+    def test_inject_frontmatter_flag_adds_key_when_absent(self):
+        """Fresh content (key absent) gets the flag injected on its own line."""
+        content = "---\nname: x\ndescription: y\n---\n\nBody.\n"
+        result = DroidIntegration._inject_frontmatter_flag(content, "user-invocable")
+        assert "user-invocable: true" in result
+        # The injected key must sit on its own line, not glued to the closing ---.
+        assert "\nuser-invocable: true\n---" in result, (
+            "Injected key must be on its own line, not fused to closing ---"
+        )
+
+    def test_inject_frontmatter_flag_injects_custom_value(self):
+        """The value parameter must be honored (used for disable-model-invocation: false)."""
+        content = "---\nname: x\n---\n\nBody.\n"
+        result = DroidIntegration._inject_frontmatter_flag(
+            content, "disable-model-invocation", "false"
+        )
+        assert "disable-model-invocation: false" in result
+
+    def test_inject_frontmatter_flag_no_trailing_newline(self):
+        """Regression for the frontmatter-fusion P2 bug.
+
+        When the closing ``---`` is the literal last line of the file with
+        no trailing newline, the injected key must still land on its own
+        line (not fused onto the closing delimiter). Previously this
+        produced ``user-invocable: true---``, an unparseable YAML line.
+        """
+        content = "---\nname: x\ndescription: y\n---"
+        result = DroidIntegration._inject_frontmatter_flag(content, "user-invocable")
+        assert "user-invocable: true" in result
+        # The injected key and the closing delimiter must NOT be fused.
+        assert "user-invocable: true---" not in result, (
+            "Injected key fused onto closing ---; no-trailing-newline regression"
+        )
+        # And the injected key must be on its own line.
+        assert "\nuser-invocable: true\n---" in result
+
+    def test_frontmatter_injection_is_idempotent(self):
+        """Running the post-processor twice must not duplicate the flag."""
+        content = "---\nname: x\n---\n\nBody.\n"
+        once = DroidIntegration._inject_frontmatter_flag(content, "user-invocable")
+        twice = DroidIntegration._inject_frontmatter_flag(once, "user-invocable")
+        assert once == twice, "Frontmatter injection must be idempotent"
+        # Belt-and-braces: the flag must appear exactly once.
+        assert once.count("user-invocable: true") == 1
+
+
+class TestDroidCommandInvocation:
+    """Skills agents use the hyphenated ``/speckit-<name>`` slash form."""
+
+    def test_build_command_invocation_uses_hyphenated_skill_name(self):
+        i = get_integration("droid")
+        assert i.build_command_invocation("speckit.plan", "feature-x") == (
+            "/speckit-plan feature-x"
+        )
+        assert i.build_command_invocation("plan") == "/speckit-plan"

tests/integrations/test_integration_forge.py

@@ -475,3 +475,39 @@ class TestForgeCommandRegistrar:
             "Found '/speckit.specify' (dot notation) in generated Forge git.feature command body. "
             "Forge requires hyphen notation for ZSH compatibility."
         )
+
+
+class TestForgeInitNextSteps:
+    """The post-init 'Next steps' panel must show hyphenated /speckit-<name>
+    commands for Forge, since Forge only registers the hyphenated form
+    (see the generated command-file tests above)."""
+
+    def test_init_next_steps_show_hyphenated_commands(self, tmp_path):
+        import os
+
+        from typer.testing import CliRunner
+
+        from specify_cli import app
+
+        project = tmp_path / "forge-nextsteps"
+        project.mkdir()
+        old_cwd = os.getcwd()
+        try:
+            os.chdir(project)
+            result = CliRunner().invoke(
+                app,
+                ["init", "--here", "--integration", "forge", "--ignore-agent-tools"],
+                catch_exceptions=False,
+            )
+        finally:
+            os.chdir(old_cwd)
+
+        assert result.exit_code == 0, f"init failed: {result.output}"
+        # Forge registers /speckit-<name>; the next-steps panel must match.
+        assert "/speckit-plan" in result.output, (
+            f"Expected /speckit-plan in next steps but got:\n{result.output}"
+        )
+        # Must NOT show the dotted /speckit.plan form Forge can't invoke.
+        assert "/speckit.plan" not in result.output, (
+            f"Should not show dotted /speckit.plan for Forge:\n{result.output}"
+        )

tests/integrations/test_registry.py

@@ -28,6 +28,7 @@ ALL_INTEGRATION_KEYS = [
     "gemini", "tabnine",
     # Stage 5 — skills, generic & option-driven integrations
     "codex", "kimi", "agy", "zed", "generic",
+    "droid",
 ]
 
 

tests/test_agent_config_consistency.py

@@ -20,6 +20,7 @@ ISSUE_TEMPLATE_AGENT_KEYS = [
     "codex",
     "cursor-agent",
     "devin",
+    "droid",
     "firebender",
     "forge",
     "gemini",

tests/test_extensions.py

@@ -8238,6 +8238,42 @@ class TestHookInvocationRendering:
         assert execution["command"] == "my-extension.do-something"
         assert execution["invocation"] == "/speckit-my-extension-do-something"
 
+    def test_forge_hooks_render_hyphenated_invocation(self, project_dir):
+        """Forge projects should render /speckit-* invocations (like Cline)."""
+        init_options = project_dir / ".specify" / "init-options.json"
+        init_options.parent.mkdir(parents=True, exist_ok=True)
+        init_options.write_text(json.dumps({"ai": "forge"}))
+
+        hook_executor = HookExecutor(project_dir)
+        execution = hook_executor.execute_hook(
+            {
+                "extension": "test-ext",
+                "command": "speckit.tasks",
+                "optional": False,
+            }
+        )
+
+        assert execution["command"] == "speckit.tasks"
+        assert execution["invocation"] == "/speckit-tasks"
+
+    def test_forge_hooks_render_extension_command(self, project_dir):
+        """Forge projects should render /speckit-my-ext-cmd for extension hooks."""
+        init_options = project_dir / ".specify" / "init-options.json"
+        init_options.parent.mkdir(parents=True, exist_ok=True)
+        init_options.write_text(json.dumps({"ai": "forge"}))
+
+        hook_executor = HookExecutor(project_dir)
+        execution = hook_executor.execute_hook(
+            {
+                "extension": "test-ext",
+                "command": "my-extension.do-something",
+                "optional": False,
+            }
+        )
+
+        assert execution["command"] == "my-extension.do-something"
+        assert execution["invocation"] == "/speckit-my-extension-do-something"
+
     def test_non_skill_command_keeps_slash_invocation(self, project_dir):
         """Custom hook commands should keep slash invocation style."""
         init_options = project_dir / ".specify" / "init-options.json"

tests/test_workflows.py

@@ -404,6 +404,17 @@ class TestExpressions:
         assert evaluate_expression('{{ [["a", "b"], "c"] }}', ctx) == [["a", "b"], "c"]
         assert evaluate_expression("{{ [[1, 2], [3, 4]] }}", ctx) == [[1, 2], [3, 4]]
 
+    def test_list_literal_ignores_trailing_and_empty_commas(self):
+        from specify_cli.workflows.expressions import evaluate_expression
+        from specify_cli.workflows.base import StepContext
+
+        ctx = StepContext()
+        # A trailing comma must not append a spurious None element.
+        assert evaluate_expression("{{ [1, 2,] }}", ctx) == [1, 2]
+        assert evaluate_expression("{{ [1,, 2] }}", ctx) == [1, 2]
+        # …but an intentional empty-string element is still preserved.
+        assert evaluate_expression("{{ ['', 'a'] }}", ctx) == ["", "a"]
+
     def test_operator_splitting_is_quote_aware(self):
         from specify_cli.workflows.expressions import (
             evaluate_condition,
@@ -1162,6 +1173,21 @@ class TestCommandStep:
             result = step.execute(config, ctx)
         assert result.output["integration"] == "gemini"
 
+    def test_execute_non_string_integration_fails_cleanly(self):
+        """A non-string integration (e.g. a list from an expression that resolved
+        to one) must FAIL the step cleanly, not crash the run with
+        'TypeError: unhashable type: list' from get_integration's dict lookup."""
+        from specify_cli.workflows.steps.command import CommandStep
+        from specify_cli.workflows.base import StepContext, StepStatus
+
+        step = CommandStep()
+        config = {
+            "id": "s", "command": "speckit.plan",
+            "integration": ["claude"], "input": {},
+        }
+        result = step.execute(config, StepContext())
+        assert result.status == StepStatus.FAILED
+
     def test_step_override_model(self):
         from unittest.mock import patch
         from specify_cli.workflows.steps.command import CommandStep
@@ -1359,6 +1385,20 @@ class TestPromptStep:
         assert result.output["integration"] == "claude"
         assert result.output["dispatched"] is False
 
+    def test_execute_non_string_integration_fails_cleanly(self):
+        """A non-string integration must FAIL the step cleanly, not crash with
+        'TypeError: unhashable type: list' from get_integration's dict lookup."""
+        from specify_cli.workflows.steps.prompt import PromptStep
+        from specify_cli.workflows.base import StepContext, StepStatus
+
+        step = PromptStep()
+        config = {
+            "id": "p", "type": "prompt", "prompt": "do it",
+            "integration": ["claude"],
+        }
+        result = step.execute(config, StepContext())
+        assert result.status == StepStatus.FAILED
+
     def test_execute_with_step_integration(self):
         from unittest.mock import patch
         from specify_cli.workflows.steps.prompt import PromptStep
@@ -2145,6 +2185,19 @@ class TestGateStep:
         assert result.status == StepStatus.COMPLETED
         assert result.output["choice"] == "approve"
 
+    def test_interactive_prompt_rejects_non_decimal_digit(self, monkeypatch, capsys):
+        """A Unicode digit int() can't parse — e.g. the superscript '²', which
+        str.isdigit() accepts but int() rejects — must be treated as an invalid
+        choice, not crash the prompt loop with an uncaught ValueError."""
+        from specify_cli.workflows.steps.gate import GateStep
+
+        _force_gate_stdin(monkeypatch, tty=True)
+        inputs = iter(["²", "1"])  # superscript-two, then a real "1"
+        monkeypatch.setattr("builtins.input", lambda _prompt="": next(inputs))
+
+        choice = GateStep._prompt("Review the spec.", ["approve", "reject"])
+        assert choice == "approve"
+
     def test_interactive_prompt_missing_show_file_does_not_crash(
         self, tmp_path, monkeypatch, capsys
     ):
@@ -7733,6 +7786,63 @@ class TestWorkflowRemoveGuard:
         assert "[stage]permissiondenied" in output_compact
         assert "[reg]diskfull" in output_compact
 
+
+class TestWorkflowAddCaseInsensitiveSuffix:
+    """`workflow add` must detect a local YAML file case-insensitively, matching
+    `workflow run` (_commands.py:workflow_run) and the engine loader
+    (engine.py:WorkflowEngine.load_workflow), which both use `.suffix.lower()`.
+    Without it, `workflow run Sample.YAML` works but `workflow add Sample.YAML`
+    fails — an add/run inconsistency for an uppercase extension."""
+
+    def test_plain_path_accepts_uppercase_extension(self, temp_dir, monkeypatch, sample_workflow_yaml):
+        from typer.testing import CliRunner
+        from specify_cli import app
+
+        (temp_dir / ".specify" / "workflows").mkdir(parents=True)
+        src = temp_dir / "Sample.YAML"
+        src.write_text(sample_workflow_yaml, encoding="utf-8")
+
+        monkeypatch.chdir(temp_dir)
+        result = CliRunner().invoke(app, ["workflow", "add", str(src)])
+
+        # Before the fix: `.suffix in (...)` is case-sensitive, so ".YAML" is not
+        # recognized as a local file; the path falls through to catalog lookup
+        # and fails. After the fix it installs like the lowercase happy path.
+        assert result.exit_code == 0, result.output
+        assert "installed" in result.output
+
+    def test_dev_path_accepts_uppercase_extension(self, temp_dir, monkeypatch, sample_workflow_yaml):
+        from typer.testing import CliRunner
+        from specify_cli import app
+
+        (temp_dir / ".specify" / "workflows").mkdir(parents=True)
+        src = temp_dir / "Sample.YAML"
+        src.write_text(sample_workflow_yaml, encoding="utf-8")
+
+        monkeypatch.chdir(temp_dir)
+        result = CliRunner().invoke(app, ["workflow", "add", "--dev", str(src)])
+
+        # Before the fix the --dev branch rejects ".YAML" with
+        # "--dev source must be a workflow YAML file ...".
+        assert result.exit_code == 0, result.output
+        assert "installed" in result.output
+
+    def test_lowercase_extension_still_installs(self, temp_dir, monkeypatch, sample_workflow_yaml):
+        """Happy path (lowercase .yml) is unchanged by the case-normalization."""
+        from typer.testing import CliRunner
+        from specify_cli import app
+
+        (temp_dir / ".specify" / "workflows").mkdir(parents=True)
+        src = temp_dir / "sample.yml"
+        src.write_text(sample_workflow_yaml, encoding="utf-8")
+
+        monkeypatch.chdir(temp_dir)
+        result = CliRunner().invoke(app, ["workflow", "add", str(src)])
+
+        assert result.exit_code == 0, result.output
+        assert "installed" in result.output
+
+
 class TestWorkflowAddSymlinkGuard:
     def test_add_malformed_ipv6_url_exits_cleanly(self, temp_dir, monkeypatch):
         """A malformed IPv6 URL must produce a clean error, not a ValueError traceback."""
@@ -9973,6 +10083,17 @@ steps:
         registry.add("align-wf", {"version": "1.0.0", "source": "catalog"})
         assert registry.get("align-wf")["version"] == "1.0.0"
 
+    def test_step_registry_add_survives_non_dict_existing_entry(self, project_dir):
+        """StepRegistry.add must treat a corrupted non-dict existing entry as
+        absent rather than crash on existing.get() (parity with
+        WorkflowRegistry.add)."""
+        from specify_cli.workflows.catalog import StepRegistry
+
+        registry = StepRegistry(project_dir)
+        registry.data["steps"]["my-step"] = "corrupted"
+        registry.add("my-step", {"version": "1.0.0"})
+        assert registry.get("my-step")["version"] == "1.0.0"
+
     @pytest.mark.parametrize(
         "contents",
         [

tests/unit/test_bundler_catalog_config.py

@@ -253,6 +253,47 @@ def test_add_source_wraps_invalid_ipv6_as_bundler_error(tmp_path: Path):
         cc.add_source(project, "https://[::1/c.json", policy="install-allowed", priority=50)
 
 
+def test_add_source_wraps_bracketed_non_ip_host_as_bundler_error(tmp_path: Path):
+    # A bracketed-but-invalid IPv6 authority (e.g. "https://[not-an-ip]/c.json")
+    # parses cleanly under urlparse() on Python < 3.14 and only raises ValueError
+    # lazily on the first .hostname access; the raise moved eager into urlparse()
+    # in 3.14. add_source must surface its own BundlerError on every supported
+    # version, never leak a raw ValueError past the CLI's `except BundlerError`.
+    project = tmp_path / "proj"
+    (project / ".specify").mkdir(parents=True)
+    with pytest.raises(BundlerError, match="Invalid catalog url"):
+        cc.add_source(project, "https://[not-an-ip]/c.json", policy="install-allowed", priority=50)
+
+
+def test_add_source_wraps_lazy_hostname_valueerror(tmp_path: Path, monkeypatch):
+    # Simulate the Python < 3.14 shape explicitly (independent of the running
+    # interpreter): urlparse() succeeds but .hostname raises ValueError lazily.
+    # This is the exact path the fix guards; it fails with a raw ValueError if
+    # .hostname is read outside the try/except.
+    from urllib.parse import urlparse as _real_urlparse
+
+    class _LazyHostnameRaiser:
+        def __init__(self, parsed):
+            self._parsed = parsed
+
+        @property
+        def hostname(self):
+            raise ValueError("simulated lazy IPv6 hostname failure")
+
+        def __getattr__(self, name):
+            return getattr(self._parsed, name)
+
+    def _fake_urlparse(url, *args, **kwargs):
+        return _LazyHostnameRaiser(_real_urlparse(url, *args, **kwargs))
+
+    monkeypatch.setattr(cc, "urlparse", _fake_urlparse)
+
+    project = tmp_path / "proj"
+    (project / ".specify").mkdir(parents=True)
+    with pytest.raises(BundlerError, match="Invalid catalog url"):
+        cc.add_source(project, "https://example.com/c.json", policy="install-allowed", priority=50)
+
+
 def test_remove_source_does_not_crash_on_invalid_ipv6(tmp_path: Path):
     project = tmp_path / "proj"
     (project / ".specify").mkdir(parents=True)