mirror of
https://github.com/github/spec-kit.git
synced 2026-07-09 16:35:58 +08:00
* feat(cli): add `py` script type & Python interpreter resolution (#3278) Introduce a third script variant alongside `sh`/`ps` as the foundation for unifying workflow scripts under a single Python implementation. - Add `"py": "Python"` to `SCRIPT_TYPE_CHOICES`; `VALID_SCRIPT_TYPES` consumers (init workflow step, init command, _helpers) pick it up automatically since they derive from that mapping. - Add `IntegrationBase.resolve_python_interpreter()` (project venv → `python3` → `python`, falling back to `python3`). - Prefix the resolved interpreter when `process_template()` expands `{SCRIPT}` for the `py` script type so `.py` scripts run portably (notably on Windows); thread `project_root` through callers so venv preference works. - Make `install_scripts()` mark copied `.py` files executable too. Includes positive and negative unit tests for interpreter resolution, `py` template processing, the new choice, and script installation. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(cli): return repo-relative venv interpreter & correct docstring Address PR review feedback on #3285: - `resolve_python_interpreter()` now returns the venv interpreter as a path relative to the project root (`.venv/bin/python` / `.venv/Scripts/python.exe`) instead of an absolute/joined path, so the generated `{SCRIPT}` invocation stays portable and runnable from the repo root regardless of where the project lives. - Update `install_scripts()` docstring to note `.py` scripts are now made executable alongside `.sh`. - Update tests to assert the repo-relative interpreter path. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix(cli): fall back to sys.executable for interpreter resolution When neither python3 nor python is discoverable on PATH (and no project venv is found), resolve_python_interpreter() now returns the running interpreter (sys.executable) so the generated {SCRIPT} invocation works in the current environment, falling back to "python3" only if that is also unavailable. Update unit tests accordingly. * fix(cli): quote py interpreter path when it contains whitespace For the `py` script type, the resolved interpreter may be an absolute path containing spaces (notably `sys.executable` under Windows `Program Files`). Quote it when it contains whitespace so the `{SCRIPT}` invocation isn't split into multiple arguments. Add positive/negative tests for the quoting behavior. * test: guard executable-bit assertions from Windows chmod semantics The Windows CI job failed because `os.chmod` does not set POSIX executable bits on Windows, so `install_scripts()` cannot make `.py`/ `.sh` files executable there (nor is it needed — the interpreter is invoked explicitly). Split the install_scripts test so file-copy behavior is still verified cross-platform, and skip the executable-bit assertions on win32 (matching the repo's existing pattern). --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
136 lines
4.4 KiB
Python
136 lines
4.4 KiB
Python
"""Generic integration — bring your own agent.
|
|
|
|
Requires ``--commands-dir`` to specify the output directory for command
|
|
files. No longer special-cased in the core CLI — just another
|
|
integration with its own required option.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from ..base import IntegrationOption, MarkdownIntegration
|
|
from ..manifest import IntegrationManifest
|
|
|
|
|
|
class GenericIntegration(MarkdownIntegration):
|
|
"""Integration for user-specified (generic) agents."""
|
|
|
|
key = "generic"
|
|
config = {
|
|
"name": "Generic (bring your own agent)",
|
|
"folder": None, # Set dynamically from --commands-dir
|
|
"commands_subdir": "commands",
|
|
"install_url": None,
|
|
"requires_cli": False,
|
|
}
|
|
registrar_config = {
|
|
"dir": "", # Set dynamically from --commands-dir
|
|
"format": "markdown",
|
|
"args": "$ARGUMENTS",
|
|
"extension": ".md",
|
|
}
|
|
|
|
@classmethod
|
|
def options(cls) -> list[IntegrationOption]:
|
|
return [
|
|
IntegrationOption(
|
|
"--commands-dir",
|
|
required=True,
|
|
help="Directory for command files (e.g. .myagent/commands/)",
|
|
),
|
|
]
|
|
|
|
@staticmethod
|
|
def _resolve_commands_dir(
|
|
parsed_options: dict[str, Any] | None,
|
|
opts: dict[str, Any],
|
|
) -> str:
|
|
"""Extract ``--commands-dir`` from parsed options or raw_options.
|
|
|
|
Returns the directory string or raises ``ValueError``.
|
|
"""
|
|
parsed_options = parsed_options or {}
|
|
|
|
commands_dir = parsed_options.get("commands_dir")
|
|
if commands_dir:
|
|
return commands_dir
|
|
|
|
# Fall back to raw_options (--integration-options="--commands-dir ...")
|
|
raw = opts.get("raw_options")
|
|
if raw:
|
|
import shlex
|
|
tokens = shlex.split(raw)
|
|
for i, token in enumerate(tokens):
|
|
if token == "--commands-dir" and i + 1 < len(tokens):
|
|
return tokens[i + 1]
|
|
if token.startswith("--commands-dir="):
|
|
return token.split("=", 1)[1]
|
|
|
|
raise ValueError(
|
|
"--commands-dir is required for the generic integration"
|
|
)
|
|
|
|
def commands_dest(self, project_root: Path) -> Path:
|
|
"""Not supported for GenericIntegration — use setup() directly.
|
|
|
|
GenericIntegration is stateless; the output directory comes from
|
|
``parsed_options`` or ``raw_options`` at call time, not from
|
|
instance state.
|
|
"""
|
|
raise ValueError(
|
|
"GenericIntegration.commands_dest() cannot be called directly; "
|
|
"the output directory is resolved from parsed_options in setup()"
|
|
)
|
|
|
|
def setup(
|
|
self,
|
|
project_root: Path,
|
|
manifest: IntegrationManifest,
|
|
parsed_options: dict[str, Any] | None = None,
|
|
**opts: Any,
|
|
) -> list[Path]:
|
|
"""Install commands to the user-provided commands directory."""
|
|
commands_dir = self._resolve_commands_dir(parsed_options, opts)
|
|
|
|
templates = self.list_command_templates()
|
|
if not templates:
|
|
return []
|
|
|
|
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})"
|
|
)
|
|
|
|
dest = (project_root / commands_dir).resolve()
|
|
try:
|
|
dest.relative_to(project_root_resolved)
|
|
except ValueError as exc:
|
|
raise ValueError(
|
|
f"Integration destination {dest} escapes "
|
|
f"project root {project_root_resolved}"
|
|
) from exc
|
|
dest.mkdir(parents=True, exist_ok=True)
|
|
|
|
script_type = opts.get("script_type", "sh")
|
|
arg_placeholder = "$ARGUMENTS"
|
|
created: list[Path] = []
|
|
|
|
for src_file in templates:
|
|
raw = src_file.read_text(encoding="utf-8")
|
|
processed = self.process_template(
|
|
raw, self.key, script_type, arg_placeholder,
|
|
project_root=project_root,
|
|
)
|
|
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)
|
|
|
|
|
|
return created
|