Skip to content

💫 Toolkit to help you get started with SDD or any other process!

fix(agy): support --model, --add-dir workspace, and pre-prompt extra args (#4481)

Timo04c99daca005
diff --git a/scripts/powershell/common.ps1 b/scripts/powershell/common.ps1
index bb61f623b..d0489fdf7 100644
--- a/scripts/powershell/common.ps1
+++ b/scripts/powershell/common.ps1
@@ -1,6 +1,7 @@
#!/usr/bin/env pwsh
# Common PowerShell functions analogous to common.sh
+
# Find repository root by searching upward for .specify directory
# This is the primary marker for spec-kit projects
function Find-SpecifyRoot {
diff --git a/src/specify_cli/integrations/agy/__init__.py b/src/specify_cli/integrations/agy/__init__.py
index 958f922c1..bbbbfdefe 100644
--- a/src/specify_cli/integrations/agy/__init__.py
+++ b/src/specify_cli/integrations/agy/__init__.py
@@ -90,13 +90,26 @@ class AgyIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
- # agy does not support --model or JSON output; both params are ignored
self.validate_runtime_config(integration_args, integration_options)
- args = [self._resolve_executable(), "--print", prompt]
- # Honor SPECKIT_INTEGRATION_AGY_EXTRA_ARGS (operator-supplied flags),
- # appended after the positional prompt like the devin integration.
+ # agy does not support JSON output; output_json is ignored.
+ args = [self._resolve_executable()]
+ # Pass --model before --print so agy can parse it as a flag.
+ # agy >=1.20 supports: agy --model <name> --print <prompt>
+ if model:
+ args.extend(["--model", model])
+ # Inject --add-dir so agy discovers the project workspace when invoked
+ # from an arbitrary working directory (e.g. the workflow engine's cwd).
+ # Without this agy falls back to its own scratch directory and cannot
+ # locate .agents/skills/, reporting "no active workspace".
+ if project_root is not None:
+ args.extend(["--add-dir", str(project_root.resolve())])
+ # Honor SPECKIT_INTEGRATION_AGY_EXTRA_ARGS (operator-supplied flags).
+ # These MUST be inserted before --print because agy treats every token
+ # that follows --print as part of the prompt, not as CLI flags.
self._apply_extra_args_env_var(args)
+ args.extend(["--print", prompt])
return args
def setup(
diff --git a/src/specify_cli/integrations/base.py b/src/specify_cli/integrations/base.py
index c0f4bdea1..e698b9e28 100644
--- a/src/specify_cli/integrations/base.py
+++ b/src/specify_cli/integrations/base.py
@@ -248,6 +248,7 @@ class IntegrationBase(ABC):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build CLI arguments for non-interactive execution.
@@ -435,6 +436,7 @@ class IntegrationBase(ABC):
output_json=not stream,
integration_args=integration_args,
integration_options=integration_options,
+ project_root=project_root,
)
if exec_args is None:
@@ -1092,6 +1094,7 @@ class MarkdownIntegration(IntegrationBase):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
self.validate_runtime_config(integration_args, integration_options)
if not self.config or not self.config.get("requires_cli"):
@@ -1186,6 +1189,7 @@ class TomlIntegration(IntegrationBase):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
self.validate_runtime_config(integration_args, integration_options)
if not self.config or not self.config.get("requires_cli"):
@@ -1658,6 +1662,7 @@ class SkillsIntegration(IntegrationBase):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
self.validate_runtime_config(integration_args, integration_options)
if not self.config or not self.config.get("requires_cli"):
diff --git a/src/specify_cli/integrations/bob/__init__.py b/src/specify_cli/integrations/bob/__init__.py
index 016ecf7aa..b1b5ce9a5 100644
--- a/src/specify_cli/integrations/bob/__init__.py
+++ b/src/specify_cli/integrations/bob/__init__.py
@@ -284,8 +284,7 @@ class BobIntegration(IntegrationBase):
return super().build_command_invocation(command_name, args)
stem = command_name
- if stem.startswith("speckit."):
- stem = stem[len("speckit."):]
+ stem = stem.removeprefix("speckit.")
invocation = "/speckit-" + stem.replace(".", "-")
return f"{invocation} {args}" if args else invocation
@@ -321,6 +320,7 @@ class BobIntegration(IntegrationBase):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Non-interactive dispatch through ``bob run``.
diff --git a/src/specify_cli/integrations/codex/__init__.py b/src/specify_cli/integrations/codex/__init__.py
index 8d80e0537..d88628b3f 100644
--- a/src/specify_cli/integrations/codex/__init__.py
+++ b/src/specify_cli/integrations/codex/__init__.py
@@ -5,6 +5,7 @@ Commands are deprecated; ``--skills`` defaults to ``True``.
"""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -51,6 +52,7 @@ class CodexIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
# Codex uses ``codex exec "prompt"`` for non-interactive mode.
# Resolve argv[0] via the shared executable resolver so operators can
diff --git a/src/specify_cli/integrations/copilot/__init__.py b/src/specify_cli/integrations/copilot/__init__.py
index 74c6589bb..1a8285d7c 100644
--- a/src/specify_cli/integrations/copilot/__init__.py
+++ b/src/specify_cli/integrations/copilot/__init__.py
@@ -309,6 +309,7 @@ class CopilotIntegration(IntegrationBase):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
self.validate_runtime_config(integration_args, integration_options)
# GitHub Copilot CLI uses ``copilot -p "prompt"`` for
diff --git a/src/specify_cli/integrations/cursor_agent/__init__.py b/src/specify_cli/integrations/cursor_agent/__init__.py
index eb28286a9..87b00236d 100644
--- a/src/specify_cli/integrations/cursor_agent/__init__.py
+++ b/src/specify_cli/integrations/cursor_agent/__init__.py
@@ -11,6 +11,7 @@ is what indicates dispatch support, mirroring ``CopilotIntegration``.
"""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -68,6 +69,7 @@ class CursorAgentIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build CLI arguments for non-interactive ``cursor-agent`` execution.
diff --git a/src/specify_cli/integrations/devin/__init__.py b/src/specify_cli/integrations/devin/__init__.py
index 7391aaea0..7c434ce96 100644
--- a/src/specify_cli/integrations/devin/__init__.py
+++ b/src/specify_cli/integrations/devin/__init__.py
@@ -9,6 +9,7 @@ See: https://cli.devin.ai/docs/extensibility/skills/overview
"""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -63,6 +64,7 @@ class DevinIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build non-interactive CLI args for Devin for Terminal.
diff --git a/src/specify_cli/integrations/docker_agent/__init__.py b/src/specify_cli/integrations/docker_agent/__init__.py
index c823dc96a..939e35555 100644
--- a/src/specify_cli/integrations/docker_agent/__init__.py
+++ b/src/specify_cli/integrations/docker_agent/__init__.py
@@ -6,6 +6,7 @@ configuration is owned by Docker Agent and is not managed by Spec Kit.
"""
from __future__ import annotations
+from pathlib import Path
import os
import shlex
@@ -85,6 +86,7 @@ class DockerAgentIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build a headless Docker Agent invocation with an agent config."""
self.validate_runtime_config(integration_args, integration_options)
@@ -152,6 +154,7 @@ class DockerAgentIntegration(SkillsIntegration):
self,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> None:
"""Validate Docker Agent's per-step agent reference and CLI options."""
runtime_args = list(integration_args or ())
diff --git a/src/specify_cli/integrations/droid/__init__.py b/src/specify_cli/integrations/droid/__init__.py
index 7e41d76b0..fb165f530 100644
--- a/src/specify_cli/integrations/droid/__init__.py
+++ b/src/specify_cli/integrations/droid/__init__.py
@@ -9,6 +9,7 @@ See: https://docs.factory.ai/cli/configuration/skills
"""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -95,6 +96,7 @@ class DroidIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build CLI arguments for non-interactive ``droid`` execution.
diff --git a/src/specify_cli/integrations/dsh/__init__.py b/src/specify_cli/integrations/dsh/__init__.py
index 381d4c08c..c6c16e9ee 100644
--- a/src/specify_cli/integrations/dsh/__init__.py
+++ b/src/specify_cli/integrations/dsh/__init__.py
@@ -15,6 +15,7 @@ See: https://github.com/deepseek-ai/deepseek-harness
"""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -51,6 +52,7 @@ class DshIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build non-interactive CLI args for DSH.
diff --git a/src/specify_cli/integrations/goose/__init__.py b/src/specify_cli/integrations/goose/__init__.py
index d02537f29..76df5d671 100644
--- a/src/specify_cli/integrations/goose/__init__.py
+++ b/src/specify_cli/integrations/goose/__init__.py
@@ -1,6 +1,7 @@
"""Goose integration — open source AI agent (Agentic AI Foundation)."""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -32,6 +33,7 @@ class GooseIntegration(YamlIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build CLI arguments for non-interactive ``goose`` execution.
diff --git a/src/specify_cli/integrations/grok/__init__.py b/src/specify_cli/integrations/grok/__init__.py
index ca078a30d..8703e1b73 100644
--- a/src/specify_cli/integrations/grok/__init__.py
+++ b/src/specify_cli/integrations/grok/__init__.py
@@ -6,6 +6,7 @@ Grok Build discovers project skills from ``.grok/skills/speckit-<name>/SKILL.md`
"""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -40,6 +41,7 @@ class GrokIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build CLI arguments for non-interactive ``grok`` execution.
diff --git a/src/specify_cli/integrations/hermes/__init__.py b/src/specify_cli/integrations/hermes/__init__.py
index 1954d968f..582a7bf66 100644
--- a/src/specify_cli/integrations/hermes/__init__.py
+++ b/src/specify_cli/integrations/hermes/__init__.py
@@ -275,6 +275,7 @@ class HermesIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build Hermes CLI invocation for programmatic dispatch.
diff --git a/src/specify_cli/integrations/muse/__init__.py b/src/specify_cli/integrations/muse/__init__.py
index 14d9d53da..327dac507 100644
--- a/src/specify_cli/integrations/muse/__init__.py
+++ b/src/specify_cli/integrations/muse/__init__.py
@@ -8,6 +8,7 @@ See: https://dev.meta.ai/docs/muse-code
"""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -55,6 +56,7 @@ class MuseIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
# Muse Code uses ``muse exec "<prompt>"`` for non-interactive mode.
# Resolve argv[0] via the shared executable resolver so operators can
diff --git a/src/specify_cli/integrations/omp/__init__.py b/src/specify_cli/integrations/omp/__init__.py
index 2cf2f7b03..b2088593d 100644
--- a/src/specify_cli/integrations/omp/__init__.py
+++ b/src/specify_cli/integrations/omp/__init__.py
@@ -1,6 +1,7 @@
"""Oh My Pi (omp) coding agent integration."""
from __future__ import annotations
+from pathlib import Path
from collections.abc import Mapping, Sequence
from typing import Any
@@ -33,6 +34,7 @@ class OmpIntegration(MarkdownIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
# Diverges from MarkdownIntegration.build_exec_args because OMP's
# CLI parser treats `-p`/`--print` as a boolean (one-shot mode) and
diff --git a/src/specify_cli/integrations/opencode/__init__.py b/src/specify_cli/integrations/opencode/__init__.py
index cf7041865..3ef10bf05 100644
--- a/src/specify_cli/integrations/opencode/__init__.py
+++ b/src/specify_cli/integrations/opencode/__init__.py
@@ -1,6 +1,7 @@
"""opencode integration."""
from collections.abc import Mapping, Sequence
+from pathlib import Path
from typing import Any
from ..base import MarkdownIntegration
@@ -48,6 +49,7 @@ class OpencodeIntegration(MarkdownIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
self.validate_runtime_config(integration_args, integration_options)
args = [self._resolve_executable(), "run"]
diff --git a/src/specify_cli/integrations/rovodev/__init__.py b/src/specify_cli/integrations/rovodev/__init__.py
index f8ba45910..198347be3 100644
--- a/src/specify_cli/integrations/rovodev/__init__.py
+++ b/src/specify_cli/integrations/rovodev/__init__.py
@@ -66,6 +66,7 @@ class RovodevIntegration(SkillsIntegration):
output_json: bool = True,
integration_args: Sequence[str] | None = None,
integration_options: Mapping[str, Any] | None = None,
+ project_root: Path | None = None,
) -> list[str] | None:
"""Build non-interactive ACLI args for RovoDev.
diff --git a/src/specify_cli/workflows/steps/command/__init__.py b/src/specify_cli/workflows/steps/command/__init__.py
index f242c74a7..439007112 100644
--- a/src/specify_cli/workflows/steps/command/__init__.py
+++ b/src/specify_cli/workflows/steps/command/__init__.py
@@ -233,11 +233,14 @@ class CommandStep(StepBase):
impl.validate_runtime_config(integration_args, integration_options)
+ project_root = Path(context.project_root) if context.project_root else None
+
# Build sample args for fallback executable detection when impl.key is not executable.
exec_args = impl.build_exec_args(
"test",
integration_args=integration_args,
integration_options=integration_options,
+ project_root=project_root,
)
# Check if the CLI tool is actually installed.
@@ -248,8 +251,6 @@ class CommandStep(StepBase):
if cli_path is None and fallback_cli_path is None:
return None
- project_root = Path(context.project_root) if context.project_root else None
-
try:
return impl.dispatch_command(
command,
diff --git a/src/specify_cli/workflows/steps/prompt/__init__.py b/src/specify_cli/workflows/steps/prompt/__init__.py
index 3bb9a2708..9c2e683bf 100644
--- a/src/specify_cli/workflows/steps/prompt/__init__.py
+++ b/src/specify_cli/workflows/steps/prompt/__init__.py
@@ -200,7 +200,16 @@ class PromptStep(StepBase):
if impl is None:
return None
- exec_args = impl.build_exec_args(prompt, model=model, output_json=False)
+ project_root = (
+ Path(context.project_root) if context.project_root else Path.cwd()
+ )
+
+ exec_args = impl.build_exec_args(
+ prompt,
+ model=model,
+ output_json=False,
+ project_root=project_root,
+ )
# Check if the CLI tool is actually installed.
# Try the integration key first (covers most agents), then fall back
@@ -227,10 +236,6 @@ class PromptStep(StepBase):
import subprocess
- project_root = (
- Path(context.project_root) if context.project_root else Path.cwd()
- )
-
try:
result = subprocess.run(
exec_args,
diff --git a/tests/conftest.py b/tests/conftest.py
index 28fbfffc7..6fe0c1e2f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -162,6 +162,11 @@ def _strip_specify_env(monkeypatch):
that wants an override sets it explicitly via monkeypatch afterwards."""
for key in [k for k in os.environ if k.startswith("SPECIFY_")]:
monkeypatch.delenv(key, raising=False)
+ for key in list(os.environ):
+ if key.startswith("SPECKIT_INTEGRATION_") and (
+ key.endswith("_EXTRA_ARGS") or key.endswith("_EXECUTABLE")
+ ):
+ monkeypatch.delenv(key, raising=False)
@pytest.fixture
diff --git a/tests/integrations/test_base.py b/tests/integrations/test_base.py
index 30938dd7b..6383cead5 100644
--- a/tests/integrations/test_base.py
+++ b/tests/integrations/test_base.py
@@ -68,6 +68,7 @@ class TestIntegrationBase:
parameters = inspect.signature(integration.build_exec_args).parameters
assert "integration_args" in parameters, key
assert "integration_options" in parameters, key
+ assert "project_root" in parameters, key
def test_unsupported_exec_builders_reject_runtime_config_directly(self):
from specify_cli.integrations import INTEGRATION_REGISTRY
diff --git a/tests/integrations/test_integration_agy.py b/tests/integrations/test_integration_agy.py
index 7b5580ab5..e668f0586 100644
--- a/tests/integrations/test_integration_agy.py
+++ b/tests/integrations/test_integration_agy.py
@@ -34,6 +34,7 @@ class TestAgyInitFlow:
def test_integration_agy_creates_skills(self, tmp_path):
"""--integration agy should create skills directory."""
from typer.testing import CliRunner
+
from specify_cli import app
runner = CliRunner()
@@ -46,6 +47,7 @@ class TestAgyInitFlow:
def test_agy_setup_warning(self, tmp_path):
"""Agy integration should print a warning about v1.20.5 requirement during setup."""
from typer.testing import CliRunner
+
from specify_cli import app
# Click >= 8.2 separates stdout and stderr natively
@@ -67,12 +69,19 @@ class TestAgyBuildExecArgs:
result = i.build_exec_args("describe my feature")
assert result == ["agy", "--print", "describe my feature"]
- def test_build_exec_args_ignores_model(self):
- """agy does not support --model; model param must be ignored."""
+ def test_build_exec_args_honors_model(self):
+ """agy >=1.20 supports --model; it must be prepended before --print."""
from specify_cli.integrations import get_integration
i = get_integration("agy")
result = i.build_exec_args("my prompt", model="gemini-pro")
- assert result == ["agy", "--print", "my prompt"]
+ assert result == ["agy", "--model", "gemini-pro", "--print", "my prompt"]
+
+ def test_build_exec_args_no_model_flag_when_model_is_none(self):
+ """When model is None, no --model flag should appear in the args."""
+ from specify_cli.integrations import get_integration
+ i = get_integration("agy")
+ result = i.build_exec_args("my prompt", model=None)
+ assert "--model" not in result
def test_build_exec_args_ignores_output_json(self):
"""agy does not support JSON output; output_json param must be ignored."""
@@ -81,19 +90,79 @@ class TestAgyBuildExecArgs:
result = i.build_exec_args("my prompt", output_json=False)
assert result == ["agy", "--print", "my prompt"]
- def test_build_exec_args_honors_extra_args(self, monkeypatch):
- """SPECKIT_INTEGRATION_AGY_EXTRA_ARGS must be appended after the prompt.
+ def test_build_exec_args_extra_args_before_print(self, monkeypatch):
+ """SPECKIT_INTEGRATION_AGY_EXTRA_ARGS must be inserted BEFORE --print.
- agy previously skipped _apply_extra_args_env_var entirely, so the
- documented per-integration extra-args hook was silently ignored
- (same class as the merged cursor-agent fix #3265).
+ agy treats every token after --print as part of the prompt string,
+ not as CLI flags. Appending flags after --print (the previous
+ behaviour) caused them to be silently absorbed into the prompt.
+
+ See issue #4480.
"""
from specify_cli.integrations import get_integration
monkeypatch.setenv("SPECKIT_INTEGRATION_AGY_EXTRA_ARGS", "--verbose")
i = get_integration("agy")
- assert i.build_exec_args("my prompt") == [
- "agy", "--print", "my prompt", "--verbose",
- ]
+ result = i.build_exec_args("my prompt")
+ # --verbose must appear before --print
+ assert result.index("--verbose") < result.index("--print")
+ assert result == ["agy", "--verbose", "--print", "my prompt"]
+
+ def test_build_exec_args_add_dir_for_workspace(self, tmp_path):
+ """--add-dir <project_root> must be injected before --print when project_root is given.
+
+ Without --add-dir, agy cannot locate .agents/skills/ and reports
+ 'no active workspace', ignoring installed Spec Kit skills entirely.
+
+ See issue #4480.
+ """
+ from specify_cli.integrations import get_integration
+ i = get_integration("agy")
+ result = i.build_exec_args("my prompt", project_root=tmp_path)
+ assert "--add-dir" in result
+ add_dir_idx = result.index("--add-dir")
+ print_idx = result.index("--print")
+ assert add_dir_idx < print_idx, "--add-dir must come before --print"
+ assert result[add_dir_idx + 1] == str(tmp_path)
+
+ def test_build_exec_args_relative_project_root(self):
+ """Relative project_root must be resolved to an absolute path.
+
+ Passing a relative path to --add-dir breaks agy when the subprocess
+ also changes cwd to that same relative path.
+ """
+ from pathlib import Path
+
+ from specify_cli.integrations import get_integration
+ i = get_integration("agy")
+ rel_path = Path("my_relative_dir")
+ result = i.build_exec_args("my prompt", project_root=rel_path)
+ assert "--add-dir" in result
+ add_dir_idx = result.index("--add-dir")
+ assert result[add_dir_idx + 1] == str(rel_path.resolve())
+
+ def test_build_exec_args_no_add_dir_when_project_root_is_none(self):
+ """When project_root is None, --add-dir must not appear."""
+ from specify_cli.integrations import get_integration
+ i = get_integration("agy")
+ result = i.build_exec_args("my prompt", project_root=None)
+ assert "--add-dir" not in result
+
+ def test_build_exec_args_combined_flag_order(self, monkeypatch, tmp_path):
+ """When model, project_root, and EXTRA_ARGS are all set, order must be:
+ agy --model <m> --add-dir <d> <extra-args> --print <prompt>.
+ """
+ from specify_cli.integrations import get_integration
+ monkeypatch.setenv("SPECKIT_INTEGRATION_AGY_EXTRA_ARGS", "--dangerously-skip-permissions")
+ i = get_integration("agy")
+ result = i.build_exec_args("hello", model="claude-3", project_root=tmp_path)
+ assert result[0] == "agy"
+ assert "--model" in result
+ assert "--add-dir" in result
+ assert "--dangerously-skip-permissions" in result
+ print_idx = result.index("--print")
+ for flag in ("--model", "--add-dir", "--dangerously-skip-permissions"):
+ assert result.index(flag) < print_idx, f"{flag} must appear before --print"
+ assert result[-1] == "hello"
def test_build_exec_args_honors_executable_override(self, monkeypatch):
from specify_cli.integrations import get_integration
@@ -101,6 +170,28 @@ class TestAgyBuildExecArgs:
i = get_integration("agy")
assert i.build_exec_args("my prompt")[0] == "/custom/agy"
+ def test_dispatch_command_forwards_project_root_as_add_dir(self, tmp_path):
+ """dispatch_command must pass project_root to build_exec_args so --add-dir is included."""
+ from unittest.mock import MagicMock, patch
+
+ from specify_cli.integrations import get_integration
+
+ i = get_integration("agy")
+ mock_result = MagicMock()
+ mock_result.returncode = 0
+ mock_result.stdout = ""
+ mock_result.stderr = ""
+
+ with patch("specify_cli.integrations.base.shutil.which", return_value="agy"), \
+ patch("subprocess.run", return_value=mock_result) as mock_run:
+ result = i.dispatch_command("speckit.plan", stream=False, project_root=tmp_path)
+
+ assert result["exit_code"] == 0
+ argv = mock_run.call_args[0][0]
+ assert "--add-dir" in argv
+ assert argv[argv.index("--add-dir") + 1] == str(tmp_path)
+
+
class TestAgyHookCommandNote:
"""Verify dot-to-hyphen normalization note is injected into hook sections."""
diff --git a/tests/integrations/test_integration_bob.py b/tests/integrations/test_integration_bob.py
index 84a463767..752d7a42b 100644
--- a/tests/integrations/test_integration_bob.py
+++ b/tests/integrations/test_integration_bob.py
@@ -379,6 +379,7 @@ class TestBobInitFlowDefault:
def test_init_default_creates_skills(self, tmp_path):
from typer.testing import CliRunner
+
from specify_cli import app
target = tmp_path / "test-proj"
@@ -392,6 +393,7 @@ class TestBobInitFlowDefault:
def test_init_default_complete_file_inventory_sh(self, tmp_path):
from typer.testing import CliRunner
+
from specify_cli import app
project = tmp_path / "inventory-sh-bob"
@@ -422,6 +424,7 @@ class TestBobInitFlowLegacy:
def test_init_legacy_creates_commands(self, tmp_path):
from typer.testing import CliRunner
+
from specify_cli import app
target = tmp_path / "test-proj"
@@ -445,8 +448,8 @@ class TestBobInitFlowLegacy:
legacy projects.)
"""
from typer.testing import CliRunner
- from specify_cli import app
- from specify_cli import load_init_options
+
+ from specify_cli import app, load_init_options
target = tmp_path / "test-proj"
result = CliRunner().invoke(app, [
@@ -504,6 +507,7 @@ class TestBobRegistrarConfig:
def test_legacy_mode_project_extension_registration_runs(self, tmp_path):
"""Extension registrar writes to .bob/commands/ for legacy-mode projects."""
import textwrap
+
from specify_cli.agents import CommandRegistrar
# Simulate a legacy-mode Bob project: .bob/commands exists, .bob/skills does not
@@ -543,6 +547,7 @@ class TestBobRegistrarConfig:
BobIntegration.invoke_separator_for_mode(False) -> ".".
"""
import textwrap
+
from specify_cli.agents import CommandRegistrar
# Legacy-mode project: .bob/commands exists, ai_skills is NOT set.
@@ -582,10 +587,10 @@ class TestBobUseFlowPreservesLegacyLayout:
"""``use``/``switch``/``upgrade`` on a ``.bob/commands``-only project
(no stored ``legacy_commands``) must not write ``ai_skills=True``.
"""
+ from specify_cli import load_init_options
from specify_cli.integrations._helpers import (
_update_init_options_for_integration,
)
- from specify_cli import load_init_options
# Existing Bob 1.x project: legacy commands dir on disk, no ai_skills.
cmds = tmp_path / ".bob" / "commands"
@@ -604,10 +609,10 @@ class TestBobUseFlowPreservesLegacyLayout:
def test_update_init_options_keeps_skills_project_as_skills(self, tmp_path):
"""A ``.bob/skills`` project stays skills on re-activation."""
+ from specify_cli import load_init_options
from specify_cli.integrations._helpers import (
_update_init_options_for_integration,
)
- from specify_cli import load_init_options
(tmp_path / ".bob" / "skills" / "speckit-plan").mkdir(parents=True)
bob = get_integration("bob")
@@ -648,7 +653,9 @@ class TestBobUseFlowPreservesLegacyLayout:
with ``/speckit.<cmd>`` (dot), not ``/speckit-<cmd>``.
"""
import json
+
from typer.testing import CliRunner
+
from specify_cli import app
# Create a real legacy Bob project (renders shared templates).
@@ -974,8 +981,17 @@ class TestBobCliDispatch:
def test_build_exec_args_ignores_model(self):
"""Bob exposes no model flag on ``run``, so *model* is a no-op."""
bob = get_integration("bob")
- assert bob.build_exec_args("/speckit-plan", model="some-model") == \
- bob.build_exec_args("/speckit-plan")
+ assert bob.build_exec_args("/speckit-plan", model="gpt-4") == [
+ "bob", "run", "--trust", "--accept-license", "-f", "json",
+ "/speckit-plan",
+ ]
+
+ def test_build_exec_args_ignores_project_root(self, tmp_path):
+ """Bob uses cwd for project context, so *project_root* is accepted but ignored in CLI args."""
+ bob = get_integration("bob")
+ args_with = bob.build_exec_args("/speckit-plan", project_root=tmp_path)
+ args_without = bob.build_exec_args("/speckit-plan")
+ assert args_with == args_without
def test_command_invocation_uses_hyphen_in_skills_mode(self):
"""Skills-mode projects install ``.bob/skills/speckit-<cmd>/``, so the
diff --git a/tests/test_workflows.py b/tests/test_workflows.py
index 228b8d3c8..ac9f47b40 100644
--- a/tests/test_workflows.py
+++ b/tests/test_workflows.py
@@ -2087,6 +2087,42 @@ class TestPromptStep:
assert result.status is StepStatus.FAILED, bad
assert "'timeout' must be a positive number" in (result.error or ""), bad
+ def test_try_dispatch_threads_project_root(self):
+ """PromptStep._try_dispatch must pass context.project_root to build_exec_args."""
+ from pathlib import Path
+ from unittest.mock import MagicMock, patch
+
+ from specify_cli.workflows.base import StepContext
+ from specify_cli.workflows.steps.prompt import PromptStep
+
+ step = PromptStep()
+ ctx = StepContext(project_root="/fake/project/root", default_integration="dummy")
+
+ mock_impl = MagicMock()
+ mock_impl.key = "dummy"
+ mock_impl.build_exec_args.return_value = ["dummy", "args"]
+ mock_get_integration = MagicMock(return_value=mock_impl)
+
+ mock_result = MagicMock()
+ mock_result.returncode = 0
+ mock_result.stdout = ""
+ mock_result.stderr = ""
+
+ with patch("specify_cli.integrations.get_integration", mock_get_integration), \
+ patch("specify_cli.workflows.steps.prompt.shutil.which", return_value="/opt/dummy"), \
+ patch("subprocess.run", return_value=mock_result):
+ step.execute(
+ {"id": "p", "type": "prompt", "prompt": "hi", "integration": "dummy"},
+ ctx,
+ )
+
+ mock_impl.build_exec_args.assert_called_once_with(
+ "hi",
+ model=None,
+ output_json=False,
+ project_root=Path("/fake/project/root"),
+ )
+
class TestShellStep:
"""Test the shell step type."""