feat: add Factory Droid CLI integration (#822)

.devcontainer/post-create.sh

@@ -97,6 +97,25 @@ 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..."
+# https://docs.factory.ai/cli/getting-started/quickstart
+# Install via the npm distribution (``npm install -g droid``) rather than
+# fetching ``https://app.factory.ai/cli``: the upstream shell installer is
+# served from a mutable endpoint with no published digest, so downloading
+# it and executing it inside the devcontainer would run whatever the
+# server returned at build time. npm packages carry integrity checksums
+# verified against the registry signature, and this matches the layout of
+# every other CLI install block above.
+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

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`         |                                                                                                                                           |

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",

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/droid/__init__.py

@@ -0,0 +1,136 @@
+"""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. The
+        ``--skip-permissions-unsafe`` flag is mandatory for non-interactive
+        runs because Droid's permission prompts otherwise block workflow
+        dispatch (matches Cursor's ``--force`` and Grok's ``--always-approve``
+        role for spec-kit automation).
+
+        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``,
+        ``--output-format``, or ``--skip-permissions-unsafe``.
+        """
+        if not self.config or not self.config.get("requires_cli"):
+            return None
+        args = [
+            self._resolve_executable(),
+            "exec",
+            prompt,
+            "--skip-permissions-unsafe",
+        ]
+        # 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