16cfab7724
* feat(presets): resolve constitutions at command time Gate install-time constitution materialization behind the constitution-sync preset while preserving one-time init seeding and authored-file safeguards. Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7dbce70f-80c6-4e14-a30d-78cb358bcb84 * fix(presets): emit composed template content Add a machine-readable preset resolve mode backed by PresetResolver.resolve_content and require the constitution command to consume it. Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7dbce70f-80c6-4e14-a30d-78cb358bcb84 * fix(presets): unify runtime template composition Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7dbce70f-80c6-4e14-a30d-78cb358bcb84 * fix(presets): secure runtime template resolution Align runtime resolution across script variants, validate registry path components, and honor canonical extension ordering and convention paths. Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(presets): align runtime priority semantics Normalize and tie-break preset priorities consistently across script variants, and preserve template bytes when Python materializes generated files. Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(presets): stop at effective template base Avoid parsing irrelevant lower layers once resolution reaches a replace base, and decode raw bytes so Python preserves source line endings. Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(presets): align extension template resolution Support root-level extension templates across runtime resolvers, fail safely when Bash cannot parse an extension registry, and validate requested templates in every prerequisite output mode. Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * fix(presets): resolve dotted command identifiers Route safe dotted names through command resolution, correct traversal coverage, and make Windows CI text decoding explicit. Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * Avoid orphan feature directories on template errors Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> * Align malformed preset manifest handling Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c * Complete runtime resolver parity Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c * Fail closed on resolver input errors Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c * Force UTF-8 and full manifest validation Force UTF-8 decoding for registry and manifest reads in the Bash and PowerShell embedded-Python parsers so resolution no longer depends on the process locale, and validate every manifest template entry's required fields, type, and strategy consistent with the canonical PresetManifest. Assisted-by: GitHub Copilot (model: claude-opus-4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c * Fail closed on empty manifests and corrupt registries Reject manifests missing the provides/templates sections or declaring an empty template list in all three runtime resolvers, matching the canonical PresetManifest which treats those as invalid instead of silently degrading a composing layer to a convention `replace` lookup. Make a corrupt or unreadable extension registry fail closed in Bash, PowerShell, and Python instead of swallowing the error and treating every on-disk extension directory as unregistered-and-enabled, which could activate a disabled extension. Read the preset and extension registries as explicit UTF-8 in the PowerShell resolver so priority/enabled-state decoding no longer depends on the process code page under Windows PowerShell 5.1. Assisted-by: GitHub Copilot (model: claude-opus-4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c * fix(presets): fail closed when extension registry is not a regular file The Bash and Python resolvers used is_file()/`-f` to gate reading the extension `.registry`, which returns false for a directory or a broken symlink at that path. In those cases the resolvers treated the registry as absent and scanned every on-disk extension directory as unregistered and enabled — a fail-open path. Detect any filesystem entry at the registry path (including broken symlinks) and reject unless it is a readable regular file. PowerShell now rejects a non-leaf entry explicitly for parity. Adds directory- and broken-symlink parity regressions. Assisted-by: GitHub Copilot (model: claude-opus-4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c * fix(presets): fail closed on corrupt registry in canonical resolver and PowerShell Two remaining fail-open paths for an invalid extension registry: - The canonical PresetResolver enumerated extensions through ExtensionRegistry, whose _load() normalizes a corrupt or unreadable registry to an empty mapping. The directory scan then admitted every on-disk extension directory as unregistered-and-enabled, so a corrupt registry could still supply constitution content at init and through constitution-sync materialization. Add a non-invasive is_corrupt() probe (recovery behavior for install/enable/disable is unchanged) and raise from _get_all_extensions_by_priority() when the registry exists but is invalid. _load() now also recovers from OSError/UnicodeDecodeError so a directory or unreadable registry no longer crashes construction. - The PowerShell resolver gated the registry read with Test-Path, which returns false for a dangling symlink on Windows, letting a broken .registry symlink bypass the guard and enable every on-disk extension. Detect the entry via directory enumeration (which observes a broken symlink) and reject it unless it is a readable regular file. Adds canonical corrupt/directory-registry regressions and extends the broken-symlink parity test to PowerShell. Assisted-by: GitHub Copilot (model: claude-opus-4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c * fix(presets): detect dangling registry symlink in ExtensionRegistry.is_corrupt is_corrupt() gated on Path.exists(), which follows symlinks and returns False for a dangling .registry symlink — so the canonical PresetResolver treated it as an absent registry and fell back to scanning every on-disk extension directory as unregistered-and-enabled, reopening the fail-open path this guard closes. Detect lexical existence with os.path.lexists and require a regular file before parsing, so a broken symlink (or directory) is reported corrupt and resolution fails closed. Adds a canonical broken-symlink regression alongside the directory case. Assisted-by: GitHub Copilot (model: claude-opus-4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7dbce70f-80c6-4e14-a30d-78cb358bcb84 Copilot-Session: 3158e06f-95df-4e3a-843f-f159a35aa30c
227 lines
8.6 KiB
Python
227 lines
8.6 KiB
Python
"""Tests for ClineIntegration."""
|
|
|
|
import os
|
|
import pytest
|
|
|
|
from specify_cli.integrations import get_integration
|
|
from specify_cli.integrations.cline import format_cline_command_name
|
|
from .test_integration_base_markdown import MarkdownIntegrationTests
|
|
|
|
|
|
class TestClineCommandNameFormatter:
|
|
"""Test the Cline command name formatter."""
|
|
|
|
def test_simple_name_without_prefix(self):
|
|
"""Test formatting a simple name without 'speckit.' prefix."""
|
|
assert format_cline_command_name("plan") == "speckit-plan"
|
|
assert format_cline_command_name("tasks") == "speckit-tasks"
|
|
assert format_cline_command_name("specify") == "speckit-specify"
|
|
|
|
def test_name_with_speckit_prefix(self):
|
|
"""Test formatting a name that already has 'speckit.' prefix."""
|
|
assert format_cline_command_name("speckit.plan") == "speckit-plan"
|
|
assert format_cline_command_name("speckit.tasks") == "speckit-tasks"
|
|
|
|
def test_extension_command_name(self):
|
|
"""Test formatting extension command names with dots."""
|
|
assert (
|
|
format_cline_command_name("speckit.my-extension.example")
|
|
== "speckit-my-extension-example"
|
|
)
|
|
assert (
|
|
format_cline_command_name("my-extension.example")
|
|
== "speckit-my-extension-example"
|
|
)
|
|
|
|
def test_idempotent_already_hyphenated(self):
|
|
"""Test that already-hyphenated names are returned unchanged (idempotent)."""
|
|
assert format_cline_command_name("speckit-plan") == "speckit-plan"
|
|
assert (
|
|
format_cline_command_name("speckit-my-extension-example")
|
|
== "speckit-my-extension-example"
|
|
)
|
|
|
|
|
|
class TestClineIntegration(MarkdownIntegrationTests):
|
|
KEY = "cline"
|
|
FOLDER = ".clinerules/"
|
|
COMMANDS_SUBDIR = "workflows"
|
|
REGISTRAR_DIR = ".clinerules/workflows"
|
|
|
|
@pytest.mark.parametrize(
|
|
"cmd_name, expected_filename",
|
|
[
|
|
("plan", "speckit-plan.md"),
|
|
("speckit.plan", "speckit-plan.md"),
|
|
("speckit.git.commit", "speckit-git-commit.md"),
|
|
("speckit", "speckit-speckit.md"),
|
|
("speckitfoo", "speckit-speckitfoo.md"),
|
|
],
|
|
)
|
|
def test_cline_command_filename(self, cmd_name, expected_filename):
|
|
"""Verify Cline uses hyphenated filenames."""
|
|
cline = get_integration("cline")
|
|
assert cline.command_filename(cmd_name) == expected_filename
|
|
|
|
def test_cline_invoke_separator(self):
|
|
"""Verify Cline uses hyphen as invoke separator."""
|
|
cline = get_integration("cline")
|
|
assert cline.invoke_separator == "-"
|
|
assert cline.registrar_config["invoke_separator"] == "-"
|
|
|
|
def test_cline_name_injection_and_formatting(self):
|
|
"""Verify Cline has inject_name and format_name configured."""
|
|
cline = get_integration("cline")
|
|
assert cline.registrar_config["inject_name"] is True
|
|
assert cline.registrar_config["format_name"] == format_cline_command_name
|
|
|
|
def test_cline_handoff_rewrite(self):
|
|
"""Verify Cline rewrites agent: speckit.foo to agent: speckit-foo."""
|
|
cline = get_integration("cline")
|
|
content = "---\nagent: speckit.plan\n---\n"
|
|
rewritten = cline._rewrite_handoff_references(content)
|
|
assert rewritten == "---\nagent: speckit-plan\n---\n"
|
|
|
|
def test_cline_hook_instruction_injection(self):
|
|
"""Verify Cline injects the dot-to-hyphen note for hooks."""
|
|
cline = get_integration("cline")
|
|
content = "- For each executable hook, output the following:\n"
|
|
injected = cline._inject_hook_command_note(content)
|
|
assert "replace dots (`.`) with hyphens (`-`)" in injected
|
|
assert "- For each executable hook, output the following:" in injected
|
|
|
|
def test_cline_hook_instruction_injection_no_trailing_newline(self):
|
|
"""Note must not collapse onto the instruction line when the
|
|
instruction is the final line with no trailing newline.
|
|
|
|
The injection regex matches the end-of-line via ``(\\r\\n|\\n|$)``, so
|
|
the captured ``eol`` is empty on a file's last line that lacks a
|
|
trailing newline. Without an ``or "\\n"`` fallback the note text and
|
|
the instruction are emitted on the same line.
|
|
"""
|
|
cline = get_integration("cline")
|
|
content = "- For each executable hook, output the following:" # no trailing \n
|
|
injected = cline._inject_hook_command_note(content)
|
|
assert "replace dots (`.`) with hyphens (`-`)" in injected
|
|
# Instruction stays on its own line rather than being mashed onto the note.
|
|
assert "\n- For each executable hook, output the following:" in injected
|
|
|
|
# -- Overrides for MarkdownIntegrationTests ---------------------------
|
|
|
|
def test_setup_creates_files(self, tmp_path):
|
|
from specify_cli.integrations.manifest import IntegrationManifest
|
|
|
|
i = get_integration(self.KEY)
|
|
m = IntegrationManifest(self.KEY, tmp_path)
|
|
created = i.setup(tmp_path, m)
|
|
assert len(created) > 0
|
|
cmd_files = [
|
|
f
|
|
for f in created
|
|
if "scripts" not in f.parts
|
|
and f.suffix == ".md"
|
|
]
|
|
for f in cmd_files:
|
|
assert f.exists()
|
|
assert f.name.startswith("speckit-")
|
|
assert f.name.endswith(".md")
|
|
|
|
specify_file = next(
|
|
(f for f in cmd_files if f.name == "speckit-specify.md"), None
|
|
)
|
|
assert specify_file is not None
|
|
specify_contents = specify_file.read_text(encoding="utf-8")
|
|
assert "/speckit-plan" in specify_contents
|
|
assert "/speckit.plan" not in specify_contents
|
|
|
|
def test_integration_flag_creates_files(self, tmp_path):
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
|
|
project = tmp_path / f"int-{self.KEY}"
|
|
project.mkdir()
|
|
old_cwd = os.getcwd()
|
|
try:
|
|
os.chdir(project)
|
|
runner = CliRunner()
|
|
result = runner.invoke(
|
|
app,
|
|
[
|
|
"init",
|
|
"--here",
|
|
"--integration",
|
|
self.KEY,
|
|
"--script",
|
|
"sh",
|
|
"--ignore-agent-tools",
|
|
],
|
|
catch_exceptions=False,
|
|
)
|
|
finally:
|
|
os.chdir(old_cwd)
|
|
assert result.exit_code == 0
|
|
i = get_integration(self.KEY)
|
|
cmd_dir = i.commands_dest(project)
|
|
assert cmd_dir.is_dir()
|
|
commands = sorted(cmd_dir.glob("speckit-*"))
|
|
assert len(commands) > 0
|
|
|
|
def _expected_files(self, script_variant: str) -> list[str]:
|
|
"""Override to expect hyphenated speckit- prefix."""
|
|
i = get_integration(self.KEY)
|
|
cmd_dir = i.registrar_config["dir"]
|
|
files = []
|
|
|
|
# Command files
|
|
for stem in (
|
|
self.COMMANDS_SUBDIR_STEMS
|
|
if hasattr(self, "COMMANDS_SUBDIR_STEMS")
|
|
else self.COMMAND_STEMS
|
|
):
|
|
files.append(f"{cmd_dir}/speckit-{stem.replace('.', '-')}.md")
|
|
|
|
# Framework files
|
|
files.append(".specify/integration.json")
|
|
files.append(".specify/init-options.json")
|
|
files.append(f".specify/integrations/{self.KEY}.manifest.json")
|
|
files.append(".specify/integrations/speckit.manifest.json")
|
|
files.append(".specify/.gitignore")
|
|
|
|
if script_variant == "sh":
|
|
for name in [
|
|
"check-prerequisites.sh",
|
|
"common.sh",
|
|
"create-new-feature.sh",
|
|
"resolve-template.sh",
|
|
"setup-plan.sh",
|
|
"setup-tasks.sh",
|
|
]:
|
|
files.append(f".specify/scripts/bash/{name}")
|
|
else:
|
|
for name in [
|
|
"check-prerequisites.ps1",
|
|
"common.ps1",
|
|
"create-new-feature.ps1",
|
|
"resolve-template.ps1",
|
|
"setup-plan.ps1",
|
|
"setup-tasks.ps1",
|
|
]:
|
|
files.append(f".specify/scripts/powershell/{name}")
|
|
|
|
for name in [
|
|
"checklist-template.md",
|
|
"constitution-template.md",
|
|
"plan-template.md",
|
|
"spec-template.md",
|
|
"tasks-template.md",
|
|
]:
|
|
files.append(f".specify/templates/{name}")
|
|
|
|
files.append(".specify/memory/.constitution-template.json")
|
|
files.append(".specify/memory/constitution.md")
|
|
# Bundled workflow
|
|
files.append(".specify/workflows/speckit/workflow.yml")
|
|
files.append(".specify/workflows/workflow-registry.json")
|
|
|
|
return sorted(files)
|