mirror of
https://github.com/github/spec-kit
synced 2026-06-21 13:51:39 +00:00
255371d367
* Stage 3: Standard markdown integrations — 19 agents migrated to plugin architecture
Migrate all standard markdown integrations to self-contained subpackages
under integrations/. Each subclasses MarkdownIntegration with config-only
overrides (~10 lines per __init__.py).
Integrations migrated (19):
claude, qwen, opencode, junie, kilocode, auggie, roo, codebuddy,
qodercli, amp, shai, bob, trae, pi, iflow, kiro-cli, windsurf,
vibe, cursor-agent
Changes:
- Create integrations/<key>/ subpackage with __init__.py and scripts/
(update-context.sh, update-context.ps1) for each integration
- Register all 19 in INTEGRATION_REGISTRY (20 total with copilot)
- MarkdownIntegration.setup() processes templates (replaces {SCRIPT},
{ARGS}, __AGENT__; strips frontmatter blocks; rewrites paths)
- Extract install_scripts() to IntegrationBase; refactor copilot to use it
- Generalize --ai auto-promote from copilot-only to registry-driven:
any integration registered in INTEGRATION_REGISTRY auto-promotes.
Unregistered agents (gemini, tabnine, codex, kimi, agy, generic)
continue through the legacy --ai path unchanged.
- Fix cursor/cursor-agent key mismatch in CommandRegistrar.AGENT_CONFIGS
- Add missing vibe entry to CommandRegistrar.AGENT_CONFIGS
- Update kiro alias test to reflect auto-promote behavior
Testing:
- Per-agent test files (test_integration_<agent>.py) with shared mixin
- 1316 tests passing, 0 failures
- Complete file inventory tests for both sh and ps variants
- Byte-for-byte validated against v0.4.3 release packages (684 files)
* Address PR review: fix repo root detection and no-op test
- Fix repo root fallback in all 20 update-context.sh scripts: walk up
from script location to find .specify/ instead of falling back to pwd
- Fix repo root fallback in all 20 update-context.ps1 scripts: walk up
from script location to find .specify/ instead of falling back to $PWD
- Add assertions to test_setup_writes_to_correct_directory: verify
expected_dir exists and all command files reside under it
* Fix REPO_ROOT priority: prefer .specify walk-up over git root
In monorepos the git toplevel may differ from the project root that
contains .specify/. The previous fix still preferred git rev-parse
over the walk-up result.
Bash scripts (20): prefer the discovered _root when it contains
.specify/; only accept git root if it also contains .specify/.
PowerShell scripts (20): validate git root contains .specify/ before
using it; fall back to walking up from script directory otherwise.
* Guard git call with try/catch in PowerShell scripts
With $ErrorActionPreference = 'Stop', an unguarded git rev-parse
throws a terminating CommandNotFoundException when git is not
installed, preventing the .specify walk-up fallback from running.
Wrap the git call in try/catch across all 20 update-context.ps1
scripts so the fallback works reliably without git.
* Rename hyphenated package dirs to valid Python identifiers
Rename kiro-cli → kiro_cli and cursor-agent → cursor_agent so the
packages can be imported with normal Python syntax instead of
importlib. The user-facing integration key (IntegrationBase.key)
stays hyphenated to match the actual CLI tool / binary name.
Also reorganize _register_builtins(): imports and registrations
are now grouped alphabetically with clear section comments.
* Reuse CommandRegistrar path rewriting in process_template()
Replace the duplicated regex-based path rewriting in
MarkdownIntegration.process_template() with a call to the shared
CommandRegistrar._rewrite_project_relative_paths() implementation.
This ensures extension-local paths are preserved and boundary rules
stay consistent across the codebase.
* Promote _rewrite_project_relative_paths to public API
Rename CommandRegistrar._rewrite_project_relative_paths() to
rewrite_project_relative_paths() (drop leading underscore) so
integrations can call it without reaching into a private method
across subsystem boundaries.
Addresses PR review feedback:
https://github.com/github/spec-kit/pull/2038#discussion_r3022105627
* Broaden TestRegistrarKeyAlignment to cover all integration keys
Parametrize across ALL_INTEGRATION_KEYS instead of only checking
cursor-agent and vibe. Keeps a separate negative test for the
stale 'cursor' shorthand.
Addresses PR review feedback:
https://github.com/github/spec-kit/pull/2038#discussion_r3022269032
186 lines
6.9 KiB
Python
186 lines
6.9 KiB
Python
"""Copilot integration — GitHub Copilot in VS Code.
|
|
|
|
Copilot has several unique behaviors compared to standard markdown agents:
|
|
- Commands use ``.agent.md`` extension (not ``.md``)
|
|
- Each command gets a companion ``.prompt.md`` file in ``.github/prompts/``
|
|
- Installs ``.vscode/settings.json`` with prompt file recommendations
|
|
- Context file lives at ``.github/copilot-instructions.md``
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import shutil
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from ..base import IntegrationBase
|
|
from ..manifest import IntegrationManifest
|
|
|
|
|
|
class CopilotIntegration(IntegrationBase):
|
|
"""Integration for GitHub Copilot in VS Code."""
|
|
|
|
key = "copilot"
|
|
config = {
|
|
"name": "GitHub Copilot",
|
|
"folder": ".github/",
|
|
"commands_subdir": "agents",
|
|
"install_url": None,
|
|
"requires_cli": False,
|
|
}
|
|
registrar_config = {
|
|
"dir": ".github/agents",
|
|
"format": "markdown",
|
|
"args": "$ARGUMENTS",
|
|
"extension": ".agent.md",
|
|
}
|
|
context_file = ".github/copilot-instructions.md"
|
|
|
|
def command_filename(self, template_name: str) -> str:
|
|
"""Copilot commands use ``.agent.md`` extension."""
|
|
return f"speckit.{template_name}.agent.md"
|
|
|
|
def setup(
|
|
self,
|
|
project_root: Path,
|
|
manifest: IntegrationManifest,
|
|
parsed_options: dict[str, Any] | None = None,
|
|
**opts: Any,
|
|
) -> list[Path]:
|
|
"""Install copilot commands, companion prompts, and VS Code settings.
|
|
|
|
Uses base class primitives to: read templates, process them
|
|
(replace placeholders, strip script blocks, rewrite paths),
|
|
write as ``.agent.md``, then add companion prompts and VS Code settings.
|
|
"""
|
|
project_root_resolved = project_root.resolve()
|
|
if manifest.project_root != project_root_resolved:
|
|
raise ValueError(
|
|
f"manifest.project_root ({manifest.project_root}) does not match "
|
|
f"project_root ({project_root_resolved})"
|
|
)
|
|
|
|
templates = self.list_command_templates()
|
|
if not templates:
|
|
return []
|
|
|
|
dest = self.commands_dest(project_root)
|
|
dest_resolved = dest.resolve()
|
|
try:
|
|
dest_resolved.relative_to(project_root_resolved)
|
|
except ValueError as exc:
|
|
raise ValueError(
|
|
f"Integration destination {dest_resolved} escapes "
|
|
f"project root {project_root_resolved}"
|
|
) from exc
|
|
dest.mkdir(parents=True, exist_ok=True)
|
|
created: list[Path] = []
|
|
|
|
script_type = opts.get("script_type", "sh")
|
|
arg_placeholder = self.registrar_config.get("args", "$ARGUMENTS")
|
|
|
|
# 1. Process and write command files as .agent.md
|
|
for src_file in templates:
|
|
raw = src_file.read_text(encoding="utf-8")
|
|
processed = self.process_template(raw, self.key, script_type, arg_placeholder)
|
|
dst_name = self.command_filename(src_file.stem)
|
|
dst_file = self.write_file_and_record(
|
|
processed, dest / dst_name, project_root, manifest
|
|
)
|
|
created.append(dst_file)
|
|
|
|
# 2. Generate companion .prompt.md files from the templates we just wrote
|
|
prompts_dir = project_root / ".github" / "prompts"
|
|
for src_file in templates:
|
|
cmd_name = f"speckit.{src_file.stem}"
|
|
prompt_content = f"---\nagent: {cmd_name}\n---\n"
|
|
prompt_file = self.write_file_and_record(
|
|
prompt_content,
|
|
prompts_dir / f"{cmd_name}.prompt.md",
|
|
project_root,
|
|
manifest,
|
|
)
|
|
created.append(prompt_file)
|
|
|
|
# Write .vscode/settings.json
|
|
settings_src = self._vscode_settings_path()
|
|
if settings_src and settings_src.is_file():
|
|
dst_settings = project_root / ".vscode" / "settings.json"
|
|
dst_settings.parent.mkdir(parents=True, exist_ok=True)
|
|
if dst_settings.exists():
|
|
# Merge into existing — don't track since we can't safely
|
|
# remove the user's settings file on uninstall.
|
|
self._merge_vscode_settings(settings_src, dst_settings)
|
|
else:
|
|
shutil.copy2(settings_src, dst_settings)
|
|
self.record_file_in_manifest(dst_settings, project_root, manifest)
|
|
created.append(dst_settings)
|
|
|
|
# 4. Install integration-specific update-context scripts
|
|
created.extend(self.install_scripts(project_root, manifest))
|
|
|
|
return created
|
|
|
|
def _vscode_settings_path(self) -> Path | None:
|
|
"""Return path to the bundled vscode-settings.json template."""
|
|
tpl_dir = self.shared_templates_dir()
|
|
if tpl_dir:
|
|
candidate = tpl_dir / "vscode-settings.json"
|
|
if candidate.is_file():
|
|
return candidate
|
|
return None
|
|
|
|
@staticmethod
|
|
def _merge_vscode_settings(src: Path, dst: Path) -> None:
|
|
"""Merge settings from *src* into existing *dst* JSON file.
|
|
|
|
Top-level keys from *src* are added only if missing in *dst*.
|
|
For dict-valued keys, sub-keys are merged the same way.
|
|
|
|
If *dst* cannot be parsed (e.g. JSONC with comments), the merge
|
|
is skipped to avoid overwriting user settings.
|
|
"""
|
|
try:
|
|
existing = json.loads(dst.read_text(encoding="utf-8"))
|
|
except (json.JSONDecodeError, OSError):
|
|
# Cannot parse existing file (likely JSONC with comments).
|
|
# Skip merge to preserve the user's settings, but show
|
|
# what they should add manually.
|
|
import logging
|
|
template_content = src.read_text(encoding="utf-8")
|
|
logging.getLogger(__name__).warning(
|
|
"Could not parse %s (may contain JSONC comments). "
|
|
"Skipping settings merge to preserve existing file.\n"
|
|
"Please add the following settings manually:\n%s",
|
|
dst, template_content,
|
|
)
|
|
return
|
|
|
|
new_settings = json.loads(src.read_text(encoding="utf-8"))
|
|
|
|
if not isinstance(existing, dict) or not isinstance(new_settings, dict):
|
|
import logging
|
|
logging.getLogger(__name__).warning(
|
|
"Skipping settings merge: %s or template is not a JSON object.", dst
|
|
)
|
|
return
|
|
|
|
changed = False
|
|
for key, value in new_settings.items():
|
|
if key not in existing:
|
|
existing[key] = value
|
|
changed = True
|
|
elif isinstance(existing[key], dict) and isinstance(value, dict):
|
|
for sub_key, sub_value in value.items():
|
|
if sub_key not in existing[key]:
|
|
existing[key][sub_key] = sub_value
|
|
changed = True
|
|
|
|
if not changed:
|
|
return
|
|
|
|
dst.write_text(
|
|
json.dumps(existing, indent=4) + "\n", encoding="utf-8"
|
|
)
|