mirror of
https://github.com/github/spec-kit
synced 2026-06-21 13:51:39 +00:00
fc3d1244c0
* Replace shell-based context updates with marker-based upsert
Replace ~3500 lines of bash/PowerShell agent context update scripts
with a Python-based approach using <!-- SPECKIT START/END --> markers.
IntegrationBase now manages the agent context file directly:
- upsert_context_section(): creates or updates the marked section at
init/install/switch time with a directive to read the current plan
- remove_context_section(): removes the section at uninstall, deleting
the file only if it becomes empty
- __CONTEXT_FILE__ placeholder in command templates is resolved per
integration so the plan command references the correct agent file
- context_file is persisted in init-options.json for extension access
The plan command template instructs the LLM to update the plan
reference between the markers in the agent context file.
Removed:
- scripts/bash/update-agent-context.sh (857 lines)
- scripts/powershell/update-agent-context.ps1 (515 lines)
- 56 integration wrapper scripts (update-context.sh/.ps1)
- templates/agent-file-template.md
- agent_scripts frontmatter key and {AGENT_SCRIPT} replacement logic
- update-context reference from integration.json
- tests/test_cursor_frontmatter.py (tested deleted scripts)
Added:
- upsert/remove context section methods on IntegrationBase
- __CONTEXT_FILE__ placeholder support in process_template()
- context_file field in init-options.json (init/switch/uninstall)
- Per-integration tests: context file correctness, plan reference,
init-options persistence (78 new context_file tests)
- End-to-end CLI validation across all 28 integrations
* fix: search for end marker after start marker in context section methods
Address Copilot review: content.find(CONTEXT_MARKER_END) searched from
the start of the file rather than after the located start marker. If
the file contained a stray end marker before the start marker, the
wrong slice could be replaced.
Now both upsert_context_section() and remove_context_section() pass
start_idx as the second argument to find() and validate end_idx >
start_idx before performing the replacement.
* fix: address Copilot review feedback on context section handling
1. Fix grammar in _build_context_section() directive text — add commas
for a complete sentence.
2. Resolve __CONTEXT_FILE__ in resolve_skill_placeholders() — skills
generated via extensions/presets for codex/kimi now replace the
placeholder using the context_file value from init-options.json.
3. Handle Cursor .mdc frontmatter — when creating a new .mdc context
file, prepend alwaysApply: true YAML frontmatter so Cursor
auto-loads the rules.
4. Fix empty-file leading newline — when the context file exists but
is empty, write the section directly instead of prepending a blank
line.
* fix: address second round of Copilot review feedback
1. Ensure .mdc frontmatter on existing files — upsert_context_section()
now checks for missing YAML frontmatter on .mdc files during updates
(not just creation), so pre-existing Cursor files get alwaysApply.
2. Guard against context_file=None — use 'or ""' instead of a default
arg so explicit null values in init-options.json don't cause a
TypeError in str.replace().
3. Clean up .mdc files on removal — remove_context_section() treats
files containing only the Speckit-generated frontmatter block as
empty, deleting them rather than leaving orphaned frontmatter.
* fix: address third round of Copilot review feedback
1. CRLF-safe .mdc frontmatter check — use lstrip().startswith('---')
instead of startswith('---\n') so CRLF files don't get duplicate
frontmatter.
2. CRLF-safe .mdc removal check — normalize line endings before
comparing against the sentinel frontmatter string.
3. Call remove_context_section() during integration_uninstall() — the
manifest-only uninstall was leaving the managed SPECKIT markers
behind in the agent context file.
4. Fix stale docstring — remove 'agent_scripts' mention from
test_lean_commands_have_no_scripts().
* fix: address fourth round of Copilot review feedback
1. Remove unused script_type parameter from _write_integration_json()
and all 3 call sites — the parameter was no longer referenced after
the update-context script removal.
2. Fix _build_context_section() docstring — correct example path from
'.specify/plans/plan.md' to 'specs/<feature>/plan.md'.
3. Improve .mdc frontmatter-only detection in remove_context_section()
— use regex to match any YAML frontmatter block (not just the exact
Speckit-generated one), so .mdc files with additional frontmatter
keys are also cleaned up when no body content remains.
* fix: handle corrupted markers and parse .mdc frontmatter robustly
1. Handle partial/corrupted markers in upsert_context_section() —
if only the START marker exists (no END), replace from START
through EOF. If only the END marker exists, replace from BOF
through END. This keeps upsert idempotent even when a user
accidentally deletes one marker.
2. Parse .mdc YAML frontmatter properly — new _ensure_mdc_frontmatter()
helper parses existing frontmatter and ensures alwaysApply: true is
set, rather than just checking for the --- delimiter. Handles
missing frontmatter, existing frontmatter without alwaysApply, and
already-correct frontmatter.
* fix: preserve .mdc frontmatter, add tests, clean up on switch
1. Rewrite _ensure_mdc_frontmatter() with regex — preserves comments,
formatting, and custom keys in existing frontmatter instead of
destructively re-serializing via yaml.safe_dump(). Inserts or
fixes alwaysApply: true in place.
2. Add 6 focused .mdc frontmatter tests to cursor-agent test file:
new file creation, missing frontmatter, preserved custom keys,
wrong alwaysApply value, idempotent upserts, removal cleanup.
3. Call remove_context_section() during integration switch Phase 1 —
prevents stale SPECKIT markers from being left in the old
integration's context file. Also clear context_file from
init-options during the metadata reset.
* fix: remove unused MDC_FRONTMATTER, preserve inline comments, normalize bare CR
1. Remove unused MDC_FRONTMATTER class variable — dead code after
_ensure_mdc_frontmatter() was rewritten with regex.
2. Preserve inline comments when fixing alwaysApply — the regex
substitution now captures trailing '# comment' text and keeps it.
3. Normalize bare CR in upsert_context_section() — match the
behavior of remove_context_section() which already normalizes
both CRLF and bare CR.
4. Clarify .mdc removal comment — 'treat frontmatter-only as empty'
instead of misleading 'strip frontmatter'.
* fix: handle corrupted markers in remove, CRLF-safe end-marker consumption
1. Handle corrupted markers in remove_context_section() — mirror
upsert's behavior: start-only removes start→EOF, end-only removes
BOF→end. Previously bailed out leaving partial markers behind.
2. CRLF-safe end-marker consumption — both upsert and remove now
handle \r\n after the end marker, not just \n. Prevents extra
blank lines at replacement boundaries in CRLF files.
3. Clarify path rule in plan template — distinguish filesystem
operations (absolute paths) from documentation/agent context
references (project-relative paths).
* fix: only remove context section when both markers are well-ordered
remove_context_section() previously treated mismatched markers as
corruption and aggressively removed from BOF→end-marker or
start-marker→EOF, which could delete user-authored content if only
one marker remained. Now it only removes when both START and END
markers exist and are properly ordered, returning False otherwise.
207 lines
7.3 KiB
Python
207 lines
7.3 KiB
Python
"""Forge integration — forgecode.dev AI coding agent.
|
|
|
|
Forge has several unique behaviors compared to standard markdown agents:
|
|
- Uses `{{parameters}}` instead of `$ARGUMENTS` for argument passing
|
|
- Strips `handoffs` frontmatter key (Claude Code feature that causes Forge to hang)
|
|
- Injects `name` field into frontmatter when missing
|
|
- Uses a hyphenated frontmatter `name` value (e.g., `speckit-foo-bar`) for shell compatibility, especially with ZSH
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
from ..base import MarkdownIntegration
|
|
from ..manifest import IntegrationManifest
|
|
|
|
|
|
def format_forge_command_name(cmd_name: str) -> str:
|
|
"""Convert command name to Forge-compatible hyphenated format.
|
|
|
|
Forge requires command names to use hyphens instead of dots for
|
|
compatibility with ZSH and other shells. This function converts
|
|
dot-notation command names to hyphenated format.
|
|
|
|
The function is idempotent: already-formatted names are returned unchanged.
|
|
|
|
Examples:
|
|
>>> format_forge_command_name("plan")
|
|
'speckit-plan'
|
|
>>> format_forge_command_name("speckit.plan")
|
|
'speckit-plan'
|
|
>>> format_forge_command_name("speckit-plan")
|
|
'speckit-plan'
|
|
>>> format_forge_command_name("speckit.my-extension.example")
|
|
'speckit-my-extension-example'
|
|
>>> format_forge_command_name("speckit-my-extension-example")
|
|
'speckit-my-extension-example'
|
|
>>> format_forge_command_name("speckit.jira.sync-status")
|
|
'speckit-jira-sync-status'
|
|
|
|
Args:
|
|
cmd_name: Command name in dot notation (speckit.foo.bar),
|
|
hyphenated format (speckit-foo-bar), or plain name (foo)
|
|
|
|
Returns:
|
|
Hyphenated command name with 'speckit-' prefix
|
|
"""
|
|
# Already in hyphenated format - return as-is (idempotent)
|
|
if cmd_name.startswith("speckit-"):
|
|
return cmd_name
|
|
|
|
# Strip 'speckit.' prefix if present
|
|
short_name = cmd_name
|
|
if short_name.startswith("speckit."):
|
|
short_name = short_name[len("speckit."):]
|
|
|
|
# Replace all dots with hyphens
|
|
short_name = short_name.replace(".", "-")
|
|
|
|
# Return with 'speckit-' prefix
|
|
return f"speckit-{short_name}"
|
|
|
|
|
|
class ForgeIntegration(MarkdownIntegration):
|
|
"""Integration for Forge (forgecode.dev).
|
|
|
|
Extends MarkdownIntegration to add Forge-specific processing:
|
|
- Replaces $ARGUMENTS with {{parameters}}
|
|
- Strips 'handoffs' frontmatter key (incompatible with Forge)
|
|
- Injects 'name' field into frontmatter when missing
|
|
"""
|
|
|
|
key = "forge"
|
|
config = {
|
|
"name": "Forge",
|
|
"folder": ".forge/",
|
|
"commands_subdir": "commands",
|
|
"install_url": "https://forgecode.dev/docs/",
|
|
"requires_cli": True,
|
|
}
|
|
registrar_config = {
|
|
"dir": ".forge/commands",
|
|
"format": "markdown",
|
|
"args": "{{parameters}}",
|
|
"extension": ".md",
|
|
"strip_frontmatter_keys": ["handoffs"],
|
|
"inject_name": True,
|
|
"format_name": format_forge_command_name, # Custom name formatter
|
|
}
|
|
context_file = "AGENTS.md"
|
|
|
|
def setup(
|
|
self,
|
|
project_root: Path,
|
|
manifest: IntegrationManifest,
|
|
parsed_options: dict[str, Any] | None = None,
|
|
**opts: Any,
|
|
) -> list[Path]:
|
|
"""Install Forge commands with custom processing.
|
|
|
|
Extends MarkdownIntegration.setup() to inject Forge-specific transformations
|
|
after standard template processing.
|
|
"""
|
|
templates = self.list_command_templates()
|
|
if not templates:
|
|
return []
|
|
|
|
project_root_resolved = project_root.resolve()
|
|
if manifest.project_root != project_root_resolved:
|
|
raise ValueError(
|
|
f"manifest.project_root ({manifest.project_root}) does not match "
|
|
f"project_root ({project_root_resolved})"
|
|
)
|
|
|
|
dest = self.commands_dest(project_root).resolve()
|
|
try:
|
|
dest.relative_to(project_root_resolved)
|
|
except ValueError as exc:
|
|
raise ValueError(
|
|
f"Integration destination {dest} escapes "
|
|
f"project root {project_root_resolved}"
|
|
) from exc
|
|
dest.mkdir(parents=True, exist_ok=True)
|
|
|
|
script_type = opts.get("script_type", "sh")
|
|
arg_placeholder = self.registrar_config.get("args", "{{parameters}}")
|
|
created: list[Path] = []
|
|
|
|
for src_file in templates:
|
|
raw = src_file.read_text(encoding="utf-8")
|
|
# Process template with standard MarkdownIntegration logic
|
|
processed = self.process_template(
|
|
raw, self.key, script_type, arg_placeholder,
|
|
context_file=self.context_file or "",
|
|
)
|
|
|
|
# FORGE-SPECIFIC: Ensure any remaining $ARGUMENTS placeholders are
|
|
# converted to {{parameters}}
|
|
processed = processed.replace("$ARGUMENTS", arg_placeholder)
|
|
|
|
# FORGE-SPECIFIC: Apply frontmatter transformations
|
|
processed = self._apply_forge_transformations(processed, src_file.stem)
|
|
|
|
dst_name = self.command_filename(src_file.stem)
|
|
dst_file = self.write_file_and_record(
|
|
processed, dest / dst_name, project_root, manifest
|
|
)
|
|
created.append(dst_file)
|
|
|
|
# Upsert managed context section into the agent context file
|
|
self.upsert_context_section(project_root)
|
|
|
|
return created
|
|
|
|
def _apply_forge_transformations(self, content: str, template_name: str) -> str:
|
|
"""Apply Forge-specific transformations to processed content.
|
|
|
|
1. Strip 'handoffs' frontmatter key (from Claude Code templates; incompatible with Forge)
|
|
2. Inject 'name' field if missing (using hyphenated format)
|
|
"""
|
|
# Parse frontmatter
|
|
lines = content.split('\n')
|
|
if not lines or lines[0].strip() != '---':
|
|
return content
|
|
|
|
# Find end of frontmatter
|
|
frontmatter_end = -1
|
|
for i in range(1, len(lines)):
|
|
if lines[i].strip() == '---':
|
|
frontmatter_end = i
|
|
break
|
|
|
|
if frontmatter_end == -1:
|
|
return content
|
|
|
|
frontmatter_lines = lines[1:frontmatter_end]
|
|
body_lines = lines[frontmatter_end + 1:]
|
|
|
|
# 1. Strip 'handoffs' key
|
|
filtered_frontmatter = []
|
|
skip_until_outdent = False
|
|
for line in frontmatter_lines:
|
|
if skip_until_outdent:
|
|
# Skip indented lines under handoffs:
|
|
if line and (line[0] == ' ' or line[0] == '\t'):
|
|
continue
|
|
else:
|
|
skip_until_outdent = False
|
|
|
|
if line.strip().startswith('handoffs:'):
|
|
skip_until_outdent = True
|
|
continue
|
|
|
|
filtered_frontmatter.append(line)
|
|
|
|
# 2. Inject 'name' field if missing (using centralized formatter)
|
|
has_name = any(line.strip().startswith('name:') for line in filtered_frontmatter)
|
|
if not has_name:
|
|
# Use centralized formatter to ensure consistent hyphenated format
|
|
cmd_name = format_forge_command_name(template_name)
|
|
filtered_frontmatter.insert(0, f'name: {cmd_name}')
|
|
|
|
# Reconstruct content
|
|
result = ['---'] + filtered_frontmatter + ['---'] + body_lines
|
|
return '\n'.join(result)
|