mirror of
https://github.com/github/spec-kit.git
synced 2026-08-03 06:26:30 +08:00
* feat: update Bob integration to skills-based layout for Bob 2.0 Bob 2.0 replaces the command-based workflow (.bob/commands/*.md) with a skills-based layout (.bob/skills/speckit-<name>/SKILL.md), matching the pattern used by Claude Code, Codex, and other skills-first agents. - Switch BobIntegration from MarkdownIntegration to SkillsIntegration - Update folder/dir from .bob/commands to .bob/skills - Change extension from .md to /SKILL.md (skills layout) - Add --skills option (default: True) consistent with Codex pattern - Update tests to inherit from SkillsIntegrationTests (28 tests pass) - Bump catalog entry to version 2.0.0 with updated description Assisted-by: IBM Bob (model: claude-sonnet-4-5, autonomous) * PR comments fix: keep old Bob 1 commands till next release * Copilot suggested change Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * feat(bob): address copilot comments, make skills layout default, demote legacy commands to opt-in * fix(bob): honor legacy_commands in ai_skills persistence and add bob to ALWAYS_SLASH_AGENTS - init.py: suppress ai_skills=True when --legacy-commands is passed so extensions and presets target .bob/commands, not .bob/skills - _invocation_style.py: add 'bob' to ALWAYS_SLASH_AGENTS so init next-steps and hook invocations always show /speckit-<name> (skills is the default layout; no ai_skills flag required) * Copilot suggestion Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix(bob): extend IntegrationBase directly to avoid false isinstance(SkillsIntegration) - bob/__init__.py: switch BobIntegration base from SkillsIntegration to IntegrationBase; add _BobSkillsHelper for skills-mode delegation; set invoke_separator='-' explicitly; set _skills_mode flag in setup() so consumers can derive the effective mode without isinstance checks - _helpers.py: replace isinstance(integration, SkillsIntegration) guard with getattr(_skills_mode) so legacy-commands mode does not persist ai_skills=True - _invocation_style.py: remove 'bob' from ALWAYS_SLASH_AGENTS — Bob 2.0 skills are invoked via natural language, not /skill-name slash commands - integrations/catalog.json: advance updated_at to 2026-07-15 * fix(lint): remove unused SkillsIntegration import from _helpers.py * Copilot suggested change Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * feat(bob): add bob skills integration with registrar-based mode detection * address 3 comments from copilot * feat(bob): update registrar config to use legacy commands layout * fix lint * Suggested fix from Copilot Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix pr comment * fix pr comment * fix pr comment * refactor(bob): resolve skills mode via base-class hooks + fix command-ref separators Rework the dual-mode handling introduced for Bob 2.0 so an integration's internal representation never leaks into shared init/install/upgrade code, and fix the legacy command-reference separator surfaced in review. Base-class contract: - Add IntegrationBase.is_skills_mode(parsed_options) — the single hook the shared machinery consults to decide whether to persist ai_skills and render skill invocations. SkillsIntegration returns True; Copilot honors --skills / self._skills_mode; Bob returns `not legacy_commands`. - Add IntegrationBase.invoke_separator_for_mode(skills_enabled) — resolves the command-ref separator from a project's persisted mode for registration paths that only have the ai_skills flag (no CLI parsed_options). Default is behavior-preserving; Bob maps skills->"-", legacy->".". - BobIntegration stays on IntegrationBase (mirroring Copilot, the other dual-mode agent) and delegates setup() to internal _BobSkillsHelper / _BobMarkdownHelper. Removes the _skills_mode method and all isinstance(SkillsIntegration) / callable(_skills_mode) probing from _helpers.py and init.py. Fix legacy separator (review feedback): CommandRegistrar.register_commands and PresetManager._resolve_skill_command_refs previously read the single static AGENT_CONFIGS[key]["invoke_separator"], so legacy .bob/commands/ extension and preset command refs rendered /speckit-<cmd> instead of Bob 1.x /speckit.<cmd>. Both now resolve the separator per project mode via invoke_separator_for_mode. Tests: add regression coverage for the is_skills_mode / invoke_separator_for_mode hooks and legacy extension command-ref separators; normalize a width-sensitive workflow assertion to match its siblings. Full suite green. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob,copilot): address review — preserve legacy layout, dual-mode separators, extension-skill token resolution Addresses PR review 4716036212 (3 comments): 1. Bob legacy-install regression: `use`/`switch`/`upgrade` on an existing Bob 1.x project (only `.bob/commands/` on disk, no stored `legacy_commands`) called `is_skills_mode(None)` -> True and rewrote `ai_skills=True`, silently switching extension/command-reference handling to the skills layout. `is_skills_mode` now takes an optional `project_root`; Bob preserves an already-installed legacy layout until an explicit upgrade creates `.bob/skills/`. A fresh project still defaults to skills. 2. Copilot dual-mode separator: `invoke_separator_for_mode` was inherited from the base (mode-independent) and returned Copilot's static `.`, so preset/extension command refs in a Copilot skills project rendered `/speckit.<name>` instead of `/speckit-<name>`. Override it on Copilot to track the persisted `ai_skills` state, consistent with `build_command_invocation` and `effective_invoke_separator`. 3. Bob extension-skill command-ref tokens: verified that merging main's generic `_resolve_command_ref_tokens` (#3544) resolves Bob's tokens via the `CONDITIONAL_SLASH_AGENTS` path (`/speckit-<name>`); added Bob to the command-ref regression parametrize plus dedicated Bob use-path tests. All tests pass (full suite green; merged with current main incl. #3544). Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): resolve command-ref separator with project-aware mode before shared-infra refresh (review #3415) The `use`/`switch` paths refresh shared infrastructure via `_with_integration_setting()` / `_invoke_separator_for_integration()`, which previously resolved the invoke separator through `effective_invoke_separator` / `is_skills_mode` WITHOUT a project_root. For a pre-PR Bob 1.x project (.bob/commands/ on disk, no stored options), this defaulted to the skills "-" separator and rewrote rendered shared-template command refs to /speckit-*, even though ai_skills stayed false. Thread project_root through effective_invoke_separator, the two runtime helpers, and every call site so Bob's on-disk legacy detection governs the separator before shared infra is refreshed. Add a rendered-shared-template regression test covering `use --force`. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): scope persisted ai_skills flag to active agent when resolving command-ref separator (review #3415) `register_commands` runs once per detected agent, but the persisted `ai_skills` flag describes only the active integration (`opts["ai"]`). When another agent (e.g. Copilot) is active in skills mode while a legacy `.bob/commands` layout is also present, the previous code passed that global `True` to Bob's `invoke_separator_for_mode`, rewriting Bob 1.x command refs to `/speckit-*` instead of `/speckit.*`. Only consult the persisted flag for the agent it describes (`opts["ai"] == agent_name`); otherwise resolve the separator from the agent's own project-aware `effective_invoke_separator(None, project_root)`. Add regression tests covering the mismatched-active-agent case and a control for Bob-active skills mode. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): detect Spec Kit layout from managed artifacts, not any skills dir (review #3415) Two related mis-detections from review 4723246468: 1. `BobIntegration.is_skills_mode` treated the mere presence of a `.bob/skills/` directory as proof the project is skills-based. A legacy Spec Kit install (managed `.bob/commands/speckit.*.md`) that also carried unrelated Bob 2 skills would be misclassified as skills, so `integration use bob` persisted `ai_skills` and rewrote shared refs. Now the layout is inferred from managed Spec Kit artifacts: legacy/command mode only when managed `speckit.*.md` command files exist and no managed `speckit-*` skill dirs do. 2. The `register_commands` separator for an inactive agent used a disk-based `effective_invoke_separator(None, project_root)` fallback that could pick the skills separator even though the registrar writes the static command layout (`.bob/commands/*.md`). Inactive agents now resolve the separator from the registrar's actual output layout (`extension == "/SKILL.md"`), so command-layout files keep `/speckit.*` refs regardless of sibling dirs. Update the affected hook/E2E tests to use managed artifacts and add regression tests for the mixed-layout and inactive-registrar scenarios. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): apply managed-artifact detection on upgrade + consistent skill post-processing (review #3415) Two issues from review 4723782860: 1. `BobIntegration.setup()` resolved the layout via `is_skills_mode(parsed_options)` WITHOUT `project_root`, so `integration upgrade bob` on a Bob 1.x install (managed `.bob/commands/speckit.*.md`, no stored options) ignored the existing command files, generated skills, and stale-deleted the legacy commands — silently migrating the project. Pass `project_root` so the same managed-artifact detection used by `use` also governs upgrades. 2. Only `_BobSkillsHelper` overrode `post_process_skill_content` to suppress the shared slash-command hook note. Preset/extension skill generators call that hook on the registered `BobIntegration`, which inherited `IntegrationBase`'s note-injecting default. Repeat the no-op (delegating to the skills helper) on the registered class so every Bob skill-generation path is consistent with intent-activated core Bob skills. Add regression tests for the upgrade-preservation and post-processing paths. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * feat(bob): add --skills migration opt-in; fix separator + manifest loss (review #3415) Address review #3415 (4724160183): - Comment 1: Add an explicit `--skills` opt-in to BobIntegration. It forces the skills layout over on-disk auto-detection, giving legacy Bob 1.x installs a supported migration path (`integration upgrade bob --integration-options="--skills"`). `--skills` and `--legacy-commands` are mutually exclusive (clean exit-1 error). - Comment 2: In CommandRegistrar.register_commands, derive the command-ref separator from the output layout (agent_config["extension"]) for the active agent too, not the persisted ai_skills flag. A command-layout file (.bob/commands/*.md, .github/agents/*.agent.md) always renders /speckit.*; only a /SKILL.md scaffold uses /speckit-*. Dual-layout agents (Bob, Copilot) write skills via their own setup()/skills path, so register_commands only ever emits their command-layout files. - Comment 3: Update docs/reference/integrations.md Bob entry to document the skills-based default (.bob/skills/), the deprecated --legacy-commands opt-out, and the --skills migration path. Also fix a latent manifest-loss bug surfaced by the migration path: the upgrade Phase 2 stale-file cleanup built a throwaway manifest sharing the integration key and called uninstall(), which always deleted {key}.manifest.json. Any layout-shrinking upgrade (e.g. legacy->skills) thus wiped the freshly-saved manifest, leaving the project untracked and un-upgradeable. uninstall() now takes remove_manifest (default True); the stale-cleanup pass passes False. Adds regression tests for the --skills opt-in, mutual exclusion, corrected active-agent separator, remove_manifest=False, and an end-to-end legacy->skills migration that verifies the manifest survives and the project remains upgradeable. Full suite: 4555 passed, 5 skipped. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * docs(agents): align token-resolution comment with output-layout separator rule (review #3415) Address review #3415 (4725516805). The comment above resolve_command_refs still described the removed state-based behavior ("resolve it from the integration using the project's persisted skills state"). Update it to describe the output-layout rule that register_commands now uses: _sep is derived from the layout this registrar writes (a /SKILL.md scaffold uses the skills separator; a command-layout file uses the command separator), not the persisted ai_skills state. Comment-only change; no behavior change. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): reconcile extension artifacts on layout change (review #3415) When a dual-mode agent (Bob) flips between the legacy commands layout and the skills layout during `integration upgrade` (via `--skills` / `--legacy-commands`), the old layout's extension command/skill files were left orphaned: Phase 2 stale cleanup only removes files tracked by the *integration* manifest, while extension artifacts are tracked in the extension registry. Detect the layout flip by comparing whether the old vs new manifest tracks a `/SKILL.md` scaffold, and when it changed, unregister the agent's extension artifacts before the existing re-registration so they are recreated in the new layout (and the per-agent registry is updated). Preset artifacts are documented as a known, pre-existing cross-cutting gap: no agent-scoped preset re-registration exists in use/switch/upgrade for any agent, so reconciling them is out of scope for this Bob migration. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): reject layout migration when preset overrides are installed (review #3415) A command↔skills layout change during `integration upgrade` cannot reconcile preset artifacts: presets track their command/skill files in per-preset `registered_commands`/`registered_skills` metadata, and there is no agent-scoped preset re-registration anywhere in the CLI. Migrating would delete a preset's old-layout files without recreating them in the new layout and leave the preset registry claiming artifacts that no longer exist. Detect the intended layout via `is_skills_mode` (so a plain same-layout upgrade is unaffected) and, when it flips while preset overrides are installed for the agent, reject the upgrade *before any mutation* with an actionable error pointing at the remove → upgrade → reinstall workaround. Extension artifacts are still reconciled for the safe (no-preset) case. Adds a regression test and documents the migration caveat in the Bob integration reference entry. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): restrict layout reconciliation to the active integration (review #3415) `integration_upgrade` supports upgrading a secondary (non-active) integration, but the layout-change extension reconciliation was unsafe there. `ExtensionManager.unregister_agent_artifacts()` treats the unscoped per-extension `registered_skills` list as belonging to the passed agent and, when that agent's skills directory is absent, falls back to scanning every agent's skills directory — so reconciling a secondary Bob layout flip could delete or untrack the *active* agent's extension skills. The subsequent re-registration cannot repair that because extension skill rendering is intentionally scoped to the active agent (#2948). Gate the unregister-before-register reconciliation on `installed_key == key` so it only runs for the active integration. Secondary agents only ever have extension command files (skills are active-agent-only), which the existing re-registration rewrites in place, so skipping the unregister orphans nothing new. Adds a regression test asserting a secondary Bob layout change leaves the active agent's extension skill intact on disk and in the registry. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): fail closed when preset registry is unreadable (review #3415) Address review 4744636079: - _migrate_commands: the preset guard previously failed *open* — a registry read/parse error returned an empty "no presets" list, so a --force layout-changing upgrade could delete preset-overridden command files while their registry state was unknown. Read the registry file directly and raise _PresetRegistryUnreadableError on any read/parse failure or malformed structure, rejecting the migration before any mutation. A genuinely absent registry still returns [] (safe). - bob: correct the is_skills_mode docstring — upgrade *does* run setup(); disk detection is needed because legacy Bob 1.x installs never persisted a legacy_commands option, so the stored mode is unavailable. - tests: add fail-closed E2E (corrupted registry rejected, valid-empty allowed) plus a unit test for _installed_presets_affecting_agent covering absent / corrupted / malformed / valid / affecting-agent cases. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf * fix(bob): fail closed on malformed preset entries too (review #3415) Address review 4745191015: the preset guard read a parseable registry but silently skipped malformed per-preset metadata and treated a malformed registered_commands value as "no matching artifacts". A registry such as {"presets":{"p1":[]}} therefore allowed a layout migration even though p1's ownership is unknown, risking deletion of preset-managed files. Now raise _PresetRegistryUnreadableError for a non-dict preset entry, a non-dict registered_commands, or a non-list registered_skills. Extend the unit test to cover these malformed shapes. Assisted-by: GitHub Copilot (model: Claude Opus 4.8, autonomous) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 63f93544-a77f-4f01-bf04-c88806a97dbf --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Manfred Riem <15701806+mnriem@users.noreply.github.com> Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
508 lines
21 KiB
Python
508 lines
21 KiB
Python
"""Hash-tracked installation manifest for integrations.
|
|
|
|
Each installed integration records the files it created together with
|
|
their SHA-256 hashes. On uninstall only files whose hash still matches
|
|
the recorded value are removed — modified files are left in place and
|
|
reported to the caller.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import hashlib
|
|
import json
|
|
import os
|
|
import tempfile
|
|
from datetime import datetime, timezone
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
|
|
def _sha256(path: Path) -> str:
|
|
"""Return the hex SHA-256 digest of *path*."""
|
|
h = hashlib.sha256()
|
|
with open(path, "rb") as fh:
|
|
for chunk in iter(lambda: fh.read(8192), b""):
|
|
h.update(chunk)
|
|
return h.hexdigest()
|
|
|
|
|
|
def _validate_rel_path(rel: Path, root: Path) -> Path:
|
|
"""Resolve *rel* against *root* and verify it stays within *root*.
|
|
|
|
Raises ``ValueError`` if *rel* is absolute, contains ``..`` segments
|
|
that escape *root*, or otherwise resolves outside the project root.
|
|
"""
|
|
if rel.is_absolute():
|
|
raise ValueError(
|
|
f"Absolute paths are not allowed in manifests: {rel}"
|
|
)
|
|
resolved = (root / rel).resolve()
|
|
root_resolved = root.resolve()
|
|
try:
|
|
resolved.relative_to(root_resolved)
|
|
except ValueError:
|
|
raise ValueError(
|
|
f"Path {rel} resolves to {resolved} which is outside "
|
|
f"the project root {root_resolved}"
|
|
) from None
|
|
return resolved
|
|
|
|
|
|
def _manifest_path_label(root: Path, path: Path) -> str:
|
|
try:
|
|
return path.relative_to(root).as_posix()
|
|
except ValueError:
|
|
return path.as_posix()
|
|
|
|
|
|
def _ensure_safe_manifest_directory(root: Path, directory: Path) -> None:
|
|
"""Create a manifest directory without following symlinked parents."""
|
|
root_resolved = root.resolve()
|
|
try:
|
|
rel = directory.relative_to(root)
|
|
except ValueError:
|
|
label = _manifest_path_label(root, directory)
|
|
raise ValueError(f"Integration manifest directory escapes project root: {label}") from None
|
|
|
|
current = root
|
|
for part in rel.parts:
|
|
current = current / part
|
|
label = _manifest_path_label(root, current)
|
|
if current.is_symlink():
|
|
raise ValueError(f"Refusing to use symlinked integration manifest directory: {label}")
|
|
if current.exists():
|
|
if not current.is_dir():
|
|
raise ValueError(f"Integration manifest directory path is not a directory: {label}")
|
|
try:
|
|
current.resolve().relative_to(root_resolved)
|
|
except (OSError, ValueError):
|
|
raise ValueError(f"Integration manifest directory escapes project root: {label}") from None
|
|
continue
|
|
current.mkdir()
|
|
try:
|
|
current.resolve().relative_to(root_resolved)
|
|
except (OSError, ValueError):
|
|
raise ValueError(f"Integration manifest directory escapes project root: {label}") from None
|
|
|
|
|
|
def _ensure_safe_manifest_destination(root: Path, path: Path) -> None:
|
|
"""Refuse manifest writes that would escape the project or follow symlinks."""
|
|
root_resolved = root.resolve()
|
|
_ensure_safe_manifest_directory(root, path.parent)
|
|
label = _manifest_path_label(root, path)
|
|
if path.is_symlink():
|
|
raise ValueError(f"Refusing to overwrite symlinked integration manifest path: {label}")
|
|
if path.exists():
|
|
if not path.is_file():
|
|
raise ValueError(f"Integration manifest path is not a file: {label}")
|
|
try:
|
|
path.resolve().relative_to(root_resolved)
|
|
except (OSError, ValueError):
|
|
raise ValueError(f"Integration manifest path escapes project root: {label}") from None
|
|
|
|
|
|
class IntegrationManifest:
|
|
"""Tracks files installed by a single integration.
|
|
|
|
Parameters:
|
|
key: Integration identifier (e.g. ``"copilot"``).
|
|
project_root: Absolute path to the project directory.
|
|
version: CLI version string recorded in the manifest.
|
|
resolve_project_root: Resolve ``project_root`` before using it.
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
key: str,
|
|
project_root: Path,
|
|
version: str = "",
|
|
*,
|
|
resolve_project_root: bool = True,
|
|
) -> None:
|
|
self.key = key
|
|
self.project_root = (
|
|
project_root.resolve()
|
|
if resolve_project_root
|
|
else project_root.absolute()
|
|
)
|
|
self.version = version
|
|
self._files: dict[str, str] = {} # rel_path → sha256 hex
|
|
self._recovered_files: set[str] = set()
|
|
self._installed_at: str = ""
|
|
|
|
# -- Manifest file location -------------------------------------------
|
|
|
|
@property
|
|
def manifest_path(self) -> Path:
|
|
"""Path to the on-disk manifest JSON."""
|
|
return self.project_root / ".specify" / "integrations" / f"{self.key}.manifest.json"
|
|
|
|
# -- Recording files --------------------------------------------------
|
|
|
|
def record_file(self, rel_path: str | Path, content: bytes | str) -> Path:
|
|
"""Write *content* to *rel_path* (relative to project root) and record its hash.
|
|
|
|
Creates parent directories as needed. Returns the absolute path
|
|
of the written file.
|
|
If the path was previously marked as recovered via
|
|
``record_existing(recovered=True)``, the recovered marker is
|
|
cleared because the bytes are now produced, not merely observed.
|
|
|
|
Raises ``ValueError`` if *rel_path* resolves outside the project root.
|
|
"""
|
|
rel = Path(rel_path)
|
|
abs_path = _validate_rel_path(rel, self.project_root)
|
|
abs_path.parent.mkdir(parents=True, exist_ok=True)
|
|
|
|
if isinstance(content, str):
|
|
content = content.encode("utf-8")
|
|
abs_path.write_bytes(content)
|
|
|
|
normalized = abs_path.relative_to(self.project_root).as_posix()
|
|
self._files[normalized] = hashlib.sha256(content).hexdigest()
|
|
# ``record_file`` writes *produced* content, so any prior
|
|
# recovered marker for this path is no longer accurate.
|
|
self._recovered_files.discard(normalized)
|
|
return abs_path
|
|
|
|
def record_existing(self, rel_path: str | Path, *, recovered: bool = False) -> None:
|
|
"""Record the hash of an already-existing regular file at *rel_path*.
|
|
|
|
When ``recovered=True``, the path is also marked in the manifest's
|
|
``recovered_files`` list to signal that the file's on-disk hash was
|
|
*observed* during install (because the file already existed and was not
|
|
overwritten), not *produced* by the install. Future ``refresh_managed``
|
|
runs should consult ``is_recovered`` before treating the recorded hash
|
|
as a managed baseline.
|
|
|
|
Raises:
|
|
ValueError: if *rel_path* resolves outside the project root, is
|
|
a symlink, or is not a regular file. A directory or other
|
|
non-file path cannot be silently recorded — its hash would
|
|
be meaningless and ``check_modified``/``uninstall`` would
|
|
treat the entry as permanently broken.
|
|
OSError: if the underlying filesystem call (``is_symlink``,
|
|
``is_file``, or the file-read used to compute the hash)
|
|
fails — for example a ``PermissionError`` on the path.
|
|
Callers should be prepared to handle ``OSError`` (and its
|
|
subclasses such as ``PermissionError``) in addition to
|
|
``ValueError``.
|
|
"""
|
|
rel = Path(rel_path)
|
|
# Cheap lexical pre-check first so absolute / parent-traversal paths
|
|
# don't trigger a filesystem stat outside the project root before
|
|
# ``_validate_rel_path`` raises. ``_validate_rel_path`` produces the
|
|
# canonical error messages used elsewhere.
|
|
if rel.is_absolute() or ".." in rel.parts:
|
|
_validate_rel_path(rel, self.project_root)
|
|
# _validate_rel_path raised for any actually-escaping path. If we reach
|
|
# here the path normalizes inside root (e.g. ``dir/../file.txt``).
|
|
# Reject anyway: manifest keys must be canonical so ``check_modified``
|
|
# and ``uninstall`` cannot key the same file under two paths.
|
|
raise ValueError(
|
|
f"Manifest paths must be canonical; '..' segments are not "
|
|
f"allowed (got {rel})"
|
|
)
|
|
# Walk each path component before resolution so a symlinked ancestor
|
|
# (e.g. ``linked_dir/file.txt`` where ``linked_dir`` is a symlink)
|
|
# cannot be silently followed by ``_validate_rel_path().resolve()``
|
|
# down to a target outside the project root. ``_ensure_safe_manifest_directory``
|
|
# uses the same pattern.
|
|
_walk = self.project_root
|
|
for part in rel.parts:
|
|
_walk = _walk / part
|
|
if _walk.is_symlink():
|
|
raise ValueError(
|
|
f"Refusing to record symlinked manifest path: {rel} "
|
|
f"(symlinked at {_walk.relative_to(self.project_root).as_posix()})"
|
|
)
|
|
abs_path = _validate_rel_path(rel, self.project_root)
|
|
if not abs_path.is_file():
|
|
raise ValueError(
|
|
f"Manifest path is not a regular file: {rel}"
|
|
)
|
|
normalized = abs_path.relative_to(self.project_root).as_posix()
|
|
self._files[normalized] = _sha256(abs_path)
|
|
if recovered:
|
|
self._recovered_files.add(normalized)
|
|
else:
|
|
# ``recovered=False`` means the caller is asserting this path is
|
|
# managed-baseline now, not merely observed; drop any stale
|
|
# recovered marker so future is_recovered() queries reflect the
|
|
# transition. ``discard`` is a no-op when the key is absent.
|
|
self._recovered_files.discard(normalized)
|
|
|
|
def remove(self, rel_path: str | Path) -> bool:
|
|
"""Drop *rel_path* from the tracked file set and any recovered marker.
|
|
|
|
Operates purely on the manifest's recorded key; it does NOT touch the
|
|
file on disk. Returns ``True`` if an entry was present and removed.
|
|
Used to keep the manifest consistent after a caller deletes a stale
|
|
managed file that the current install no longer ships.
|
|
|
|
Input is normalized through the same lexical pipeline as
|
|
``record_existing`` / ``is_recovered``: absolute paths and paths
|
|
containing ``..`` segments are rejected (return ``False``) — such paths
|
|
can never be canonical manifest keys, so there is nothing to remove.
|
|
"""
|
|
rel = Path(rel_path)
|
|
if rel.is_absolute() or ".." in rel.parts:
|
|
return False
|
|
try:
|
|
abs_path = _validate_rel_path(rel, self.project_root)
|
|
normalized = abs_path.relative_to(self.project_root).as_posix()
|
|
except ValueError:
|
|
return False
|
|
self._recovered_files.discard(normalized)
|
|
return self._files.pop(normalized, None) is not None
|
|
|
|
# -- Querying ---------------------------------------------------------
|
|
|
|
@property
|
|
def files(self) -> dict[str, str]:
|
|
"""Return a copy of the ``{rel_path: sha256}`` mapping."""
|
|
return dict(self._files)
|
|
|
|
@property
|
|
def recovered_files(self) -> set[str]:
|
|
"""Return a copy of the set of paths recorded with ``recovered=True``.
|
|
|
|
These entries had their hashes observed (not produced) during install
|
|
because the file already existed on disk and the install skipped it.
|
|
Their on-disk bytes may be user customizations — callers that would
|
|
overwrite based on hash equality (e.g. ``refresh_managed``) MUST check
|
|
``is_recovered`` first.
|
|
"""
|
|
return set(self._recovered_files)
|
|
|
|
def is_recovered(self, rel_path: str | Path) -> bool:
|
|
"""Return True if *rel_path* was recorded via ``record_existing(recovered=True)``.
|
|
|
|
Input is normalized through the same pipeline as ``record_existing``:
|
|
absolute paths, paths escaping the project root, AND paths containing
|
|
``'..'`` segments are rejected (returned as ``False``). This mirrors
|
|
``record_existing``'s canonicalization guard — such paths can never
|
|
appear as stored keys, so the answer is always ``False``.
|
|
"""
|
|
rel = Path(rel_path)
|
|
if rel.is_absolute() or ".." in rel.parts:
|
|
return False
|
|
try:
|
|
abs_path = _validate_rel_path(rel, self.project_root)
|
|
normalized = abs_path.relative_to(self.project_root).as_posix()
|
|
except ValueError:
|
|
return False
|
|
return normalized in self._recovered_files
|
|
|
|
def check_modified(self) -> list[str]:
|
|
"""Return relative paths of tracked files whose content changed on disk."""
|
|
modified: list[str] = []
|
|
for rel, expected_hash in self._files.items():
|
|
rel_path = Path(rel)
|
|
# Skip paths that are absolute or attempt to escape the project root
|
|
if rel_path.is_absolute() or ".." in rel_path.parts:
|
|
continue
|
|
abs_path = self.project_root / rel_path
|
|
if not abs_path.exists() and not abs_path.is_symlink():
|
|
continue
|
|
# Treat symlinks and non-regular-files as modified
|
|
if abs_path.is_symlink() or not abs_path.is_file():
|
|
modified.append(rel)
|
|
continue
|
|
try:
|
|
changed = _sha256(abs_path) != expected_hash
|
|
except OSError:
|
|
# Unreadable regular file (e.g. permission denied): treat as
|
|
# modified, consistent with the symlink / non-regular-file
|
|
# handling above, rather than letting the OSError escape.
|
|
changed = True
|
|
if changed:
|
|
modified.append(rel)
|
|
return modified
|
|
|
|
# -- Uninstall --------------------------------------------------------
|
|
|
|
def uninstall(
|
|
self,
|
|
project_root: Path | None = None,
|
|
*,
|
|
force: bool = False,
|
|
remove_manifest: bool = True,
|
|
) -> tuple[list[Path], list[Path]]:
|
|
"""Remove tracked files whose hash still matches.
|
|
|
|
Parameters:
|
|
project_root: Override for the project root.
|
|
force: If ``True``, remove files even if modified.
|
|
remove_manifest: If ``True`` (default), also delete this
|
|
integration's ``{key}.manifest.json``. Set ``False`` for
|
|
*partial* cleanups (e.g. the upgrade stale-file pass, which
|
|
builds a throwaway manifest over a subset of files) so the
|
|
real, freshly-saved manifest for the same key is not destroyed.
|
|
|
|
Returns:
|
|
``(removed, skipped)`` — absolute paths.
|
|
"""
|
|
root = (project_root or self.project_root).resolve()
|
|
removed: list[Path] = []
|
|
skipped: list[Path] = []
|
|
|
|
for rel, expected_hash in self._files.items():
|
|
# Use non-resolved path for deletion so symlinks themselves
|
|
# are removed, not their targets.
|
|
path = root / rel
|
|
# Validate containment lexically (without following symlinks)
|
|
# by collapsing .. segments via Path resolution on the string parts.
|
|
try:
|
|
normed = Path(os.path.normpath(path))
|
|
normed.relative_to(root)
|
|
except (ValueError, OSError):
|
|
continue
|
|
if not path.exists() and not path.is_symlink():
|
|
continue
|
|
# Skip directories — manifest only tracks files
|
|
if not path.is_file() and not path.is_symlink():
|
|
skipped.append(path)
|
|
continue
|
|
# Never follow symlinks when comparing hashes. Only remove
|
|
# symlinks when forced, to avoid acting on tampered entries.
|
|
if path.is_symlink():
|
|
if not force:
|
|
skipped.append(path)
|
|
continue
|
|
else:
|
|
if not force:
|
|
try:
|
|
matches = _sha256(path) == expected_hash
|
|
except OSError:
|
|
# Unreadable: can't verify it's ours, so preserve it
|
|
# (mirrors the path.unlink() OSError guard below).
|
|
skipped.append(path)
|
|
continue
|
|
if not matches:
|
|
skipped.append(path)
|
|
continue
|
|
try:
|
|
path.unlink()
|
|
except OSError:
|
|
skipped.append(path)
|
|
continue
|
|
removed.append(path)
|
|
# Clean up empty parent directories up to project root
|
|
parent = path.parent
|
|
while parent != root:
|
|
try:
|
|
parent.rmdir() # only succeeds if empty
|
|
except OSError:
|
|
break
|
|
parent = parent.parent
|
|
|
|
# Remove the manifest file itself
|
|
manifest = root / ".specify" / "integrations" / f"{self.key}.manifest.json"
|
|
if remove_manifest and manifest.exists():
|
|
manifest.unlink()
|
|
parent = manifest.parent
|
|
while parent != root:
|
|
try:
|
|
parent.rmdir()
|
|
except OSError:
|
|
break
|
|
parent = parent.parent
|
|
|
|
return removed, skipped
|
|
|
|
# -- Persistence ------------------------------------------------------
|
|
|
|
def save(self) -> Path:
|
|
"""Write the manifest to disk. Returns the manifest path."""
|
|
self._installed_at = self._installed_at or datetime.now(timezone.utc).isoformat()
|
|
data: dict[str, Any] = {
|
|
"integration": self.key,
|
|
"version": self.version,
|
|
"installed_at": self._installed_at,
|
|
"files": self._files,
|
|
**(
|
|
{"recovered_files": sorted(self._recovered_files)}
|
|
if self._recovered_files
|
|
else {}
|
|
),
|
|
}
|
|
path = self.manifest_path
|
|
content = json.dumps(data, indent=2) + "\n"
|
|
_ensure_safe_manifest_destination(self.project_root, path)
|
|
fd, temp_name = tempfile.mkstemp(prefix=f".{path.name}.", dir=path.parent)
|
|
temp_path = Path(temp_name)
|
|
try:
|
|
with os.fdopen(fd, "w", encoding="utf-8") as fh:
|
|
fh.write(content)
|
|
temp_path.chmod(0o644)
|
|
_ensure_safe_manifest_destination(self.project_root, path)
|
|
os.replace(temp_path, path)
|
|
finally:
|
|
if temp_path.exists():
|
|
temp_path.unlink()
|
|
return path
|
|
|
|
@classmethod
|
|
def load(
|
|
cls,
|
|
key: str,
|
|
project_root: Path,
|
|
*,
|
|
resolve_project_root: bool = True,
|
|
) -> IntegrationManifest:
|
|
"""Load an existing manifest from disk.
|
|
|
|
Raises ``FileNotFoundError`` if the manifest does not exist.
|
|
"""
|
|
inst = cls(key, project_root, resolve_project_root=resolve_project_root)
|
|
path = inst.manifest_path
|
|
try:
|
|
data = json.loads(path.read_text(encoding="utf-8"))
|
|
except json.JSONDecodeError as exc:
|
|
raise ValueError(
|
|
f"Integration manifest at {path} contains invalid JSON"
|
|
) from exc
|
|
|
|
if not isinstance(data, dict):
|
|
raise ValueError(
|
|
f"Integration manifest at {path} must be a JSON object, "
|
|
f"got {type(data).__name__}"
|
|
)
|
|
|
|
files = data.get("files", {})
|
|
if not isinstance(files, dict) or not all(
|
|
isinstance(k, str) and isinstance(v, str) for k, v in files.items()
|
|
):
|
|
raise ValueError(
|
|
f"Integration manifest 'files' at {path} must be a "
|
|
"mapping of string paths to string hashes"
|
|
)
|
|
|
|
inst.version = data.get("version", "")
|
|
inst._installed_at = data.get("installed_at", "")
|
|
inst._files = files
|
|
|
|
recovered = data.get("recovered_files", [])
|
|
if not isinstance(recovered, list) or not all(
|
|
isinstance(p, str) for p in recovered
|
|
):
|
|
raise ValueError(
|
|
f"Integration manifest 'recovered_files' at {path} must be a "
|
|
"list of string paths"
|
|
)
|
|
inst._recovered_files = set(recovered)
|
|
# Drop any recovered_files entries that don't correspond to tracked
|
|
# files — defensive against externally-edited or partially-corrupted
|
|
# manifests. Inconsistent state self-corrects on next save().
|
|
inst._recovered_files &= set(inst._files.keys())
|
|
|
|
stored_key = data.get("integration", "")
|
|
if stored_key and stored_key != key:
|
|
raise ValueError(
|
|
f"Manifest at {path} belongs to integration {stored_key!r}, "
|
|
f"not {key!r}"
|
|
)
|
|
|
|
return inst
|