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>
928 lines
40 KiB
Python
928 lines
40 KiB
Python
"""Tests for BobIntegration."""
|
|
|
|
import os
|
|
import warnings
|
|
|
|
import pytest
|
|
import yaml
|
|
|
|
from specify_cli.integrations import INTEGRATION_REGISTRY, get_integration
|
|
from specify_cli.integrations.base import SkillsIntegration
|
|
from specify_cli.integrations.manifest import IntegrationManifest
|
|
|
|
|
|
class TestBobIntegrationRegistration:
|
|
def test_registered(self):
|
|
assert "bob" in INTEGRATION_REGISTRY
|
|
assert get_integration("bob") is not None
|
|
|
|
def test_is_integration_base_not_skills_integration(self):
|
|
"""BobIntegration extends IntegrationBase directly — not SkillsIntegration.
|
|
|
|
Bob is dual-mode (skills by default, legacy commands via
|
|
``--legacy-commands``), so its skills-ness is a per-project config
|
|
decision resolved by the ``is_skills_mode`` hook — not a class-hierarchy
|
|
property. It therefore must NOT be a ``SkillsIntegration`` (which is
|
|
reserved for statically skills-only agents); shared code consults
|
|
``is_skills_mode(parsed_options)`` instead of ``isinstance``.
|
|
``invoke_separator='-'`` is set explicitly on the class to match the
|
|
default (skills) layout.
|
|
"""
|
|
from specify_cli.integrations.base import IntegrationBase
|
|
bob = get_integration("bob")
|
|
assert isinstance(bob, IntegrationBase)
|
|
assert not isinstance(bob, SkillsIntegration)
|
|
assert bob.invoke_separator == "-"
|
|
|
|
def test_key_and_config(self):
|
|
bob = get_integration("bob")
|
|
assert bob.key == "bob"
|
|
assert bob.config["folder"] == ".bob/"
|
|
# registrar_config mirrors the legacy commands layout so that
|
|
# CommandRegistrar.AGENT_CONFIGS["bob"] follows the Copilot pattern:
|
|
# extension registration writes to .bob/commands/ for legacy-mode
|
|
# projects and is skipped for skills-mode projects (skills_mode_active).
|
|
assert bob.config["commands_subdir"] == "commands"
|
|
assert bob.registrar_config["dir"] == ".bob/commands"
|
|
assert bob.registrar_config["extension"] == ".md"
|
|
|
|
def test_invoke_separator_is_hyphen(self):
|
|
"""Class-level invoke_separator must be '-' so CommandRegistrar.AGENT_CONFIGS
|
|
generates correct /speckit-<name> refs without calling effective_invoke_separator."""
|
|
bob = get_integration("bob")
|
|
assert bob.invoke_separator == "-"
|
|
|
|
|
|
class TestBobOptionsFlag:
|
|
def test_options_include_legacy_commands_flag(self):
|
|
bob = get_integration("bob")
|
|
opts = bob.options()
|
|
legacy_opts = [o for o in opts if o.name == "--legacy-commands"]
|
|
assert len(legacy_opts) == 1
|
|
opt = legacy_opts[0]
|
|
assert opt.is_flag is True
|
|
# Legacy must be OPT-IN (default=False) — skills are the default
|
|
assert opt.default is False
|
|
|
|
def test_options_include_skills_migration_flag(self):
|
|
"""Review #3415, 4724160183, comment 1: a ``--skills`` opt-in exists as
|
|
the supported migration path from legacy commands to the skills layout.
|
|
It is distinct from the pre-skills-default ``--skills`` flag: here it
|
|
*forces* skills mode over on-disk auto-detection.
|
|
"""
|
|
bob = get_integration("bob")
|
|
opts = bob.options()
|
|
skills_opts = [o for o in opts if o.name == "--skills"]
|
|
assert len(skills_opts) == 1
|
|
opt = skills_opts[0]
|
|
assert opt.is_flag is True
|
|
# Opt-in: disk auto-detection remains the default behavior.
|
|
assert opt.default is False
|
|
|
|
|
|
class TestBobIsSkillsModeHook:
|
|
"""The is_skills_mode hook is the single source of truth for the mode."""
|
|
|
|
def test_default_is_skills(self):
|
|
bob = get_integration("bob")
|
|
assert bob.is_skills_mode(None) is True
|
|
assert bob.is_skills_mode({}) is True
|
|
|
|
def test_legacy_commands_disables_skills(self):
|
|
bob = get_integration("bob")
|
|
assert bob.is_skills_mode({"legacy_commands": True}) is False
|
|
|
|
def test_existing_commands_layout_preserved_on_use(self, tmp_path):
|
|
"""Regression (review #3415): an existing Bob 1.x project (managed
|
|
``.bob/commands/speckit.*.md`` on disk, no stored ``legacy_commands``)
|
|
must NOT be treated as skills mode when re-resolved with a
|
|
project_root, so ``use``/``switch``/``upgrade`` never silently migrate
|
|
it to skills.
|
|
"""
|
|
bob = get_integration("bob")
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
# No parsed options at all — the pre-existing-install scenario.
|
|
assert bob.is_skills_mode(None, project_root=tmp_path) is False
|
|
assert bob.is_skills_mode({}, project_root=tmp_path) is False
|
|
|
|
def test_existing_skills_layout_stays_skills_on_use(self, tmp_path):
|
|
"""A project with managed ``speckit-*`` skills resolves to skills mode."""
|
|
bob = get_integration("bob")
|
|
(tmp_path / ".bob" / "skills" / "speckit-plan").mkdir(parents=True)
|
|
assert bob.is_skills_mode(None, project_root=tmp_path) is True
|
|
|
|
def test_managed_commands_with_unrelated_skills_dir_stays_legacy(
|
|
self, tmp_path
|
|
):
|
|
"""Regression (review #3415, 4723246468): a legacy Spec Kit install
|
|
(managed ``.bob/commands/speckit.*.md``) that *also* carries unrelated
|
|
Bob 2 skills (a ``.bob/skills/`` dir with no managed ``speckit-*``
|
|
skills) must stay in command mode — the mere presence of a skills
|
|
directory is not evidence that Spec Kit is skills-based.
|
|
"""
|
|
bob = get_integration("bob")
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
# An unrelated (non-Spec-Kit) skill the user authored.
|
|
(tmp_path / ".bob" / "skills" / "my-own-skill").mkdir(parents=True)
|
|
assert bob.is_skills_mode(None, project_root=tmp_path) is False
|
|
assert bob.effective_invoke_separator(None, project_root=tmp_path) == "."
|
|
|
|
def test_managed_skills_win_when_both_layouts_present(self, tmp_path):
|
|
"""When managed Spec Kit skills exist, skills mode wins even if a stale
|
|
managed command file is still on disk (upgrade leftover)."""
|
|
bob = get_integration("bob")
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
(tmp_path / ".bob" / "skills" / "speckit-plan").mkdir(parents=True)
|
|
assert bob.is_skills_mode(None, project_root=tmp_path) is True
|
|
|
|
def test_fresh_project_defaults_to_skills_with_project_root(self, tmp_path):
|
|
"""A project with no managed ``.bob/`` artifacts yet defaults to skills."""
|
|
bob = get_integration("bob")
|
|
assert bob.is_skills_mode(None, project_root=tmp_path) is True
|
|
|
|
def test_explicit_legacy_flag_wins_over_disk_layout(self, tmp_path):
|
|
"""An explicit ``--legacy-commands`` overrides on-disk detection."""
|
|
bob = get_integration("bob")
|
|
(tmp_path / ".bob" / "skills" / "speckit-plan").mkdir(parents=True)
|
|
assert (
|
|
bob.is_skills_mode({"legacy_commands": True}, project_root=tmp_path)
|
|
is False
|
|
)
|
|
|
|
def test_explicit_skills_flag_forces_skills_over_legacy_disk_layout(
|
|
self, tmp_path
|
|
):
|
|
"""Regression (review #3415, 4724160183, comment 1).
|
|
|
|
``--skills`` is the supported migration / opt-in: it must force skills
|
|
mode even when a managed legacy ``.bob/commands`` layout is on disk
|
|
(which otherwise auto-detects to legacy). This gives
|
|
``integration upgrade bob --integration-options="--skills"`` a path out
|
|
of legacy mode instead of being trapped by disk detection.
|
|
"""
|
|
bob = get_integration("bob")
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
assert bob.is_skills_mode({"skills": True}, project_root=tmp_path) is True
|
|
assert (
|
|
bob.effective_invoke_separator({"skills": True}, project_root=tmp_path)
|
|
== "-"
|
|
)
|
|
|
|
def test_skills_and_legacy_flags_are_mutually_exclusive(self):
|
|
"""Passing both ``--skills`` and ``--legacy-commands`` exits cleanly."""
|
|
import typer
|
|
|
|
bob = get_integration("bob")
|
|
with pytest.raises(typer.Exit):
|
|
bob.is_skills_mode({"skills": True, "legacy_commands": True})
|
|
|
|
def test_effective_invoke_separator_tracks_mode(self):
|
|
bob = get_integration("bob")
|
|
assert bob.effective_invoke_separator(None) == "-"
|
|
assert bob.effective_invoke_separator({"legacy_commands": True}) == "."
|
|
assert bob.effective_invoke_separator({"skills": True}) == "-"
|
|
|
|
def test_invoke_separator_for_mode_tracks_persisted_state(self):
|
|
"""Registration paths resolve the separator from persisted ai_skills."""
|
|
bob = get_integration("bob")
|
|
assert bob.invoke_separator_for_mode(True) == "-"
|
|
assert bob.invoke_separator_for_mode(False) == "."
|
|
|
|
def test_no_skills_mode_method_leaks(self):
|
|
"""The old callable _skills_mode method must be gone; consumers use the hook."""
|
|
bob = get_integration("bob")
|
|
assert not callable(getattr(bob, "_skills_mode", None))
|
|
|
|
|
|
class TestBobDefaultSkillsMode:
|
|
"""Default mode: .bob/skills/speckit-<name>/SKILL.md layout."""
|
|
|
|
def test_setup_creates_skill_files(self, tmp_path):
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m)
|
|
assert len(created) > 0
|
|
for f in created:
|
|
assert f.exists()
|
|
assert f.name == "SKILL.md"
|
|
assert f.parent.name.startswith("speckit-")
|
|
|
|
def test_setup_writes_to_correct_directory(self, tmp_path):
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
bob.setup(tmp_path, m)
|
|
skills_dir = tmp_path / ".bob" / "skills"
|
|
assert skills_dir.is_dir()
|
|
|
|
def test_setup_does_not_warn(self, tmp_path):
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
with warnings.catch_warnings(record=True) as caught:
|
|
warnings.simplefilter("always")
|
|
bob.setup(tmp_path, m)
|
|
assert not any(
|
|
"legacy" in str(item.message).lower() for item in caught
|
|
)
|
|
|
|
def test_setup_no_commands_dir(self, tmp_path):
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
bob.setup(tmp_path, m)
|
|
assert not (tmp_path / ".bob" / "commands").exists()
|
|
|
|
def test_skill_directory_structure(self, tmp_path):
|
|
"""Each command produces speckit-<name>/SKILL.md."""
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m)
|
|
|
|
expected_commands = {
|
|
"analyze", "clarify", "constitution", "converge", "implement",
|
|
"plan", "checklist", "specify", "tasks", "taskstoissues",
|
|
}
|
|
actual_commands = {f.parent.name.removeprefix("speckit-") for f in created}
|
|
assert actual_commands == expected_commands
|
|
|
|
def test_skill_frontmatter_structure(self, tmp_path):
|
|
"""SKILL.md must have name, description, compatibility, metadata."""
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m)
|
|
for f in created:
|
|
content = f.read_text(encoding="utf-8")
|
|
assert content.startswith("---\n"), f"{f} missing frontmatter"
|
|
parts = content.split("---", 2)
|
|
fm = yaml.safe_load(parts[1])
|
|
assert "name" in fm
|
|
assert "description" in fm
|
|
assert "compatibility" in fm
|
|
assert "metadata" in fm
|
|
assert fm["metadata"]["author"] == "github-spec-kit"
|
|
|
|
def test_templates_are_processed(self, tmp_path):
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m)
|
|
for f in created:
|
|
content = f.read_text(encoding="utf-8")
|
|
assert "{SCRIPT}" not in content, f"{f.name} has unprocessed {{SCRIPT}}"
|
|
assert "__AGENT__" not in content, f"{f.name} has unprocessed __AGENT__"
|
|
assert "{ARGS}" not in content, f"{f.name} has unprocessed {{ARGS}}"
|
|
assert "__SPECKIT_COMMAND_" not in content, f"{f.name} has unprocessed __SPECKIT_COMMAND_*__"
|
|
|
|
def test_command_refs_use_hyphen_separator(self, tmp_path):
|
|
"""Default skills layout must use /speckit-<name>, not /speckit.<name>."""
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m)
|
|
for f in created:
|
|
content = f.read_text(encoding="utf-8")
|
|
assert "/speckit." not in content, (
|
|
f"{f.name} contains dot-notation /speckit. reference; "
|
|
"skills must use /speckit-<name>"
|
|
)
|
|
|
|
def test_all_files_tracked_in_manifest(self, tmp_path):
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m)
|
|
for f in created:
|
|
rel = f.resolve().relative_to(tmp_path.resolve()).as_posix()
|
|
assert rel in m.files, f"{rel} not tracked in manifest"
|
|
|
|
def test_install_uninstall_roundtrip(self, tmp_path):
|
|
bob = get_integration("bob")
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.install(tmp_path, m)
|
|
assert len(created) > 0
|
|
m.save()
|
|
for f in created:
|
|
assert f.exists()
|
|
removed, skipped = bob.uninstall(tmp_path, m)
|
|
assert len(removed) == len(created)
|
|
assert skipped == []
|
|
|
|
|
|
class TestBobLegacyCommandsMode:
|
|
"""Legacy opt-in mode: .bob/commands/speckit.<name>.md layout."""
|
|
|
|
def test_setup_legacy_creates_markdown_files(self, tmp_path):
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m, parsed_options={"legacy_commands": True})
|
|
assert len(created) > 0
|
|
for f in created:
|
|
assert f.exists()
|
|
assert f.suffix == ".md"
|
|
assert f.name.startswith("speckit.")
|
|
assert f.parent == tmp_path / ".bob" / "commands"
|
|
|
|
def test_setup_legacy_warns_deprecated(self, tmp_path):
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
with pytest.warns(UserWarning, match="Bob legacy commands mode"):
|
|
bob.setup(tmp_path, m, parsed_options={"legacy_commands": True})
|
|
|
|
def test_setup_legacy_no_skills_dir(self, tmp_path):
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
bob.setup(tmp_path, m, parsed_options={"legacy_commands": True})
|
|
assert not (tmp_path / ".bob" / "skills").exists()
|
|
|
|
def test_setup_legacy_templates_are_processed(self, tmp_path):
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
bob.setup(tmp_path, m, parsed_options={"legacy_commands": True})
|
|
commands_dir = tmp_path / ".bob" / "commands"
|
|
for md_file in commands_dir.glob("speckit.*.md"):
|
|
content = md_file.read_text(encoding="utf-8")
|
|
assert "{SCRIPT}" not in content
|
|
assert "__AGENT__" not in content
|
|
assert "{ARGS}" not in content
|
|
assert "__SPECKIT_COMMAND_" not in content
|
|
|
|
def test_setup_legacy_all_files_tracked(self, tmp_path):
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m, parsed_options={"legacy_commands": True})
|
|
for f in created:
|
|
rel = f.resolve().relative_to(tmp_path.resolve()).as_posix()
|
|
assert rel in m.files, f"{rel} not tracked in manifest"
|
|
|
|
def test_setup_legacy_uninstall_roundtrip(self, tmp_path):
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.install(tmp_path, m, parsed_options={"legacy_commands": True})
|
|
assert len(created) > 0
|
|
m.save()
|
|
removed, skipped = bob.uninstall(tmp_path, m)
|
|
assert len(removed) == len(created)
|
|
assert skipped == []
|
|
|
|
|
|
class TestBobInitFlowDefault:
|
|
"""CLI init creates skills by default."""
|
|
|
|
def test_init_default_creates_skills(self, tmp_path):
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
|
|
target = tmp_path / "test-proj"
|
|
result = CliRunner().invoke(app, [
|
|
"init", str(target), "--integration", "bob",
|
|
"--ignore-agent-tools", "--script", "sh",
|
|
])
|
|
assert result.exit_code == 0, f"init --integration bob failed: {result.output}"
|
|
assert (target / ".bob" / "skills" / "speckit-plan" / "SKILL.md").exists()
|
|
assert not (target / ".bob" / "commands").exists()
|
|
|
|
def test_init_default_complete_file_inventory_sh(self, tmp_path):
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
|
|
project = tmp_path / "inventory-sh-bob"
|
|
project.mkdir()
|
|
old_cwd = os.getcwd()
|
|
try:
|
|
os.chdir(project)
|
|
result = CliRunner().invoke(app, [
|
|
"init", "--here", "--integration", "bob", "--script", "sh",
|
|
"--ignore-agent-tools",
|
|
], catch_exceptions=False)
|
|
finally:
|
|
os.chdir(old_cwd)
|
|
assert result.exit_code == 0, f"init failed: {result.output}"
|
|
|
|
commands = [
|
|
"analyze", "clarify", "constitution", "converge", "implement",
|
|
"plan", "checklist", "specify", "tasks", "taskstoissues",
|
|
]
|
|
for cmd in commands:
|
|
assert (project / ".bob" / "skills" / f"speckit-{cmd}" / "SKILL.md").exists(), (
|
|
f"Missing .bob/skills/speckit-{cmd}/SKILL.md"
|
|
)
|
|
|
|
|
|
class TestBobInitFlowLegacy:
|
|
"""CLI init with --legacy-commands produces .bob/commands/*.md."""
|
|
|
|
def test_init_legacy_creates_commands(self, tmp_path):
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
|
|
target = tmp_path / "test-proj"
|
|
result = CliRunner().invoke(app, [
|
|
"init", str(target), "--integration", "bob",
|
|
"--integration-options", "--legacy-commands",
|
|
"--ignore-agent-tools", "--script", "sh",
|
|
])
|
|
assert result.exit_code == 0, f"init --integration bob --legacy-commands failed: {result.output}"
|
|
assert (target / ".bob" / "commands" / "speckit.plan.md").exists()
|
|
assert not (target / ".bob" / "skills").exists()
|
|
|
|
def test_init_legacy_does_not_set_ai_skills(self, tmp_path):
|
|
"""Legacy install must NOT write ai_skills=True to init-options.json.
|
|
|
|
Behavioral guard for the dual-mode contract: with --legacy-commands,
|
|
BobIntegration.is_skills_mode(parsed_options) returns False, so
|
|
_update_init_options_for_integration must not persist ai_skills=True.
|
|
(Regression origin: shared code previously probed a bound _skills_mode
|
|
method object, which is always truthy, and wrongly enabled skills for
|
|
legacy projects.)
|
|
"""
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
from specify_cli import load_init_options
|
|
|
|
target = tmp_path / "test-proj"
|
|
result = CliRunner().invoke(app, [
|
|
"init", str(target), "--integration", "bob",
|
|
"--integration-options", "--legacy-commands",
|
|
"--ignore-agent-tools", "--script", "sh",
|
|
])
|
|
assert result.exit_code == 0, f"init failed: {result.output}"
|
|
init_opts = load_init_options(target)
|
|
assert init_opts.get("ai_skills") is not True, (
|
|
"Legacy Bob project must not have ai_skills=True in init-options.json"
|
|
)
|
|
|
|
|
|
class TestBobRegistrarConfig:
|
|
"""Verify AGENT_CONFIGS["bob"] follows the Copilot pattern for extension registration."""
|
|
|
|
def test_registrar_config_uses_commands_layout(self):
|
|
"""AGENT_CONFIGS["bob"] must use the legacy .md layout (not /SKILL.md).
|
|
|
|
This mirrors Copilot: the static registrar config targets the non-skills
|
|
format so that:
|
|
- skills_mode_active becomes True when ai_skills=True, preventing
|
|
extension registration from writing SKILL.md files into .bob/skills/
|
|
on projects that never asked for legacy files.
|
|
- legacy-mode projects receive extension .md files in .bob/commands/.
|
|
"""
|
|
from specify_cli.agents import CommandRegistrar
|
|
registrar = CommandRegistrar()
|
|
bob_cfg = registrar.AGENT_CONFIGS.get("bob")
|
|
assert bob_cfg is not None, "bob must be in AGENT_CONFIGS"
|
|
assert bob_cfg["extension"] == ".md", (
|
|
"AGENT_CONFIGS['bob']['extension'] must be '.md' so that "
|
|
"skills_mode_active=True suppresses extension registration on "
|
|
"skills-mode projects (mirrors the Copilot pattern)"
|
|
)
|
|
assert bob_cfg["dir"] == ".bob/commands"
|
|
|
|
def test_skills_mode_project_extension_registration_skipped(self, tmp_path):
|
|
"""Extension registrar skips Bob on skills-mode projects (no .bob/commands dir)."""
|
|
from specify_cli.agents import CommandRegistrar
|
|
# Simulate a skills-mode Bob project: .bob/skills exists, .bob/commands does not
|
|
(tmp_path / ".bob" / "skills").mkdir(parents=True)
|
|
|
|
registrar = CommandRegistrar()
|
|
results = registrar.register_commands_for_all_agents(
|
|
commands=[{"name": "speckit.test-cmd", "file": "test.md"}],
|
|
source_id="test",
|
|
source_dir=tmp_path,
|
|
project_root=tmp_path,
|
|
)
|
|
# Bob must not appear in results — .bob/commands doesn't exist
|
|
assert "bob" not in results
|
|
|
|
def test_legacy_mode_project_extension_registration_runs(self, tmp_path):
|
|
"""Extension registrar writes to .bob/commands/ for legacy-mode projects."""
|
|
import textwrap
|
|
from specify_cli.agents import CommandRegistrar
|
|
|
|
# Simulate a legacy-mode Bob project: .bob/commands exists, .bob/skills does not
|
|
commands_dir = tmp_path / ".bob" / "commands"
|
|
commands_dir.mkdir(parents=True)
|
|
|
|
# Provide a minimal command source file
|
|
cmd_file = tmp_path / "test.md"
|
|
cmd_file.write_text(
|
|
textwrap.dedent("""\
|
|
---
|
|
description: "Test command"
|
|
---
|
|
Test body.
|
|
"""),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
registrar = CommandRegistrar()
|
|
results = registrar.register_commands_for_all_agents(
|
|
commands=[{"name": "speckit.test-cmd", "file": "test.md"}],
|
|
source_id="test",
|
|
source_dir=tmp_path,
|
|
project_root=tmp_path,
|
|
)
|
|
assert "bob" in results, "bob must appear in results for legacy-mode project"
|
|
registered_file = commands_dir / "speckit.test-cmd.md"
|
|
assert registered_file.exists(), f"Expected {registered_file} to be written"
|
|
|
|
def test_legacy_extension_command_refs_use_dot_separator(self, tmp_path):
|
|
"""Regression (review #3415): legacy .bob/commands/ extension commands must
|
|
render Bob 1.x ``/speckit.<cmd>`` refs, not the skills-layout ``/speckit-<cmd>``.
|
|
|
|
The single static AGENT_CONFIGS["bob"]["invoke_separator"] is "-" (the
|
|
default skills layout); register_commands must instead resolve the
|
|
separator from the project's persisted mode via
|
|
BobIntegration.invoke_separator_for_mode(False) -> ".".
|
|
"""
|
|
import textwrap
|
|
from specify_cli.agents import CommandRegistrar
|
|
|
|
# Legacy-mode project: .bob/commands exists, ai_skills is NOT set.
|
|
commands_dir = tmp_path / ".bob" / "commands"
|
|
commands_dir.mkdir(parents=True)
|
|
cmd_file = tmp_path / "test.md"
|
|
cmd_file.write_text(
|
|
textwrap.dedent("""\
|
|
---
|
|
description: "Test command"
|
|
---
|
|
See __SPECKIT_COMMAND_SPECIFY__ for details.
|
|
"""),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
registrar = CommandRegistrar()
|
|
registrar.register_commands_for_all_agents(
|
|
commands=[{"name": "speckit.test-cmd", "file": "test.md"}],
|
|
source_id="test",
|
|
source_dir=tmp_path,
|
|
project_root=tmp_path,
|
|
)
|
|
rendered = (commands_dir / "speckit.test-cmd.md").read_text(encoding="utf-8")
|
|
assert "/speckit.specify" in rendered, (
|
|
"legacy Bob extension commands must render /speckit.specify (dot)"
|
|
)
|
|
assert "/speckit-specify" not in rendered
|
|
|
|
|
|
class TestBobUseFlowPreservesLegacyLayout:
|
|
"""Regression (review #3415): re-activating an existing Bob 1.x project
|
|
must not silently migrate it to the skills layout.
|
|
"""
|
|
|
|
def test_update_init_options_preserves_legacy_commands_project(self, tmp_path):
|
|
"""``use``/``switch``/``upgrade`` on a ``.bob/commands``-only project
|
|
(no stored ``legacy_commands``) must not write ``ai_skills=True``.
|
|
"""
|
|
from specify_cli.integrations._helpers import (
|
|
_update_init_options_for_integration,
|
|
)
|
|
from specify_cli import load_init_options
|
|
|
|
# Existing Bob 1.x project: legacy commands dir on disk, no ai_skills.
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
bob = get_integration("bob")
|
|
|
|
# Simulate the use/switch path: no parsed options were stored.
|
|
_update_init_options_for_integration(tmp_path, bob, parsed_options=None)
|
|
|
|
opts = load_init_options(tmp_path)
|
|
assert opts.get("ai") == "bob"
|
|
assert opts.get("ai_skills") is not True, (
|
|
"an existing .bob/commands project must stay legacy on re-activation"
|
|
)
|
|
|
|
def test_update_init_options_keeps_skills_project_as_skills(self, tmp_path):
|
|
"""A ``.bob/skills`` project stays skills on re-activation."""
|
|
from specify_cli.integrations._helpers import (
|
|
_update_init_options_for_integration,
|
|
)
|
|
from specify_cli import load_init_options
|
|
|
|
(tmp_path / ".bob" / "skills" / "speckit-plan").mkdir(parents=True)
|
|
bob = get_integration("bob")
|
|
|
|
_update_init_options_for_integration(tmp_path, bob, parsed_options=None)
|
|
|
|
opts = load_init_options(tmp_path)
|
|
assert opts.get("ai_skills") is True
|
|
|
|
def test_with_integration_setting_stores_dot_separator_for_legacy(self, tmp_path):
|
|
"""Regression (review #3415): shared-infra refresh on the use/switch
|
|
path resolves the command-ref separator *before* init-options are
|
|
rewritten, via ``effective_invoke_separator``. For an existing
|
|
``.bob/commands`` project with no stored options this must resolve to
|
|
``"."`` (project-aware), not the skills-layout ``"-"``; otherwise core
|
|
command references get rewritten to ``/speckit-*``.
|
|
"""
|
|
from specify_cli.integration_runtime import with_integration_setting
|
|
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
bob = get_integration("bob")
|
|
|
|
# Simulate the use/switch path: no parsed options stored.
|
|
settings = with_integration_setting(
|
|
{}, "bob", bob, parsed_options=None, project_root=tmp_path
|
|
)
|
|
assert settings["bob"]["invoke_separator"] == ".", (
|
|
"legacy .bob/commands project must persist the dot separator so "
|
|
"shared templates render Bob 1.x /speckit.<cmd> references"
|
|
)
|
|
|
|
def test_use_force_keeps_legacy_command_refs_in_shared_templates(self, tmp_path):
|
|
"""End-to-end (review #3415): ``integration use bob --force`` on an
|
|
existing Bob 1.x project (legacy layout on disk, stored options
|
|
stripped as a pre-PR install would be) must re-render shared templates
|
|
with ``/speckit.<cmd>`` (dot), not ``/speckit-<cmd>``.
|
|
"""
|
|
import json
|
|
from typer.testing import CliRunner
|
|
from specify_cli import app
|
|
|
|
# Create a real legacy Bob project (renders shared templates).
|
|
target = tmp_path / "proj"
|
|
runner = CliRunner()
|
|
result = runner.invoke(app, [
|
|
"init", str(target), "--integration", "bob",
|
|
"--integration-options", "--legacy-commands",
|
|
"--ignore-agent-tools", "--script", "sh",
|
|
])
|
|
assert result.exit_code == 0, f"init failed: {result.output}"
|
|
|
|
template = target / ".specify" / "templates" / "plan-template.md"
|
|
assert template.is_file(), "expected a rendered shared plan template"
|
|
assert "/speckit.plan" in template.read_text(encoding="utf-8")
|
|
|
|
# Simulate a pre-PR Bob 1.x install: no stored options/separator.
|
|
integ_json = target / ".specify" / "integration.json"
|
|
data = json.loads(integ_json.read_text(encoding="utf-8"))
|
|
bob_settings = data["integration_settings"]["bob"]
|
|
for stale in ("raw_options", "parsed_options", "invoke_separator"):
|
|
bob_settings.pop(stale, None)
|
|
integ_json.write_text(json.dumps(data, indent=2), encoding="utf-8")
|
|
|
|
# Re-activate with --force so shared templates are re-rendered.
|
|
import os
|
|
old_cwd = os.getcwd()
|
|
try:
|
|
os.chdir(target)
|
|
result = runner.invoke(
|
|
app, ["integration", "use", "bob", "--force"]
|
|
)
|
|
finally:
|
|
os.chdir(old_cwd)
|
|
assert result.exit_code == 0, f"use failed: {result.output}"
|
|
|
|
rendered = template.read_text(encoding="utf-8")
|
|
assert "/speckit.plan" in rendered, (
|
|
"legacy Bob project must keep /speckit.plan (dot) after refresh"
|
|
)
|
|
assert "/speckit-plan" not in rendered, (
|
|
"shared templates must not be rewritten to the skills /speckit-plan"
|
|
)
|
|
# And the persisted separator must reflect the legacy layout.
|
|
data = json.loads(integ_json.read_text(encoding="utf-8"))
|
|
assert data["integration_settings"]["bob"].get("invoke_separator") == "."
|
|
|
|
|
|
class TestBobCommandRefScopedToActiveAgent:
|
|
"""Regression (review #3415, 4716424313).
|
|
|
|
``CommandRegistrar.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, Bob's command
|
|
references must still render with the ``.`` separator (Bob 1.x
|
|
``/speckit.<cmd>``) rather than inheriting Copilot's ``ai_skills=True`` and
|
|
rendering ``/speckit-<cmd>``.
|
|
"""
|
|
|
|
def _write_command_ref_ext(self, source_dir):
|
|
source_dir.mkdir(parents=True, exist_ok=True)
|
|
cmd = source_dir / "run.md"
|
|
cmd.write_text(
|
|
"---\ndescription: Run\n---\n\nUse __SPECKIT_COMMAND_PLAN__ first.\n",
|
|
encoding="utf-8",
|
|
)
|
|
return [{"name": "speckit.ext.run", "file": "run.md"}]
|
|
|
|
def test_legacy_bob_ref_not_rewritten_when_other_agent_active_in_skills(
|
|
self, tmp_path
|
|
):
|
|
from specify_cli._init_options import save_init_options
|
|
from specify_cli.agents import CommandRegistrar
|
|
|
|
# Legacy Bob layout on disk; skills layout absent.
|
|
(tmp_path / ".bob" / "commands").mkdir(parents=True)
|
|
# A different agent (Copilot) is the active integration, in skills mode.
|
|
save_init_options(tmp_path, {"ai": "copilot", "ai_skills": True})
|
|
|
|
source_dir = tmp_path / "ext-src"
|
|
commands = self._write_command_ref_ext(source_dir)
|
|
|
|
registrar = CommandRegistrar()
|
|
registered = registrar.register_commands(
|
|
"bob", commands, "ext", source_dir, tmp_path,
|
|
)
|
|
assert "speckit.ext.run" in registered
|
|
|
|
written = list((tmp_path / ".bob" / "commands").glob("*.md"))
|
|
assert written, "expected a rendered Bob command file"
|
|
content = written[0].read_text(encoding="utf-8")
|
|
assert "__SPECKIT_COMMAND_PLAN__" not in content
|
|
assert "/speckit.plan" in content, (
|
|
"legacy Bob command refs must use the dot separator even when "
|
|
"another agent is active in skills mode"
|
|
)
|
|
assert "/speckit-plan" not in content
|
|
|
|
def test_active_bob_skills_command_output_uses_dot(self, tmp_path):
|
|
"""Regression (review #3415, 4724160183, comment 2).
|
|
|
|
The separator must match the *output layout* the registrar writes, not
|
|
the project's persisted ``ai_skills`` flag. Even when Bob itself is the
|
|
active agent in skills mode, a ``.bob/commands/*.md`` file is a
|
|
command-layout artifact and must render Bob 1.x ``/speckit.<cmd>``.
|
|
Rendering ``/speckit-<cmd>`` into a command file (as the old
|
|
``ai_skills``-driven active-agent branch did) produced an invocation the
|
|
command layout can't resolve. Bob skills are written via its own
|
|
skills path, so ``register_commands`` only ever emits command-layout
|
|
files for Bob.
|
|
"""
|
|
from specify_cli._init_options import save_init_options
|
|
from specify_cli.agents import CommandRegistrar
|
|
|
|
(tmp_path / ".bob" / "skills").mkdir(parents=True)
|
|
save_init_options(tmp_path, {"ai": "bob", "ai_skills": True})
|
|
|
|
source_dir = tmp_path / "ext-src"
|
|
commands = self._write_command_ref_ext(source_dir)
|
|
|
|
registrar = CommandRegistrar()
|
|
registrar.register_commands("bob", commands, "ext", source_dir, tmp_path)
|
|
|
|
written = list((tmp_path / ".bob" / "commands").glob("*.md"))
|
|
assert written, "expected a rendered Bob command file"
|
|
content = written[0].read_text(encoding="utf-8")
|
|
assert "__SPECKIT_COMMAND_PLAN__" not in content
|
|
assert "/speckit.plan" in content, (
|
|
"a .bob/commands/*.md command-layout file must use the dot "
|
|
"separator even when Bob is the active agent in skills mode"
|
|
)
|
|
assert "/speckit-plan" not in content
|
|
|
|
def test_inactive_bob_command_output_uses_dot_even_with_skills_dir(
|
|
self, tmp_path
|
|
):
|
|
"""Regression (review #3415, 4723246468): for an inactive Bob install
|
|
the registrar's separator must match the layout it is actually writing
|
|
(``.bob/commands/*.md`` — command layout), not on-disk sibling dirs.
|
|
Even when a ``.bob/skills/`` directory (with managed ``speckit-*``
|
|
skills) coexists, command-layout files must keep ``/speckit.<cmd>``.
|
|
"""
|
|
from specify_cli._init_options import save_init_options
|
|
from specify_cli.agents import CommandRegistrar
|
|
|
|
# Both layouts on disk; the active agent is something else entirely.
|
|
(tmp_path / ".bob" / "commands").mkdir(parents=True)
|
|
(tmp_path / ".bob" / "skills" / "speckit-plan").mkdir(parents=True)
|
|
save_init_options(tmp_path, {"ai": "claude", "ai_skills": True})
|
|
|
|
source_dir = tmp_path / "ext-src"
|
|
commands = self._write_command_ref_ext(source_dir)
|
|
|
|
registrar = CommandRegistrar()
|
|
registrar.register_commands("bob", commands, "ext", source_dir, tmp_path)
|
|
|
|
written = list((tmp_path / ".bob" / "commands").glob("*.md"))
|
|
assert written, "expected a rendered Bob command file"
|
|
content = written[0].read_text(encoding="utf-8")
|
|
assert "__SPECKIT_COMMAND_PLAN__" not in content
|
|
assert "/speckit.plan" in content, (
|
|
"Bob command-layout output must use the dot separator regardless "
|
|
"of a coexisting .bob/skills directory"
|
|
)
|
|
assert "/speckit-plan" not in content
|
|
|
|
|
|
class TestBobSetupPreservesLegacyOnUpgrade:
|
|
"""Regression (review #3415, 4723782860, comment 1).
|
|
|
|
``setup()`` must apply the same managed-artifact detection as ``use`` so
|
|
that ``integration upgrade bob`` on a Bob 1.x install (managed
|
|
``.bob/commands/speckit.*.md`` on disk, no stored options) preserves the
|
|
command layout instead of silently generating skills and stale-deleting
|
|
the legacy commands.
|
|
"""
|
|
|
|
def test_setup_without_options_preserves_existing_command_layout(
|
|
self, tmp_path
|
|
):
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
|
|
# Pre-existing Bob 1.x install: managed command files, no options.
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
with pytest.warns(UserWarning, match="Bob legacy commands mode"):
|
|
created = bob.setup(tmp_path, m, parsed_options=None)
|
|
|
|
# Command layout regenerated; no skills layout introduced.
|
|
assert not (tmp_path / ".bob" / "skills").exists(), (
|
|
"upgrade must not migrate an existing legacy Bob project to skills"
|
|
)
|
|
assert created, "expected command files to be regenerated"
|
|
for f in created:
|
|
assert f.parent == tmp_path / ".bob" / "commands"
|
|
assert f.suffix == ".md"
|
|
|
|
def test_setup_fresh_project_still_defaults_to_skills(self, tmp_path):
|
|
"""A fresh project (no managed artifacts) still defaults to skills."""
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
created = bob.setup(tmp_path, m, parsed_options=None)
|
|
|
|
assert (tmp_path / ".bob" / "skills").is_dir()
|
|
assert not (tmp_path / ".bob" / "commands").exists()
|
|
assert created
|
|
|
|
def test_setup_with_skills_flag_migrates_legacy_to_skills(self, tmp_path):
|
|
"""Review #3415, 4724160183, comment 1: ``--skills`` on an existing
|
|
legacy install forces the skills layout (the migration opt-in), instead
|
|
of preserving the auto-detected legacy layout. ``setup()`` scaffolds the
|
|
skills layout; the ``integration upgrade`` stale-file pass removes the
|
|
old command files.
|
|
"""
|
|
from specify_cli.integrations.bob import BobIntegration
|
|
|
|
# Pre-existing Bob 1.x install on disk.
|
|
cmds = tmp_path / ".bob" / "commands"
|
|
cmds.mkdir(parents=True)
|
|
(cmds / "speckit.plan.md").write_text("# plan", encoding="utf-8")
|
|
|
|
bob = BobIntegration()
|
|
m = IntegrationManifest("bob", tmp_path)
|
|
# No deprecation warning — the user opted into skills, not legacy.
|
|
with warnings.catch_warnings():
|
|
warnings.simplefilter("error", UserWarning)
|
|
created = bob.setup(tmp_path, m, parsed_options={"skills": True})
|
|
|
|
assert (tmp_path / ".bob" / "skills").is_dir(), (
|
|
"--skills must force the skills layout even when a legacy commands "
|
|
"layout is already on disk"
|
|
)
|
|
assert created
|
|
for f in created:
|
|
assert f.name == "SKILL.md"
|
|
assert f.parent.name.startswith("speckit-")
|
|
|
|
|
|
class TestBobPostProcessSkillContent:
|
|
"""Regression (review #3415, 4723782860, comment 2).
|
|
|
|
Preset/extension skill generators call ``post_process_skill_content`` on
|
|
the *registered* ``BobIntegration`` instance. Core Bob skills are
|
|
intent-activated and intentionally omit the shared slash-command hook note,
|
|
so the registered class must expose the same no-op the skills helper does
|
|
(not inherit a note-injecting default) to keep every skill path consistent.
|
|
"""
|
|
|
|
def test_registered_bob_has_post_process_hook(self):
|
|
bob = get_integration("bob")
|
|
assert hasattr(bob, "post_process_skill_content")
|
|
|
|
def test_post_process_is_noop_no_hook_note_injected(self):
|
|
bob = get_integration("bob")
|
|
sample = (
|
|
"---\nname: speckit-plan\n---\n\n"
|
|
"Run /speckit.plan then /speckit.tasks.\n"
|
|
)
|
|
assert bob.post_process_skill_content(sample) == sample
|
|
|
|
def test_post_process_matches_skills_helper(self):
|
|
from specify_cli.integrations.bob import _BobSkillsHelper
|
|
|
|
bob = get_integration("bob")
|
|
sample = "---\nname: speckit-analyze\n---\n\nSome body with /speckit.plan.\n"
|
|
assert (
|
|
bob.post_process_skill_content(sample)
|
|
== _BobSkillsHelper().post_process_skill_content(sample)
|
|
)
|