@michaelxwb/code-flow 0.6.5 → 0.8.1

package/src/core/code-flow/scripts/codeflow/spec/cf_spec_context_model.py

@@ -0,0 +1,477 @@
+"""Pure Spec Context model: dataclasses, serialization and identity hashing.
+
+This module owns the persisted schema and its stable error contract. CLI
+commands, doctor and decision orchestration stay in `cf_spec_context`; lower
+layers (cache, evidence, plan quality) depend on this model instead of the CLI
+entry.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime, timezone
+import hashlib
+from pathlib import Path
+from typing import TYPE_CHECKING, Mapping, Optional, Sequence
+
+from codeflow.core import cf_fs
+from codeflow.spec.cf_spec_metadata import SpecHashes
+
+if TYPE_CHECKING:
+    from codeflow.spec.cf_spec_resolver import SpecCandidate
+
+
+CONTEXT_VERSION = 1
+STAGE_STATUSES = frozenset(
+    ("pending", "applied", "not_applicable", "waived", "verified", "stale", "conflict", "unverified")
+)
+DECISION_KINDS = frozenset(("not_applicable", "waived", "manual_verification"))
+_AGENT_IDENTITIES = frozenset(("agent", "assistant", "codex", "claude", "opencode", "costrict"))
+
+
+class ContextError(ValueError):
+    """A stable context error suitable for JSON CLI output."""
+
+    def __init__(self, code: str, field: str, message: str, path: str = "") -> None:
+        self.code = code
+        self.field = field
+        self.message = message
+        self.path = path
+        location = f"{path}: " if path else ""
+        super().__init__(f"{location}{code} {field}: {message}")
+
+    def to_dict(self) -> dict[str, str]:
+        return {"code": self.code, "field": self.field, "message": self.message, "path": self.path}
+
+
+def error_payload(exc: Exception) -> Optional[dict]:
+    """Duck-typed ContextError recognition across duplicate module instances.
+
+    Direct script execution (`python3 cf_spec_context.py`) can make lazy
+    `import cf_spec_context` calls inside sibling modules load a second copy,
+    so `isinstance(exc, ContextError)` fails even though the error contract is
+    identical. Recognize it structurally instead of masking it as
+    `internal_error`.
+    """
+    to_dict = getattr(exc, "to_dict", None)
+    if not callable(to_dict) or not isinstance(getattr(exc, "code", None), str):
+        return None
+    payload = to_dict()
+    return payload if isinstance(payload, dict) else None
+
+
+@dataclass(frozen=True)
+class ContextSource:
+    type: str
+    ref: str
+
+
+@dataclass(frozen=True)
+class Decision:
+    kind: str
+    reason: str
+    confirmed_by: str
+    confirmed_at: str
+    source: str
+    expires_at: Optional[str]
+
+
+@dataclass(frozen=True)
+class ArtifactRef:
+    artifact: str
+    section_id: str
+    item_id: str
+    artifact_sha256: str
+
+
+@dataclass(frozen=True)
+class RuleStageStatus:
+    status: str
+    refs: tuple[ArtifactRef, ...]
+    decision: Optional[Decision]
+    evidence: tuple[Mapping[str, object], ...]
+
+
+@dataclass(frozen=True)
+class RuleBinding:
+    ref: str
+    summary: str
+    text_sha256: str
+    enforcement: str
+    verifier_ref: str
+    stage_status: Mapping[str, RuleStageStatus]
+    verifier_stage: str = "code"
+
+
+@dataclass(frozen=True)
+class SpecBinding:
+    spec_id: str
+    path: str
+    hashes: SpecHashes
+    selected_by: str
+    reason: str
+    enforcement: str
+    stages: tuple[str, ...]
+    rules: tuple[RuleBinding, ...]
+    status: str = "active"
+
+
+@dataclass(frozen=True)
+class SpecContext:
+    version: int
+    task: str
+    enforcement: str
+    updated_at: str
+    sources: tuple[ContextSource, ...]
+    bindings: tuple[SpecBinding, ...]
+
+
+@dataclass(frozen=True)
+class BindingInput:
+    candidate: SpecCandidate
+    selected_by: str
+    reason: str
+
+
+@dataclass(frozen=True)
+class DriftChange:
+    kind: str
+    spec_id: str
+    rule_ref: str
+    old_hash: str
+    new_hash: str
+    stages: tuple[str, ...]
+
+
+@dataclass(frozen=True)
+class DriftResult:
+    context: SpecContext
+    changes: tuple[DriftChange, ...]
+
+
+def now_iso() -> str:
+    return datetime.now(timezone.utc).isoformat()
+
+
+def atomic_text(target: Path, text: str) -> None:
+    """Atomic write with the Context's stable error code on failure."""
+    try:
+        cf_fs.atomic_write_text(target, text)
+    except OSError as exc:
+        raise ContextError("atomic_write_error", "file", str(exc), str(target)) from exc
+
+
+def mapping_field(value: object, field: str, path: str) -> Mapping[str, object]:
+    if not isinstance(value, dict) or not all(isinstance(key, str) for key in value):
+        raise ContextError("invalid_context", field, "必须是字符串 key mapping", path)
+    return value
+
+
+def sequence_field(value: object, field: str, path: str) -> Sequence[object]:
+    if not isinstance(value, list):
+        raise ContextError("invalid_context", field, "必须是列表", path)
+    return value
+
+
+def string_field(value: object, field: str, path: str) -> str:
+    if not isinstance(value, str) or not value.strip():
+        raise ContextError("invalid_context", field, "必须是非空字符串", path)
+    return value.strip()
+
+
+def _decision_string(value: object, field: str, path: str) -> str:
+    if not isinstance(value, str) or not value.strip():
+        raise ContextError("invalid_decision", field, "必须是非空字符串", path)
+    return value.strip()
+
+
+def _timestamp(value: str, field: str) -> None:
+    try:
+        parsed = datetime.fromisoformat(value.replace("Z", "+00:00"))
+    except ValueError as exc:
+        raise ContextError("invalid_decision", field, "必须是 RFC3339 时间") from exc
+    if parsed.tzinfo is None:
+        raise ContextError("invalid_decision", field, "必须包含时区")
+
+
+def validate_decision(decision: Decision) -> None:
+    if decision.kind not in DECISION_KINDS:
+        raise ContextError("invalid_decision", "decision.kind", f"不支持 {decision.kind!r}")
+    for field in ("reason", "confirmed_by", "confirmed_at", "source"):
+        if not getattr(decision, field).strip():
+            raise ContextError("invalid_decision", f"decision.{field}", "必须是非空字符串")
+    identity = decision.confirmed_by.lower().split(":", 1)[0]
+    if identity in _AGENT_IDENTITIES:
+        raise ContextError("agent_confirmation_forbidden", "decision.confirmed_by", "Agent 不能自行确认")
+    _timestamp(decision.confirmed_at, "decision.confirmed_at")
+    if decision.kind == "waived" and not decision.expires_at:
+        raise ContextError("invalid_decision", "decision.expires_at", "waived 必须有失效时间")
+    if decision.expires_at:
+        _timestamp(decision.expires_at, "decision.expires_at")
+
+
+def decision_from_data(value: object, path: str) -> Optional[Decision]:
+    if value is None:
+        return None
+    data = mapping_field(value, "decision", path)
+    expires = data.get("expires_at")
+    if expires is not None and not isinstance(expires, str):
+        raise ContextError("invalid_decision", "decision.expires_at", "必须是字符串或 null", path)
+    decision = Decision(
+        _decision_string(data.get("kind"), "decision.kind", path),
+        _decision_string(data.get("reason"), "decision.reason", path),
+        _decision_string(data.get("confirmed_by"), "decision.confirmed_by", path),
+        _decision_string(data.get("confirmed_at"), "decision.confirmed_at", path),
+        _decision_string(data.get("source"), "decision.source", path),
+        expires,
+    )
+    validate_decision(decision)
+    return decision
+
+
+def _decision_data(decision: Optional[Decision]) -> Optional[dict[str, object]]:
+    if decision is None:
+        return None
+    return {
+        "kind": decision.kind,
+        "reason": decision.reason,
+        "confirmed_by": decision.confirmed_by,
+        "confirmed_at": decision.confirmed_at,
+        "source": decision.source,
+        "expires_at": decision.expires_at,
+    }
+
+
+def _artifact_from_data(value: object, path: str) -> ArtifactRef:
+    data = mapping_field(value, "refs[]", path)
+    return ArtifactRef(
+        string_field(data.get("artifact"), "refs[].artifact", path),
+        string_field(data.get("section_id"), "refs[].section_id", path),
+        string_field(data.get("item_id"), "refs[].item_id", path),
+        string_field(data.get("artifact_sha256"), "refs[].artifact_sha256", path),
+    )
+
+
+def _artifact_data(reference: ArtifactRef) -> dict[str, str]:
+    return {
+        "artifact": reference.artifact,
+        "section_id": reference.section_id,
+        "item_id": reference.item_id,
+        "artifact_sha256": reference.artifact_sha256,
+    }
+
+
+def _stage_from_data(value: object, field: str, path: str) -> RuleStageStatus:
+    data = mapping_field(value, field, path)
+    status = string_field(data.get("status"), f"{field}.status", path)
+    if status not in STAGE_STATUSES:
+        raise ContextError("invalid_context", f"{field}.status", f"不支持 {status!r}", path)
+    refs = tuple(_artifact_from_data(item, path) for item in sequence_field(data.get("refs", []), f"{field}.refs", path))
+    evidence = tuple(mapping_field(item, f"{field}.evidence[]", path) for item in sequence_field(data.get("evidence", []), f"{field}.evidence", path))
+    decision = decision_from_data(data.get("decision"), path)
+    if status == "applied" and not refs:
+        raise ContextError("invalid_context", f"{field}.refs", "applied 必须有 artifact ref", path)
+    if status in ("not_applicable", "waived") and decision is None:
+        raise ContextError("invalid_context", f"{field}.decision", f"{status} 必须有确认记录", path)
+    return RuleStageStatus(status, refs, decision, evidence)
+
+
+def _stage_data(status: RuleStageStatus) -> dict[str, object]:
+    return {
+        "status": status.status,
+        "refs": [_artifact_data(item) for item in status.refs],
+        "decision": _decision_data(status.decision),
+        "evidence": [dict(item) for item in status.evidence],
+    }
+
+
+def _rule_from_data(value: object, path: str) -> RuleBinding:
+    data = mapping_field(value, "rules[]", path)
+    stages = mapping_field(data.get("stage_status"), "rules[].stage_status", path)
+    parsed = {stage: _stage_from_data(item, f"stage_status.{stage}", path) for stage, item in stages.items()}
+    return RuleBinding(
+        string_field(data.get("ref"), "rules[].ref", path),
+        string_field(data.get("summary"), "rules[].summary", path),
+        string_field(data.get("text_sha256"), "rules[].text_sha256", path),
+        string_field(data.get("enforcement"), "rules[].enforcement", path),
+        string_field(data.get("verifier_ref"), "rules[].verifier_ref", path),
+        parsed,
+        string_field(data.get("verifier_stage", "code"), "rules[].verifier_stage", path),
+    )
+
+
+def _rule_data(rule: RuleBinding) -> dict[str, object]:
+    return {
+        "ref": rule.ref,
+        "summary": rule.summary,
+        "text_sha256": rule.text_sha256,
+        "enforcement": rule.enforcement,
+        "verifier_ref": rule.verifier_ref,
+        "verifier_stage": rule.verifier_stage,
+        "stage_status": {stage: _stage_data(status) for stage, status in rule.stage_status.items()},
+    }
+
+
+def _hashes_from_data(value: object, path: str) -> SpecHashes:
+    data = mapping_field(value, "hashes", path)
+    return SpecHashes(
+        string_field(data.get("file_sha256"), "hashes.file_sha256", path),
+        string_field(data.get("metadata_sha256"), "hashes.metadata_sha256", path),
+        string_field(data.get("rules_sha256"), "hashes.rules_sha256", path),
+    )
+
+
+def _binding_from_data(value: object, path: str) -> SpecBinding:
+    data = mapping_field(value, "bindings[]", path)
+    stages = tuple(string_field(item, "bindings[].stages[]", path) for item in sequence_field(data.get("stages"), "bindings[].stages", path))
+    rules = tuple(_rule_from_data(item, path) for item in sequence_field(data.get("rules"), "bindings[].rules", path))
+    return SpecBinding(
+        string_field(data.get("spec_id"), "bindings[].spec_id", path),
+        string_field(data.get("path"), "bindings[].path", path),
+        _hashes_from_data(data.get("hashes"), path),
+        string_field(data.get("selected_by"), "bindings[].selected_by", path),
+        string_field(data.get("reason"), "bindings[].reason", path),
+        string_field(data.get("enforcement"), "bindings[].enforcement", path),
+        stages,
+        rules,
+        string_field(data.get("status", "active"), "bindings[].status", path),
+    )
+
+
+def _binding_data(binding: SpecBinding) -> dict[str, object]:
+    return {
+        "spec_id": binding.spec_id,
+        "path": binding.path,
+        "status": binding.status,
+        "hashes": {
+            "file_sha256": binding.hashes.file_sha256,
+            "metadata_sha256": binding.hashes.metadata_sha256,
+            "rules_sha256": binding.hashes.rules_sha256,
+        },
+        "selected_by": binding.selected_by,
+        "reason": binding.reason,
+        "enforcement": binding.enforcement,
+        "stages": list(binding.stages),
+        "rules": [_rule_data(rule) for rule in binding.rules],
+    }
+
+
+def context_to_data(context: SpecContext) -> dict[str, object]:
+    return {
+        "version": context.version,
+        "task": context.task,
+        "enforcement": context.enforcement,
+        "updated_at": context.updated_at,
+        "sources": [{"type": item.type, "ref": item.ref} for item in context.sources],
+        "bindings": [_binding_data(binding) for binding in context.bindings],
+    }
+
+
+def context_to_identity(context: SpecContext) -> dict[str, object]:
+    """Stable identity projection for marker drift detection.
+
+    Excludes volatile runtime state (`updated_at`, `stage_status` including
+    evidence timestamps) so the active marker only invalidates when the bound
+    rules themselves change (rule/spec text, bindings, sources).
+    """
+    return {
+        "version": context.version,
+        "task": context.task,
+        "enforcement": context.enforcement,
+        "sources": [{"type": item.type, "ref": item.ref} for item in context.sources],
+        "bindings": [
+            {
+                "spec_id": binding.spec_id,
+                "path": binding.path,
+                "status": binding.status,
+                "hashes": {
+                    "file_sha256": binding.hashes.file_sha256,
+                    "metadata_sha256": binding.hashes.metadata_sha256,
+                    "rules_sha256": binding.hashes.rules_sha256,
+                },
+                "selected_by": binding.selected_by,
+                "reason": binding.reason,
+                "enforcement": binding.enforcement,
+                "stages": list(binding.stages),
+                "rules": [
+                    {
+                        "ref": rule.ref,
+                        "summary": rule.summary,
+                        "text_sha256": rule.text_sha256,
+                        "enforcement": rule.enforcement,
+                        "verifier_ref": rule.verifier_ref,
+                    }
+                    for rule in binding.rules
+                ],
+            }
+            for binding in context.bindings
+        ],
+    }
+
+
+def context_sha256(context: SpecContext) -> str:
+    """Deterministic identity hash binding the active marker to the bound rules.
+
+    Computed from the stable identity projection (never volatile runtime state),
+    so evidence timestamps and stage statuses cannot drift the marker.
+    """
+    import yaml
+    data = yaml.safe_dump(context_to_identity(context), sort_keys=True, allow_unicode=True).encode()
+    return hashlib.sha256(data).hexdigest()
+
+
+def new_context(task: str, sources: Sequence[tuple[str, str]]) -> SpecContext:
+    if not task.strip():
+        raise ContextError("invalid_context", "task", "必须是非空字符串")
+    parsed = tuple(ContextSource(string_field(kind, "sources[].type", ""), string_field(ref, "sources[].ref", "")) for kind, ref in sources)
+    return SpecContext(CONTEXT_VERSION, task.strip(), "required", now_iso(), parsed, ())
+
+
+def load_context(path: str, *, source: Optional[bytes] = None) -> SpecContext:
+    import yaml
+    try:
+        raw = Path(path).read_bytes() if source is None else source
+        loaded = yaml.safe_load(raw.decode("utf-8")) or {}
+    except (OSError, UnicodeError, yaml.YAMLError) as exc:
+        raise ContextError("context_read_error", "file", str(exc), path) from exc
+    return context_from_data(loaded, path)
+
+
+def context_from_data(loaded: object, path: str) -> SpecContext:
+    """Validate a parsed Context through the same schema for YAML and cache reads."""
+    data = mapping_field(loaded, "context", path)
+    version = data.get("version")
+    if version != CONTEXT_VERSION:
+        raise ContextError("unsupported_version", "version", f"仅支持 {CONTEXT_VERSION}，收到 {version!r}", path)
+    source_values = sequence_field(data.get("sources", []), "sources", path)
+    sources = tuple(
+        ContextSource(
+            string_field(mapping_field(item, "sources[]", path).get("type"), "sources[].type", path),
+            string_field(mapping_field(item, "sources[]", path).get("ref"), "sources[].ref", path),
+        )
+        for item in source_values
+    )
+    bindings = tuple(_binding_from_data(item, path) for item in sequence_field(data.get("bindings", []), "bindings", path))
+    return SpecContext(
+        CONTEXT_VERSION,
+        string_field(data.get("task"), "task", path),
+        string_field(data.get("enforcement"), "enforcement", path),
+        string_field(data.get("updated_at"), "updated_at", path),
+        sources,
+        bindings,
+    )
+
+
+def serialize_context(context: SpecContext) -> str:
+    import yaml
+    return yaml.safe_dump(context_to_data(context), sort_keys=False, allow_unicode=True)
+
+
+def save_context(path: str, context: SpecContext) -> None:
+    target = Path(path)
+    target.parent.mkdir(parents=True, exist_ok=True)
+    text = serialize_context(context)
+    try:
+        atomic_text(target, text)
+    except ContextError as exc:
+        raise ContextError("context_write_error", "file", str(exc), path) from exc

package/src/core/code-flow/scripts/codeflow/spec/cf_spec_impact.py

@@ -0,0 +1,119 @@
+"""Read-only, bounded impact analysis for Spec Contexts and task documents."""
+from __future__ import annotations
+
+import os
+from pathlib import Path
+import re
+from typing import Callable, Iterator
+
+from codeflow.spec.cf_spec_context_model import ContextError, load_context
+from codeflow.spec.cf_spec_resolver import resolve_candidates
+from codeflow.task.cf_task_doc import TaskDocumentError, parse_task_document
+
+
+def _identity(root: str, value: str) -> tuple[str, str]:
+    query = value.replace('\\', '/').removeprefix('.code-flow/specs/')
+    found: dict[str, str] = {}
+    for stage in ('prd', 'design', 'plan', 'code', 'review'):
+        for item in resolve_candidates(root, stage, ()):
+            if query in (item.spec_id, item.path):
+                found[item.spec_id] = item.path
+    if len(found) != 1:
+        raise ValueError('spec_not_found' if not found else 'spec_identity_ambiguous')
+    return next(iter(found.items()))
+
+
+def _files(root: Path, max_depth: int, onerror: Callable[[OSError], None]) -> Iterator[Path | None]:
+    if not root.exists():
+        return
+    for current, dirs, names in os.walk(root, followlinks=False, onerror=onerror):
+        directory = Path(current)
+        depth = len(directory.relative_to(root).parts)
+        blocked = [name for name in dirs if depth >= max_depth or (directory / name).is_symlink()]
+        dirs[:] = sorted(name for name in dirs if name not in blocked)
+        if blocked:
+            yield None
+        for name in sorted(names):
+            if name == 'spec-context.yml' or (name.endswith('.md') and not name.endswith(('.prd.md', '.design.md', '.scenarios.md'))):
+                yield directory / name
+
+
+def _context_references(path: Path, root: Path, identities: dict[str, str]) -> list[dict[str, object]]:
+    context = load_context(str(path))
+    rows: list[dict[str, object]] = []
+    for binding in context.bindings:
+        if binding.spec_id not in identities:
+            continue
+        for rule in binding.rules:
+            if rule.enforcement != 'required':
+                continue
+            stage = rule.stage_status.get('code') or rule.stage_status.get('design')
+            rows.append({'context_path': path.relative_to(root).as_posix(), 'task_id': context.task,
+                         'spec_id': binding.spec_id, 'rule_ref': f'{binding.spec_id}#{rule.ref}',
+                         'rule_status': stage.status if stage else 'unknown',
+                         'source': 'context', 'archived': 'archived' in path.parts})
+    return rows
+
+
+def _task_references(path: Path, root: Path, identities: dict[str, str]) -> list[dict[str, object]]:
+    text = path.read_text(encoding='utf-8')
+    candidates = {name: spec_path for name, spec_path in identities.items() if name in text or spec_path in text}
+    if not candidates:
+        return []
+    try:
+        document = parse_task_document(text, source=str(path))
+    except TaskDocumentError as exc:
+        if exc.code == 'task_document_empty':
+            return []
+        raise
+    rows: list[dict[str, object]] = []
+    for task in document.tasks:
+        for spec_id, spec_path in candidates.items():
+            pattern = re.compile(rf'{re.escape(spec_id)}#(RULE-[\w-]+)')
+            refs = sorted(set(pattern.findall(task.body)))
+            if not refs and spec_path not in task.body:
+                continue
+            for ref in refs or ['']:
+                rows.append({'task_path': path.relative_to(root).as_posix(), 'task_id': task.id,
+                             'spec_id': spec_id, 'status': task.status,
+                             'rule_ref': f'{spec_id}#{ref}' if ref else '',
+                             'source': 'task', 'archived': 'archived' in path.parts})
+    return rows
+
+
+def scan_impacts(root: str, identities: dict[str, str], max_files: int = 5000,
+                 max_depth: int = 20) -> dict[str, object]:
+    if max_files <= 0 or max_depth <= 0:
+        raise ValueError('impact limits must be positive')
+    project = Path(root).resolve()
+    tasks = project / '.code-flow/tasks'
+    rows: list[dict[str, object]] = []
+    errors: list[dict[str, str]] = []
+    def walk_error(exc: OSError) -> None:
+        errors.append({'path': str(exc.filename or tasks), 'message': str(exc)})
+    scanned = 0
+    truncated = False
+    for path in _files(tasks, max_depth, walk_error):
+        if path is None:
+            truncated = True
+            continue
+        if scanned >= max_files:
+            truncated = True
+            break
+        scanned += 1
+        try:
+            if path.is_symlink():
+                raise ValueError('symlink task file is not scanned')
+            references = (_context_references(path, project, identities) if path.name == 'spec-context.yml'
+                          else _task_references(path, project, identities))
+            rows.extend(references)
+        except (OSError, UnicodeError, ValueError, ContextError) as exc:
+            errors.append({'path': path.relative_to(project).as_posix(), 'message': str(exc)})
+    return {'references': rows, 'scanned_files': scanned, 'truncated': truncated, 'errors': errors}
+
+
+def inspect_impact(root: str, query: str, max_files: int = 5000, max_depth: int = 20) -> dict[str, object]:
+    spec_id, spec_path = _identity(root, query)
+    return {'spec_id': spec_id, 'spec_path': spec_path,
+            **scan_impacts(root, {spec_id: spec_path}, max_files, max_depth),
+            'next': '修改后运行 code-flow spec refresh'}

package/src/core/code-flow/scripts/{cf_spec_metadata.py → codeflow/spec/cf_spec_metadata.py}

@@ -241,8 +241,6 @@ def _parse_verifiers(
         rule = item.get("rule")
         kind = item.get("type")
         config = item.get("config")
-        explicit_stage = "stage" in item
-        stage = item.get("stage", "code")
         if not isinstance(rule, str) or not _RULE_ID_RE.fullmatch(rule):
             line = _verifier_field_line(raw, index, "rule")
             raise SpecMetadataError(path, f"verifiers[{index}].rule", line, "必须是稳定 RULE ID")
@@ -252,6 +250,11 @@ def _parse_verifiers(
         if not isinstance(config, dict):
             line = _verifier_field_line(raw, index, "config")
             raise SpecMetadataError(path, f"verifiers[{index}].config", line, "必须是 mapping")
+        explicit_stage = "stage" in item
+        # manual（人工验收）默认跟随 spec 声明的 review 阶段，落在需求级终验一次性确认；
+        # spec 未声明 review 时保持 code（逐任务确认）；显式 stage 始终优先。
+        default_stage = "review" if kind == "manual" and "review" in stages else "code"
+        stage = item.get("stage", default_stage)
         if explicit_stage and (not isinstance(stage, str) or stage not in ALLOWED_VERIFIER_STAGES):
             line = _verifier_field_line(raw, index, "stage")
             raise SpecMetadataError(path, f"verifiers[{index}].stage", line, f"必须是 {sorted(ALLOWED_VERIFIER_STAGES)} 之一")

package/src/core/code-flow/scripts/{cf_spec_migrate.py → codeflow/spec/cf_spec_migrate.py}

@@ -14,14 +14,17 @@ from typing import IO, Mapping, Optional, Sequence
 
 import yaml
 
-from cf_spec_context import BindingInput, bind_specs, new_context, save_context
-from cf_spec_metadata import SpecMetadata, SpecMetadataError, load_spec_metadata
-from cf_spec_resolver import SCOPE_PRIORITY, SpecCandidate
+if __package__ in (None, ""):
+    sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
+
+from codeflow.cli.cf_spec_context import BindingInput, bind_specs, new_context, save_context
+from codeflow.spec.cf_spec_metadata import SpecMetadata, SpecMetadataError, load_spec_metadata
+from codeflow.spec.cf_spec_resolver import SCOPE_PRIORITY, SpecCandidate
 
 
 TARGET_VERSION = "0.6.0"
 TARGET_SCHEMA = 1
-PACKAGE_ROOT = Path(__file__).resolve().parents[4]
+PACKAGE_ROOT = Path(__file__).resolve().parents[6]
 _DATE_RE = re.compile(r"^\d{4}-\d{2}-\d{2}$")
 _SUFFIXES = (".frontend.design.md", ".backend.design.md", ".design.md", ".prd.md", ".md")
 
@@ -425,17 +428,31 @@ def _write_target_config(staging: Path) -> None:
     path.write_text(yaml.safe_dump(data, sort_keys=False, allow_unicode=True), encoding="utf-8")
 
 
+def _runtime_gitignore() -> tuple[str, list[str], str]:
+    path = Path(__file__).resolve().parents[2] / "runtime-resources.json"
+    data = json.loads(path.read_text(encoding="utf-8"))
+    block = data["gitignore"]
+    return block["start"], list(block["entries"]), block["end"]
+
+
 def _write_target_ignore(staging: Path) -> None:
     path = staging / ".code-flow/.gitignore"
     existing = path.read_text(encoding="utf-8") if path.exists() else ""
-    block = (
-        "# >>> code-flow:runtime schema=1\n.active-task.json\n.active-task.lock\n"
-        ".catalog-state.json\nmigrations/\nspecs/_session/\n"
-        "# <<< code-flow:runtime schema=1\n"
-    )
+    # The packaged runtime-resources.json declaration is the single source shared
+    # with the CLI: migrate must not leave sessions/worktrees/backups/logs
+    # committable after an upgrade.
+    start, entries, end = _runtime_gitignore()
+    block = "\n".join([start, *entries, end]) + "\n"
     lines = [line for line in existing.splitlines() if line != ".inject-state"]
-    if "# >>> code-flow:runtime schema=1" not in existing:
+    if start not in existing:
         path.write_text("\n".join(lines).rstrip() + "\n" + block, encoding="utf-8")
+        return
+    if end in lines:
+        missing = [entry for entry in entries if entry not in lines]
+        if missing:
+            at = lines.index(end)
+            lines[at:at] = missing
+            path.write_text("\n".join(lines) + "\n", encoding="utf-8")
 
 
 def _target_manifest(staging: Path) -> list[dict[str, str]]: