mirror of
https://github.com/github/spec-kit.git
synced 2026-07-03 12:28:06 +08:00
* feat(init)!: make git extension opt-in and remove --no-git at v0.10.0 - Remove --no-git parameter from specify init command - Remove git extension auto-installation from init flow - Git repository initialization (git init) still runs when git is available - Remove --no-git from all test invocations across the test suite - Update docs to reflect opt-in git extension behavior - Replace TestGitExtensionAutoInstall with TestGitExtensionOptIn tests BREAKING CHANGE: specify init no longer auto-installs the git extension. Use `specify extension add git` to install it explicitly. The --no-git flag has been removed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(scripts): remove git operations from core scripts Git functionality is now entirely managed by the git extension. Core scripts only handle directory-based feature creation and numbering. - Remove has_git(), check_feature_branch(), git branch creation from core - Simplify number detection to use only spec directory scanning - Remove HAS_GIT output from get_feature_paths() - Remove git remote fetching and branch querying - Keep BRANCH_NAME output key for backward compatibility Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor: remove all git operations from core - Remove is_git_repo() and init_git_repo() dead code from _utils.py - Remove --branch-numbering from init command - Remove git from 'specify check' (now extension-only) - Update docs: git is optional prerequisite, check command description - Fix tests to reflect no-git-in-core reality (fallback to main) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(scripts): remove directory scanning and branch fallback from core Core scripts now resolve feature context exclusively from: 1. SPECIFY_FEATURE env var (set by git extension) 2. .specify/feature.json (persisted by specify command) Removed find_feature_dir_by_prefix() and directory scanning heuristics — these are the git extension's responsibility. Scripts error clearly when no feature context is available. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat: introduce feature_numbering, deprecate branch_numbering in init-options - specify command template now reads feature_numbering (preferred) with fallback to branch_numbering (deprecated) from init-options.json - Git extension reads git-config.yml > feature_numbering > branch_numbering - init now writes feature_numbering: sequential to init-options.json - Deprecation warning emitted when branch_numbering is used as fallback Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: remove trailing whitespace in common.ps1 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * feat(scripts): persist SPECIFY_FEATURE_DIRECTORY env var to feature.json When SPECIFY_FEATURE_DIRECTORY is set, get_feature_paths() now writes the value to .specify/feature.json so future sessions without the env var can still resolve the feature directory. The write is idempotent — it skips when the file already contains the same value. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: address review feedback — error messages and docs - Update error messages in common.sh and common.ps1 to reference SPECIFY_FEATURE_DIRECTORY instead of SPECIFY_FEATURE (which no longer resolves feature directories) - Fix get_current_branch comment (returns empty string, not error) - Update upgrade.md to reference SPECIFY_FEATURE_DIRECTORY with correct example paths - Update local-development.md troubleshooting: replace stale 'Git step skipped' row with actionable git extension guidance Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(scripts): harden feature.json persistence - Use json_escape in printf fallback when jq is unavailable (common.sh) - Replace utf8NoBOM encoding with UTF8Encoding($false) for PowerShell 5.1 compatibility (common.ps1) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(scripts): remove dead feature_json_matches_feature_dir functions These guards are no longer needed since the branch-name validation they protected against has been removed from check-prerequisites. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(git-ext): rename create-new-feature to create-new-feature-branch The git extension's script only creates the git branch — rename it to reflect that responsibility. The core create-new-feature.sh/.ps1 handles feature directory creation and feature.json persistence. Also includes fixes from review feedback: - common.sh: _persist_feature_json uses json_escape fallback - common.ps1: Save-FeatureJson uses UTF8Encoding for PS 5.1 compat - common.ps1: case-sensitive path stripping on non-Windows - create-new-feature.sh/ps1: output both SPECIFY_FEATURE and SPECIFY_FEATURE_DIRECTORY - setup-tasks.sh: fix stale 'Validate branch' comment Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(tests): update references to renamed git extension scripts Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(tests): remove duplicate EXT_CREATE_FEATURE assignments Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Manfred Riem <mnriem@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
150 lines
6.7 KiB
Python
150 lines
6.7 KiB
Python
"""Tests for KiroCliIntegration."""
|
|
|
|
import os
|
|
import re
|
|
|
|
from specify_cli.integrations import get_integration
|
|
from specify_cli.integrations.kiro_cli import _KIRO_ARG_FALLBACK
|
|
from specify_cli.integrations.manifest import IntegrationManifest
|
|
|
|
from .test_integration_base_markdown import MarkdownIntegrationTests
|
|
|
|
|
|
# Regex shapes that indicate a value is a placeholder token, not prose.
|
|
# Covers Bash ($VAR, ${VAR}, ${VAR:-default}), Mustache/Handlebars/Jinja
|
|
# ({{var}}, {{{var}}}), Liquid/Jinja control ({% ... %}), Python str.format /
|
|
# .NET ({var}, {0}), angle-bracket (<var>), and Windows-style (%VAR%).
|
|
# Anchored to the FULL STRING so legitimate prose mentioning a placeholder
|
|
# (e.g. "the {{magic}} of placeholders") is not flagged. The Liquid pattern
|
|
# is anchored to the START so multi-tag templates fire while mid-sentence
|
|
# {%-quotation does not.
|
|
_PLACEHOLDER_TOKEN_PATTERNS = (
|
|
re.compile(r"^\$\w+$"), # $ARGUMENTS, $args
|
|
re.compile(r"^\$\{\w+(?:[:\-+?][^}]*)?\}$"), # ${ARGS}, ${ARGS:-default}
|
|
re.compile(r"^\{\{\{?\s*\w+(\s*[|.][^}]*)?\s*\}?\}\}$"), # {{var}} {{{var}}} {{x|y}}
|
|
re.compile(r"^\{%"), # {% if x %}{{ x }}{% endif %}
|
|
re.compile(r"^<\w+>$"), # <args>
|
|
re.compile(r"^%\w+%$"), # %USERNAME%
|
|
re.compile(r"^\{(?:\d+|[a-zA-Z_]\w*)(?:[.\[][^}]*)?(?:![rsa])?(?::[^}]*)?\}$"), # {0}, {var}, {0:>5}
|
|
)
|
|
|
|
|
|
def _looks_like_placeholder_token(value: str) -> bool:
|
|
"""Return True if *value* matches a known placeholder-token shape."""
|
|
if not value:
|
|
return False
|
|
return any(p.search(value) for p in _PLACEHOLDER_TOKEN_PATTERNS)
|
|
|
|
|
|
class TestKiroCliIntegration(MarkdownIntegrationTests):
|
|
KEY = "kiro-cli"
|
|
FOLDER = ".kiro/"
|
|
COMMANDS_SUBDIR = "prompts"
|
|
REGISTRAR_DIR = ".kiro/prompts"
|
|
CONTEXT_FILE = "AGENTS.md"
|
|
|
|
def test_registrar_config(self):
|
|
"""Override base assertion: kiro-cli uses a prose fallback for args
|
|
because Kiro CLI file-based prompts do not natively substitute
|
|
``$ARGUMENTS`` (see issue #1926 / kirodotdev/Kiro#4141). The
|
|
regression-guard load is carried by the two layer tests below
|
|
(exact-fallback + placeholder-shape rejection)."""
|
|
i = get_integration(self.KEY)
|
|
assert i.registrar_config["dir"] == self.REGISTRAR_DIR
|
|
assert i.registrar_config["format"] == "markdown"
|
|
assert i.registrar_config["extension"] == ".md"
|
|
|
|
def test_registrar_config_args_is_exact_prose_fallback(self):
|
|
"""Layer 1 — pin the exact fallback so wording drift requires a
|
|
deliberate paired commit (production constant + test update)."""
|
|
i = get_integration(self.KEY)
|
|
assert i.registrar_config["args"] == _KIRO_ARG_FALLBACK, (
|
|
f"args drifted from the pinned fallback constant. "
|
|
f"Got: {i.registrar_config['args']!r}; expected: {_KIRO_ARG_FALLBACK!r}. "
|
|
f"If the wording change is intentional, update _KIRO_ARG_FALLBACK and "
|
|
f"this test together."
|
|
)
|
|
|
|
def test_registrar_config_args_does_not_look_like_a_placeholder_token(self):
|
|
"""Layer 2 — independent regression guard: even if someone bypasses
|
|
layer-1 by changing both constant and test, the value still must not
|
|
look like ANY placeholder token shape ($X, ${X}, {{X}}, <X>, %X%, {0},
|
|
{% %}). Catches the class of regression Copilot called out: a swap
|
|
from $ARGUMENTS to $INPUT or {{userMessage}} would fail this test
|
|
even if it accidentally passed layer 1."""
|
|
i = get_integration(self.KEY)
|
|
args = i.registrar_config["args"]
|
|
assert not _looks_like_placeholder_token(args), (
|
|
f"registrar_config['args'] = {args!r} matches a known placeholder-"
|
|
f"token shape — Kiro CLI does not substitute placeholders so this "
|
|
f"would reach the model verbatim and break the prompt (issue #1926). "
|
|
f"Use a prose fallback instead."
|
|
)
|
|
|
|
def test_rendered_prompts_do_not_contain_raw_arguments(self, tmp_path):
|
|
"""Rendered Kiro prompt files must NOT contain the raw ``$ARGUMENTS``
|
|
token — Kiro CLI does not substitute it, so the literal would reach
|
|
the model and break the prompt (issue #1926)."""
|
|
integration = get_integration(self.KEY)
|
|
manifest = IntegrationManifest(self.KEY, tmp_path)
|
|
integration.setup(tmp_path, manifest, script_type="sh")
|
|
|
|
prompts_dir = tmp_path / self.REGISTRAR_DIR
|
|
rendered = list(prompts_dir.glob("*.md"))
|
|
assert rendered, "expected at least one rendered prompt file"
|
|
|
|
offenders = [
|
|
p.name for p in rendered if "$ARGUMENTS" in p.read_text(encoding="utf-8")
|
|
]
|
|
assert offenders == [], (
|
|
f"these rendered prompts still contain the raw $ARGUMENTS token: {offenders}"
|
|
)
|
|
|
|
def test_rendered_prompts_contain_kiro_arg_placeholder(self, tmp_path):
|
|
"""The chosen kiro-cli args fallback string must end up in at least
|
|
one rendered prompt (proves substitution actually fired, not just
|
|
that $ARGUMENTS was removed). Imports the fallback constant directly
|
|
instead of reading the field back so the test stays independent of
|
|
the integration's own config — even if the registrar_config['args']
|
|
regresses, this test still verifies the FALLBACK STRING is in the
|
|
rendered output."""
|
|
integration = get_integration(self.KEY)
|
|
manifest = IntegrationManifest(self.KEY, tmp_path)
|
|
integration.setup(tmp_path, manifest, script_type="sh")
|
|
|
|
expected = _KIRO_ARG_FALLBACK
|
|
prompts_dir = tmp_path / self.REGISTRAR_DIR
|
|
contents = "\n".join(
|
|
p.read_text(encoding="utf-8") for p in prompts_dir.glob("*.md")
|
|
)
|
|
assert expected in contents, (
|
|
f"none of the rendered prompts contain the configured args fallback "
|
|
f"({expected!r})"
|
|
)
|
|
|
|
|
|
class TestKiroIntegration:
|
|
"""--integration kiro-cli creates expected files."""
|
|
|
|
def test_integration_kiro_cli_creates_files(self, tmp_path):
|
|
"""--integration kiro-cli should create files in .kiro/prompts."""
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
|
|
target = tmp_path / "kiro-proj"
|
|
target.mkdir()
|
|
|
|
old_cwd = os.getcwd()
|
|
try:
|
|
os.chdir(target)
|
|
runner = CliRunner()
|
|
result = runner.invoke(app, [
|
|
"init", "--here", "--integration", "kiro-cli",
|
|
"--ignore-agent-tools", "--script", "sh",
|
|
], catch_exceptions=False)
|
|
finally:
|
|
os.chdir(old_cwd)
|
|
|
|
assert result.exit_code == 0
|
|
assert (target / ".kiro" / "prompts" / "speckit.plan.md").exists()
|