okstra 0.231.1 → 0.232.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -0
- package/dist/cli-registry.mjs +6 -0
- package/dist/cli-registry.mjs.map +1 -1
- package/dist/commands/memory/memory.mjs +9 -55
- package/dist/commands/memory/memory.mjs.map +1 -1
- package/dist/lib/memory-auto-register.d.mts +1 -0
- package/dist/lib/memory-auto-register.mjs +113 -0
- package/dist/lib/memory-auto-register.mjs.map +1 -0
- package/dist/lib/memory-entry-contract.d.mts +12 -0
- package/dist/lib/memory-entry-contract.mjs +46 -0
- package/dist/lib/memory-entry-contract.mjs.map +1 -0
- package/dist/lib/python-helper.d.mts +1 -1
- package/dist/lib/python-helper.mjs +3 -2
- package/dist/lib/python-helper.mjs.map +1 -1
- package/dist/lib/record-secrets.d.mts +1 -0
- package/dist/lib/record-secrets.mjs +28 -0
- package/dist/lib/record-secrets.mjs.map +1 -0
- package/dist/lib/types.d.mts +2 -1
- package/docs/architecture/storage-model.md +127 -0
- package/docs/architecture.md +7 -0
- package/docs/cli.md +234 -0
- package/docs/project-structure-overview.md +2 -1
- package/package.json +1 -1
- package/runtime/BUILD.json +2 -2
- package/runtime/agents/common.json +8 -8
- package/runtime/agents/roles/verifier.json +2 -4
- package/runtime/bin/okstra-provider-exec.py +10 -4
- package/runtime/prompts/coding-preflight/architectures/hexagonal.md +23 -30
- package/runtime/prompts/coding-preflight/authoring-checks.md +17 -0
- package/runtime/prompts/coding-preflight/clean-code.md +85 -281
- package/runtime/prompts/coding-preflight/frameworks/node-server.md +2 -3
- package/runtime/prompts/coding-preflight/languages/java.md +3 -5
- package/runtime/prompts/coding-preflight/languages/javascript-typescript.md +5 -12
- package/runtime/prompts/coding-preflight/languages/kotlin.md +2 -4
- package/runtime/prompts/coding-preflight/languages/python.md +2 -7
- package/runtime/prompts/coding-preflight/languages/rust.md +2 -8
- package/runtime/prompts/coding-preflight/languages/sql.md +2 -4
- package/runtime/prompts/coding-preflight/overview.md +25 -38
- package/runtime/prompts/coding-preflight/review-rules.json +30 -0
- package/runtime/prompts/duties/code-reviewer.json +15 -18
- package/runtime/prompts/duties/implementation-verifier.json +1 -0
- package/runtime/prompts/profiles/_coding-conventions-preflight.md +41 -6
- package/runtime/python/okstra_ctl/agent/invocation.py +121 -36
- package/runtime/python/okstra_ctl/agent/prompt_cli/cli.py +6 -0
- package/runtime/python/okstra_ctl/agent/prompt_cli/materialize.py +30 -4
- package/runtime/python/okstra_ctl/agent/standalone.py +3 -0
- package/runtime/python/okstra_ctl/analysis_packet.py +2 -19
- package/runtime/python/okstra_ctl/attempt_evidence.py +10 -0
- package/runtime/python/okstra_ctl/code_review_census.py +71 -7
- package/runtime/python/okstra_ctl/code_review_coverage.py +4 -274
- package/runtime/python/okstra_ctl/code_review_integrity.py +154 -0
- package/runtime/python/okstra_ctl/code_review_invocation.py +212 -0
- package/runtime/python/okstra_ctl/code_review_scope.py +36 -9
- package/runtime/python/okstra_ctl/code_review_target.py +85 -11
- package/runtime/python/okstra_ctl/consumers.py +12 -9
- package/runtime/python/okstra_ctl/design_review.py +207 -0
- package/runtime/python/okstra_ctl/design_review_evidence.py +297 -0
- package/runtime/python/okstra_ctl/doctor.py +8 -25
- package/runtime/python/okstra_ctl/doyouknow/__init__.py +9 -0
- package/runtime/python/okstra_ctl/doyouknow/cli.py +91 -0
- package/runtime/python/okstra_ctl/doyouknow/config.py +58 -0
- package/runtime/python/okstra_ctl/doyouknow/contracts.py +184 -0
- package/runtime/python/okstra_ctl/doyouknow/identity.py +22 -0
- package/runtime/python/okstra_ctl/doyouknow/paths.py +22 -0
- package/runtime/python/okstra_ctl/doyouknow/pending.py +72 -0
- package/runtime/python/okstra_ctl/doyouknow/registration.py +260 -0
- package/runtime/python/okstra_ctl/doyouknow/source_contracts.py +128 -0
- package/runtime/python/okstra_ctl/doyouknow/source_store.py +172 -0
- package/runtime/python/okstra_ctl/doyouknow/sources/io.py +36 -0
- package/runtime/python/okstra_ctl/doyouknow/sources/manager.py +261 -0
- package/runtime/python/okstra_ctl/doyouknow/sources/memory.py +179 -0
- package/runtime/python/okstra_ctl/doyouknow/sources/task.py +95 -0
- package/runtime/python/okstra_ctl/doyouknow/store.py +260 -0
- package/runtime/python/okstra_ctl/doyouknow/sync.py +58 -0
- package/runtime/python/okstra_ctl/execution_mutation_audit.py +18 -2
- package/runtime/python/okstra_ctl/file_size_cap.py +3 -4
- package/runtime/python/okstra_ctl/json_boundary.py +21 -2
- package/runtime/python/okstra_ctl/jsonl.py +21 -0
- package/runtime/python/okstra_ctl/manager_cli.py +26 -0
- package/runtime/python/okstra_ctl/manager_registration.py +29 -0
- package/runtime/python/okstra_ctl/manager_sync.py +3 -22
- package/runtime/python/okstra_ctl/model_io/renderers.py +13 -2
- package/runtime/python/okstra_ctl/model_io_cli.py +7 -1
- package/runtime/python/okstra_ctl/phases/final_verification/validation.py +20 -0
- package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-deliverable.md +10 -0
- package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-diff-review.md +19 -6
- package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-self-check.md +5 -3
- package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-verifier.md +38 -10
- package/runtime/python/okstra_ctl/phases/implementation/report_assets/implementation.template.html +13 -0
- package/runtime/python/okstra_ctl/phases/implementation/spec.md +25 -0
- package/runtime/python/okstra_ctl/phases/implementation/validation.py +6 -0
- package/runtime/python/okstra_ctl/phases/implementation_planning/authoring.py +4 -0
- package/runtime/python/okstra_ctl/phases/implementation_planning/profile.md +1 -1
- package/runtime/python/okstra_ctl/report_assembly.py +15 -0
- package/runtime/python/okstra_ctl/report_narrative.py +3 -0
- package/runtime/python/okstra_ctl/report_synthesis_packet.py +11 -2
- package/runtime/python/okstra_ctl/review_policy.py +359 -0
- package/runtime/python/okstra_ctl/review_verdicts.py +291 -0
- package/runtime/python/okstra_ctl/run.py +24 -1
- package/runtime/python/okstra_ctl/stage_done.py +11 -0
- package/runtime/python/okstra_ctl/standalone_review_audit.py +28 -0
- package/runtime/python/okstra_ctl/verification_generation.py +23 -1
- package/runtime/python/okstra_ctl/verification_input_types.py +15 -1
- package/runtime/python/okstra_ctl/verification_inputs.py +28 -6
- package/runtime/python/okstra_ctl/verification_invocation.py +7 -1
- package/runtime/python/okstra_ctl/verification_target.py +2 -0
- package/runtime/python/okstra_ctl/worker_prompt_headers.py +24 -9
- package/runtime/python/okstra_ctl/worker_runner.py +66 -10
- package/runtime/python/okstra_ctl/write_policy.py +34 -1
- package/runtime/python/okstra_project/__init__.py +2 -0
- package/runtime/python/okstra_project/dirs.py +18 -0
- package/runtime/python/okstra_project/state.py +25 -20
- package/runtime/schemas/doyouknow-config-v1.schema.json +20 -0
- package/runtime/schemas/doyouknow-v1.schema.json +65 -0
- package/runtime/schemas/final-report-v2.0.schema.json +157 -0
- package/runtime/schemas/final-report-v3.0.schema.json +157 -0
- package/runtime/schemas/memory-entry-contract-v1.json +11 -0
- package/runtime/schemas/record-secret-patterns.json +41 -0
- package/runtime/skills/okstra-code-review/SKILL.md +71 -123
- package/runtime/skills/okstra-code-review/references/census-rules.md +29 -105
- package/runtime/skills/okstra-code-review/references/review-calibration.md +34 -54
- package/runtime/skills/okstra-manager/SKILL.md +7 -0
- package/runtime/skills/okstra-memory/SKILL.md +7 -0
- package/runtime/templates/implementation-worker-preamble.md +4 -9
- package/runtime/templates/worker-prompt-preamble.md +4 -12
- package/runtime/validators/validate-run.py +14 -2
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
3
|
+
import json
|
|
4
|
+
import re
|
|
5
|
+
from pathlib import Path
|
|
6
|
+
from collections.abc import Mapping
|
|
7
|
+
from typing import Any
|
|
8
|
+
|
|
9
|
+
from .agent.invocation import (
|
|
10
|
+
reserved_generation_reference, reserved_invocation_metadata_path, verify_agent_invocation,
|
|
11
|
+
)
|
|
12
|
+
from .attempt_evidence import AttemptEvidenceSeal, read_sealed_artifact
|
|
13
|
+
from .conformance_evidence import BoundInvocation, bound_attempt, evidence_read_errors, load_run_verifiers
|
|
14
|
+
from .design_review import parse_design_review
|
|
15
|
+
from .execution_identity import ExecutionManifest, build_dispatch_id
|
|
16
|
+
from .execution_manifest import read_execution_manifest
|
|
17
|
+
from .json_boundary import load_owned_object
|
|
18
|
+
from .qa_procedures import canonical_json_digest, content_digest, safe_qa_path
|
|
19
|
+
from .verification_dispatch import verification_generation_number
|
|
20
|
+
from .verification_input_ref import VerificationInputReference
|
|
21
|
+
from .verification_inputs import read_verification_inputs
|
|
22
|
+
from .verification_input_types import DESIGN_REVIEW_INPUT_SCHEMA_VERSION
|
|
23
|
+
from .verification_invocation import VerificationGenerationReference, read_invocation_generation
|
|
24
|
+
from .verification_evidence import roster_verifier_role_execution_ref
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def design_review_required(project: Path, manifest: Mapping[str, Any]) -> bool:
|
|
28
|
+
reference = VerificationInputReference.from_artifact_fields(manifest)
|
|
29
|
+
if reference is None or manifest.get("taskType") not in ("implementation", "final-verification"):
|
|
30
|
+
return False
|
|
31
|
+
inputs = read_verification_inputs(safe_qa_path(project, reference.relative_path), reference.digest)
|
|
32
|
+
return inputs["schemaVersion"] == DESIGN_REVIEW_INPUT_SCHEMA_VERSION
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
def collect_design_reviews(project: Path, manifest_path: Path) -> dict[str, dict[str, Any]]:
|
|
36
|
+
with evidence_read_errors():
|
|
37
|
+
manifest = load_owned_object(manifest_path, artifact="run manifest")
|
|
38
|
+
if manifest.get("taskType") != "implementation" or not design_review_required(project, manifest):
|
|
39
|
+
return {}
|
|
40
|
+
run = load_run_verifiers(project, manifest_path)
|
|
41
|
+
execution = read_execution_manifest(manifest_path)
|
|
42
|
+
generation = max((verification_generation_number(row.dispatch_kind)
|
|
43
|
+
for row in execution.invocations
|
|
44
|
+
if row.duty_id in ("implementation-executor", "implementation-verifier")), default=1)
|
|
45
|
+
roster = [row["workerId"] for row in manifest.get("workerAssignments", [])
|
|
46
|
+
if row.get("role") == "verifier"]
|
|
47
|
+
if not roster or len(set(roster)) != len(roster):
|
|
48
|
+
raise ValueError("design review requires a distinct verifier roster")
|
|
49
|
+
reviews = {}
|
|
50
|
+
for worker in roster:
|
|
51
|
+
role = roster_verifier_role_execution_ref(manifest, worker)
|
|
52
|
+
current = bound_attempt(run, role, generation)
|
|
53
|
+
before = (generation, len(execution.invocations), 2**31)
|
|
54
|
+
if current is not None:
|
|
55
|
+
before = (generation, current[0].index, current[1])
|
|
56
|
+
history = _prior_reviews(project, manifest_path, manifest, execution, role, before)
|
|
57
|
+
current_attempt = None if current is None else next((row for row in execution.attempts
|
|
58
|
+
if (row.invocation_ref, row.attempt) == (current[0].invocation.invocation_ref, current[1])), None)
|
|
59
|
+
if current_attempt is None or current_attempt.status != "ok":
|
|
60
|
+
reviews[worker] = {"collection": "incomplete", "reason": "no current bound verifier attempt",
|
|
61
|
+
"generationNumber": generation, "verdict": "not-run", "history": history}
|
|
62
|
+
continue
|
|
63
|
+
record, body = _read_review(project, manifest_path, manifest, execution, *current)
|
|
64
|
+
record["history"] = history
|
|
65
|
+
record["carry"] = _read_carry(body, history)
|
|
66
|
+
if any(row["disposition"] == "open" for row in record["carry"]):
|
|
67
|
+
record["verdict"] = "FAIL"
|
|
68
|
+
reviews[worker] = record
|
|
69
|
+
return reviews
|
|
70
|
+
|
|
71
|
+
|
|
72
|
+
def _prior_reviews(
|
|
73
|
+
project: Path, manifest_path: Path, manifest: Mapping[str, Any], execution: ExecutionManifest,
|
|
74
|
+
role: str, before: tuple[int, int, int],
|
|
75
|
+
) -> list[dict[str, Any]]:
|
|
76
|
+
history = []
|
|
77
|
+
for index, invocation in enumerate(execution.invocations):
|
|
78
|
+
if invocation.role_execution_ref != role or invocation.duty_id != "implementation-verifier":
|
|
79
|
+
continue
|
|
80
|
+
number = verification_generation_number(invocation.dispatch_kind)
|
|
81
|
+
for attempt in execution.attempts:
|
|
82
|
+
if (attempt.invocation_ref != invocation.invocation_ref or attempt.status != "ok"
|
|
83
|
+
or (number, index, attempt.attempt) >= before):
|
|
84
|
+
continue
|
|
85
|
+
reference = reserved_generation_reference(project, manifest, invocation.invocation_ref, attempt.attempt)
|
|
86
|
+
if reference is None:
|
|
87
|
+
raise ValueError("earlier design-review attempt has no bound generation")
|
|
88
|
+
binding = BoundInvocation(invocation, number, index, None, reference.to_payload())
|
|
89
|
+
record, _ = _read_review(project, manifest_path, manifest, execution, binding, attempt.attempt)
|
|
90
|
+
history.append(record)
|
|
91
|
+
return history
|
|
92
|
+
|
|
93
|
+
|
|
94
|
+
def prior_design_review_prompt(
|
|
95
|
+
project: Path, manifest_path: Path, role: str, generation: int,
|
|
96
|
+
invocation_ref: str = "", attempt: int = 1,
|
|
97
|
+
) -> str:
|
|
98
|
+
run = load_run_verifiers(project, manifest_path)
|
|
99
|
+
execution = read_execution_manifest(manifest_path)
|
|
100
|
+
index = next((index for index, row in enumerate(execution.invocations)
|
|
101
|
+
if row.invocation_ref == invocation_ref), len(execution.invocations))
|
|
102
|
+
history = _prior_reviews(project, manifest_path, run.manifest,
|
|
103
|
+
execution, role, (generation, index, attempt))
|
|
104
|
+
if not history:
|
|
105
|
+
return ""
|
|
106
|
+
return ("\n## Prior Design Review Findings\n\n"
|
|
107
|
+
"The current census requires fresh inspection of the full stage diff. Earlier findings "
|
|
108
|
+
"are retained below; do not inherit their rule judgments. Return `## Design Carry` "
|
|
109
|
+
"with a JSON array containing {finding, disposition, basis} for each earlier blocking "
|
|
110
|
+
"finding, where finding is `<generationNumber>:<invocationRef>:<attempt>:<id>`, disposition is "
|
|
111
|
+
"open/fixed/accepted-risk/rejected, and basis cites the current code/test or an explicit "
|
|
112
|
+
"accepted-risk decision. Preserve that basis for every disposition.\n\n"
|
|
113
|
+
+ json.dumps(history, ensure_ascii=False, indent=2) + "\n")
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
def _read_review(
|
|
117
|
+
project: Path, manifest_path: Path, manifest: Mapping[str, Any], execution: ExecutionManifest,
|
|
118
|
+
binding: BoundInvocation, attempt: int,
|
|
119
|
+
) -> tuple[dict[str, Any], str]:
|
|
120
|
+
invocation = binding.invocation
|
|
121
|
+
metadata_path = reserved_invocation_metadata_path(project, manifest, invocation.invocation_ref, attempt)
|
|
122
|
+
if metadata_path is None:
|
|
123
|
+
raise ValueError("design review has no reserved invocation metadata")
|
|
124
|
+
errors = verify_agent_invocation(
|
|
125
|
+
metadata_path, project_root=project, expected_run_manifest_path=manifest_path,
|
|
126
|
+
expected_audience="implementation-verifier", expected_invocation_ref=invocation.invocation_ref,
|
|
127
|
+
expected_role_execution_ref=invocation.role_execution_ref,
|
|
128
|
+
expected_participant_ref=invocation.participant_ref,
|
|
129
|
+
)
|
|
130
|
+
if errors:
|
|
131
|
+
raise ValueError("design review invocation: " + "; ".join(errors))
|
|
132
|
+
generation = read_invocation_generation(project, manifest_path, manifest,
|
|
133
|
+
VerificationGenerationReference.from_payload(binding.generation_ref),
|
|
134
|
+
"implementation-verifier")
|
|
135
|
+
if generation is None or "designReview" not in generation:
|
|
136
|
+
raise ValueError("design review has no sealed census")
|
|
137
|
+
from .paths import RunRef
|
|
138
|
+
|
|
139
|
+
expected_path = RunRef.from_manifest(manifest_path, manifest).verification_generation(binding.generation_number)
|
|
140
|
+
if (generation["generation"] != binding.generation_number
|
|
141
|
+
or binding.generation_ref["path"] != expected_path.relative_to(project).as_posix()):
|
|
142
|
+
raise ValueError("design review generation differs from its dispatch")
|
|
143
|
+
result_path, raw = _read_attempt_result(project, execution, invocation.invocation_ref, attempt)
|
|
144
|
+
body = raw.decode("utf-8")
|
|
145
|
+
source = Path(generation["sourceRoot"])
|
|
146
|
+
review = parse_design_review(source if source.is_dir() else project, generation["designReview"], body)
|
|
147
|
+
verdicts = re.findall(r"^Verifier verdict: (PASS|CONCERNS|FAIL)$", body, re.M)
|
|
148
|
+
if len(verdicts) != 1:
|
|
149
|
+
raise ValueError("design review requires one explicit Verifier verdict line")
|
|
150
|
+
return {"collection": "complete", "generationNumber": generation["generation"],
|
|
151
|
+
"generation": dict(binding.generation_ref), "head": generation["head"],
|
|
152
|
+
"base": generation["designReview"]["base"],
|
|
153
|
+
"policyDigest": generation["designReview"]["policyDigest"],
|
|
154
|
+
"censusDigest": canonical_json_digest(generation["designReview"]),
|
|
155
|
+
"invocationRef": invocation.invocation_ref, "attempt": attempt,
|
|
156
|
+
"resultPath": result_path.relative_to(project).as_posix(), "resultDigest": content_digest(raw),
|
|
157
|
+
"expectedCells": len(review.coverage.verdicts) + len(review.coverage.missing),
|
|
158
|
+
"coveredCells": len(review.coverage.verdicts), "missing": dict(review.coverage.missing),
|
|
159
|
+
"unknown": list(review.coverage.unknown), "findings": list(review.findings),
|
|
160
|
+
"blockingFindings": list(review.blocking_findings),
|
|
161
|
+
"verdict": "FAIL" if review.blocking else verdicts[0],
|
|
162
|
+
"scope": "full stage diff; no prior rule judgments inherited"}, body
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
def _read_attempt_result(
|
|
166
|
+
project: Path, execution: ExecutionManifest, invocation_ref: str, attempt: int,
|
|
167
|
+
) -> tuple[Path, bytes]:
|
|
168
|
+
row = next((row for row in execution.attempts if (row.invocation_ref, row.attempt)
|
|
169
|
+
== (invocation_ref, attempt)), None)
|
|
170
|
+
if row is None or row.status != "ok" or row.finished_at is None or not row.result_path:
|
|
171
|
+
raise ValueError("design review requires the current completed ok attempt")
|
|
172
|
+
attempt_ref = build_dispatch_id(invocation_ref, attempt)
|
|
173
|
+
seals = [seal for seal in execution.attempt_evidence_seals
|
|
174
|
+
if seal.get("sealRef") == row.evidence_seal_ref and seal.get("attemptRef") == attempt_ref]
|
|
175
|
+
if len(seals) != 1:
|
|
176
|
+
raise ValueError("design review result requires its attempt evidence seal")
|
|
177
|
+
path = Path(row.result_path)
|
|
178
|
+
relative = path.relative_to(project).as_posix() if path.is_absolute() else path.as_posix()
|
|
179
|
+
if not relative.startswith(".okstra/"):
|
|
180
|
+
raise ValueError("design review result must remain in project artifacts")
|
|
181
|
+
path = safe_qa_path(project, relative)
|
|
182
|
+
return path, read_sealed_artifact(AttemptEvidenceSeal.from_payload(seals[0]), path)
|
|
183
|
+
|
|
184
|
+
|
|
185
|
+
def _read_carry(body: str, history: list[dict[str, Any]]) -> list[dict[str, str]]:
|
|
186
|
+
pending = {f"{record['generationNumber']}:{record['invocationRef']}:{record['attempt']}:{identity}"
|
|
187
|
+
for record in history for identity in record.get("blockingFindings", [])}
|
|
188
|
+
if not pending:
|
|
189
|
+
return []
|
|
190
|
+
matches = re.findall(r"^## Design Carry\s*\n```json\s*\n(.*?)\n```", body, re.M | re.S)
|
|
191
|
+
if len(matches) != 1:
|
|
192
|
+
raise ValueError("design review must disposition every earlier blocking finding in Design Carry")
|
|
193
|
+
rows = json.loads(matches[0])
|
|
194
|
+
if not isinstance(rows, list):
|
|
195
|
+
raise ValueError("Design Carry must be an array")
|
|
196
|
+
seen: set[str] = set()
|
|
197
|
+
for row in rows:
|
|
198
|
+
if (not isinstance(row, dict) or set(row) != {"finding", "disposition", "basis"}
|
|
199
|
+
or any(not isinstance(value, str) or not value.strip() for value in row.values())
|
|
200
|
+
or row["finding"] in seen or row["finding"] not in pending
|
|
201
|
+
or row["disposition"] not in ("open", "fixed", "accepted-risk", "rejected")
|
|
202
|
+
or re.search(r"(?:base:)?[A-Za-z0-9_./-]+:[0-9]+", row["basis"]) is None):
|
|
203
|
+
raise ValueError("invalid or duplicate Design Carry disposition")
|
|
204
|
+
seen.add(row["finding"])
|
|
205
|
+
if seen != pending:
|
|
206
|
+
raise ValueError("Design Carry omits earlier blocking findings")
|
|
207
|
+
return rows
|
|
208
|
+
|
|
209
|
+
|
|
210
|
+
def attach_design_reviews(data: dict[str, Any], reviews: Mapping[str, dict[str, Any]]) -> None:
|
|
211
|
+
if not reviews:
|
|
212
|
+
return
|
|
213
|
+
implementation = data.setdefault("implementation", {})
|
|
214
|
+
existing = {row["verifier"]: row for row in implementation.get("verifierResults", [])}
|
|
215
|
+
if existing.keys() - reviews.keys():
|
|
216
|
+
raise ValueError("report verifier is outside the design-review roster")
|
|
217
|
+
rows = []
|
|
218
|
+
for worker, review in reviews.items():
|
|
219
|
+
row = dict(existing.get(worker, {"verifier": worker, "readOnlyCommandLog": "",
|
|
220
|
+
"independentValidationRerun": ""}))
|
|
221
|
+
row.update(verdict=review["verdict"], designReview=review)
|
|
222
|
+
rows.append(row)
|
|
223
|
+
implementation["verifierResults"] = rows
|
|
224
|
+
require_design_acceptance(data, reviews)
|
|
225
|
+
|
|
226
|
+
|
|
227
|
+
def require_design_acceptance(data: Mapping[str, Any], reviews: Mapping[str, Mapping[str, Any]]) -> None:
|
|
228
|
+
token = (data.get("finalVerdict") or {}).get("verdictToken")
|
|
229
|
+
if token not in ("accepted", "conditional-accept"):
|
|
230
|
+
return
|
|
231
|
+
blocked = [worker for worker, row in reviews.items()
|
|
232
|
+
if row["collection"] != "complete" or row["verdict"] in ("FAIL", "not-run")]
|
|
233
|
+
if blocked:
|
|
234
|
+
raise ValueError("design review prevents acceptance: " + ", ".join(blocked))
|
|
235
|
+
|
|
236
|
+
|
|
237
|
+
def validate_design_review_report(
|
|
238
|
+
data: Mapping[str, Any], project: Path, manifest_path: Path, *, head: str = "", base: str = "",
|
|
239
|
+
) -> None:
|
|
240
|
+
reviews = collect_design_reviews(project, manifest_path)
|
|
241
|
+
if not reviews:
|
|
242
|
+
return
|
|
243
|
+
rows = (data.get("implementation") or {}).get("verifierResults", [])
|
|
244
|
+
reported = {row.get("verifier"): row for row in rows}
|
|
245
|
+
if set(reported) != set(reviews) or len(rows) != len(reviews):
|
|
246
|
+
raise ValueError("report omits or duplicates a design-review verifier")
|
|
247
|
+
for worker, expected in reviews.items():
|
|
248
|
+
if reported[worker].get("designReview") != expected or reported[worker].get("verdict") != expected["verdict"]:
|
|
249
|
+
raise ValueError("report design review differs from sealed verifier result: " + worker)
|
|
250
|
+
if head and expected.get("head") != head:
|
|
251
|
+
raise ValueError("stage head differs from design-review head")
|
|
252
|
+
if base and expected.get("base") != base:
|
|
253
|
+
raise ValueError("stage base differs from design-review base")
|
|
254
|
+
require_design_acceptance(data, reviews)
|
|
255
|
+
|
|
256
|
+
|
|
257
|
+
def validate_stage_design_report(
|
|
258
|
+
project: Path, report: Path, stage: int, *, head: str = "", base: str = "", task_key: str = "",
|
|
259
|
+
) -> None:
|
|
260
|
+
from .final_report_paths import final_report_data_path
|
|
261
|
+
from .paths import RunRef
|
|
262
|
+
|
|
263
|
+
report = final_report_data_path(report)
|
|
264
|
+
report = safe_qa_path(project, report.absolute().relative_to(project).as_posix())
|
|
265
|
+
manifest_path = RunRef.from_report_path(report).manifest
|
|
266
|
+
manifest = load_owned_object(manifest_path, artifact="implementation run manifest")
|
|
267
|
+
if not design_review_required(project, manifest):
|
|
268
|
+
return
|
|
269
|
+
from .stage_close import _latest_stage_run_manifest
|
|
270
|
+
|
|
271
|
+
if (manifest.get("taskType") != "implementation" or str(manifest.get("stage")) != str(stage)
|
|
272
|
+
or (task_key and manifest.get("taskKey") != task_key)):
|
|
273
|
+
raise ValueError("design-review report belongs to a different task or stage")
|
|
274
|
+
latest = _latest_stage_run_manifest(RunRef.from_report_path(report).task_root, stage)
|
|
275
|
+
if latest != manifest_path:
|
|
276
|
+
raise ValueError("design-review report is not the latest implementation run for this stage")
|
|
277
|
+
data = load_owned_object(report, artifact="implementation report")
|
|
278
|
+
if (data.get("finalVerdict") or {}).get("verdictToken") not in ("accepted", "conditional-accept"):
|
|
279
|
+
raise ValueError("design review has no accepted implementation report")
|
|
280
|
+
validate_design_review_report(data, project, manifest_path, head=head, base=base)
|
|
281
|
+
|
|
282
|
+
|
|
283
|
+
def validate_design_completion(plan_run_root: Path, task_key: str, stage: int, head: str) -> None:
|
|
284
|
+
from .paths import RunRef
|
|
285
|
+
from .stage_close import _latest_stage_run_manifest
|
|
286
|
+
|
|
287
|
+
plan = RunRef.from_run_dir(plan_run_root)
|
|
288
|
+
latest = _latest_stage_run_manifest(plan.task_root, stage)
|
|
289
|
+
if latest is None or plan.project_root is None:
|
|
290
|
+
return
|
|
291
|
+
manifest = load_owned_object(latest, artifact="implementation run manifest")
|
|
292
|
+
if not design_review_required(plan.project_root, manifest):
|
|
293
|
+
return
|
|
294
|
+
if not head:
|
|
295
|
+
raise ValueError("design-review completion requires the stage head")
|
|
296
|
+
report = RunRef.from_manifest(latest, manifest).report
|
|
297
|
+
validate_stage_design_report(plan.project_root, report, stage, head=head, task_key=task_key)
|
|
@@ -9,7 +9,6 @@ from pathlib import Path
|
|
|
9
9
|
from typing import Iterable
|
|
10
10
|
|
|
11
11
|
from okstra_project import ResolverError, project_json_path, resolve_project_root
|
|
12
|
-
from okstra_project.resolver import resolve_review_rule_packs
|
|
13
12
|
|
|
14
13
|
from . import worktree_registry
|
|
15
14
|
from .phases.improvement_discovery import lenses as improvement_lenses
|
|
@@ -18,6 +17,7 @@ from .phases.catalog import PhaseAssetError, UnknownTaskType, profile_markdown
|
|
|
18
17
|
from .role_requirements import RoleProfileError, load_role_profile
|
|
19
18
|
from .worktree import is_git_work_tree, main_worktree_path
|
|
20
19
|
from .json_boundary import JsonBoundaryError, load_owned_object
|
|
20
|
+
from .review_policy import capture_review_policy
|
|
21
21
|
|
|
22
22
|
SUPPORTED_PHASES: tuple[str, ...] = (
|
|
23
23
|
"implementation",
|
|
@@ -182,30 +182,13 @@ def _architecture_declaration_check(project_root: Path) -> DoctorCheck | None:
|
|
|
182
182
|
|
|
183
183
|
|
|
184
184
|
def _review_rule_pack_check(project_root: Path) -> DoctorCheck | None:
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
valid, channel.
|
|
193
|
-
|
|
194
|
-
What this cannot check is whether a pack that does resolve was actually read
|
|
195
|
-
and applied; that stays the worker's own `project-review-rules:` record.
|
|
196
|
-
"""
|
|
197
|
-
declared = resolve_review_rule_packs(project_root)
|
|
198
|
-
if not declared:
|
|
199
|
-
return None
|
|
200
|
-
missing = [path for path in declared if not Path(path).is_file()]
|
|
201
|
-
if not missing:
|
|
202
|
-
return _ok("review rule packs", f"{len(declared)} declared, all readable")
|
|
203
|
-
return _fail(
|
|
204
|
-
"review rule packs",
|
|
205
|
-
f"declared but not readable: {', '.join(missing)} — phases skip a pack "
|
|
206
|
-
"they cannot open, so the run reviews against fewer rules than declared. "
|
|
207
|
-
f"Fix the path in {project_json_path(project_root)} or drop the entry.",
|
|
208
|
-
)
|
|
185
|
+
try:
|
|
186
|
+
config = load_owned_object(project_json_path(project_root), artifact="project config")
|
|
187
|
+
policy = capture_review_policy(project_root, config)
|
|
188
|
+
except (OSError, ValueError) as exc:
|
|
189
|
+
return _fail("review policy", str(exc))
|
|
190
|
+
return _ok("review policy", f"architecture: {policy['architecture']}; "
|
|
191
|
+
f"{len(policy['sources'])} readable rule sources")
|
|
209
192
|
|
|
210
193
|
|
|
211
194
|
def _profile_check(workspace: Path, phase: str) -> DoctorCheck:
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
3
|
+
import argparse
|
|
4
|
+
import json
|
|
5
|
+
from pathlib import Path
|
|
6
|
+
from typing import get_args
|
|
7
|
+
|
|
8
|
+
from ..fixed_text import line, value_lines
|
|
9
|
+
from ..json_boundary import JsonBoundaryError, external_user_json_source, load_external_json
|
|
10
|
+
from .config import load_config, save_config
|
|
11
|
+
from .contracts import DoyouknowError, MAX_INPUT_BYTES, read_envelope
|
|
12
|
+
from .registration import register_ticket, retry_pending
|
|
13
|
+
from .source_contracts import SourceKind
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
def _parser() -> argparse.ArgumentParser:
|
|
17
|
+
parser = argparse.ArgumentParser(prog="okstra doyouknow", description="Store linked work records without starting a run.")
|
|
18
|
+
commands = parser.add_subparsers(dest="command", required=True)
|
|
19
|
+
for name in ("capture", "ingest", "show", "sync", "list", "config", "register", "retry"):
|
|
20
|
+
command = commands.add_parser(name)
|
|
21
|
+
if name == "show":
|
|
22
|
+
command.add_argument("record_id")
|
|
23
|
+
elif name in ("capture", "ingest"):
|
|
24
|
+
command.add_argument("--file", required=True, type=Path, help="normalized doyouknow input JSON")
|
|
25
|
+
elif name == "config":
|
|
26
|
+
command.add_argument("--file", type=Path, help="replace source settings from JSON")
|
|
27
|
+
elif name == "register":
|
|
28
|
+
command.add_argument("--ticket", required=True, help="pending registration UUID")
|
|
29
|
+
if name in ("sync", "list", "retry"):
|
|
30
|
+
command.add_argument("--source", choices=get_args(SourceKind))
|
|
31
|
+
if name == "retry":
|
|
32
|
+
command.add_argument("--limit", type=int, default=100)
|
|
33
|
+
if name == "list":
|
|
34
|
+
command.add_argument("--scope")
|
|
35
|
+
command.add_argument("--limit", type=int, default=100)
|
|
36
|
+
command.add_argument("--after", help="source ID returned as nextCursor")
|
|
37
|
+
output = command.add_mutually_exclusive_group()
|
|
38
|
+
output.add_argument("--json", action="store_true", help="emit JSON (default)")
|
|
39
|
+
output.add_argument("--text", action="store_true", help="emit fixed text fields")
|
|
40
|
+
return parser
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
def _emit(payload: dict, *, text: bool) -> None:
|
|
44
|
+
if not text:
|
|
45
|
+
print(json.dumps(payload, ensure_ascii=False, allow_nan=False))
|
|
46
|
+
return
|
|
47
|
+
rows = ["Okstra doyouknow\n", line("OK", payload["ok"])]
|
|
48
|
+
rows.extend(value_lines("Result", payload))
|
|
49
|
+
print("".join(rows), end="")
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def main(argv: list[str] | None = None) -> int:
|
|
53
|
+
args = _parser().parse_args(argv)
|
|
54
|
+
try:
|
|
55
|
+
if args.command == "show":
|
|
56
|
+
from .store import show_record
|
|
57
|
+
|
|
58
|
+
result = show_record(args.record_id)
|
|
59
|
+
elif args.command == "sync":
|
|
60
|
+
from .sync import sync_sources
|
|
61
|
+
|
|
62
|
+
result = sync_sources(source=args.source)
|
|
63
|
+
elif args.command == "register":
|
|
64
|
+
result = register_ticket(args.ticket)
|
|
65
|
+
elif args.command == "retry":
|
|
66
|
+
result = retry_pending(source=args.source, limit=args.limit)
|
|
67
|
+
elif args.command == "list":
|
|
68
|
+
from .source_store import list_sources
|
|
69
|
+
|
|
70
|
+
result = list_sources(scope=args.scope, kind=args.source, limit=args.limit, after=args.after)
|
|
71
|
+
elif args.command == "config":
|
|
72
|
+
settings = load_external_json(external_user_json_source(args.file), artifact="source settings", max_bytes=MAX_INPUT_BYTES) if args.file else None
|
|
73
|
+
result = {"ok": True, "config": save_config(settings) if args.file else load_config()}
|
|
74
|
+
else:
|
|
75
|
+
from .store import capture_record, ingest_source
|
|
76
|
+
|
|
77
|
+
envelope = read_envelope(args.file)
|
|
78
|
+
write = capture_record if args.command == "capture" else ingest_source
|
|
79
|
+
result = write(envelope)
|
|
80
|
+
except ImportError:
|
|
81
|
+
_emit({"ok": False, "reason": "doyouknow storage dependency is unavailable"}, text=args.text)
|
|
82
|
+
return 1
|
|
83
|
+
except (DoyouknowError, JsonBoundaryError, OSError) as exc:
|
|
84
|
+
_emit({"ok": False, "reason": str(exc)}, text=args.text)
|
|
85
|
+
return 1
|
|
86
|
+
_emit(result, text=args.text)
|
|
87
|
+
return 0 if result["ok"] else 1
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
if __name__ == "__main__":
|
|
91
|
+
raise SystemExit(main())
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
3
|
+
from pathlib import Path
|
|
4
|
+
from typing import TypedDict
|
|
5
|
+
|
|
6
|
+
from ..json_boundary import load_owned_object, serialize_owned_object, write_owned_object_atomic
|
|
7
|
+
from ..run_context import dir_flock
|
|
8
|
+
from .contracts import MAX_INPUT_BYTES, asset_object
|
|
9
|
+
from .source_contracts import validate_source_value
|
|
10
|
+
from .paths import database_path, ensure_storage_root, require_database_location as _require_database_location
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
class SourceConfig(TypedDict):
|
|
14
|
+
schemaVersion: int
|
|
15
|
+
autoRegister: bool
|
|
16
|
+
scope: str | None
|
|
17
|
+
sources: list[str]
|
|
18
|
+
includeProjects: list[str]
|
|
19
|
+
excludeProjects: list[str]
|
|
20
|
+
includeGroups: list[str]
|
|
21
|
+
excludeGroups: list[str]
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
def load_config(*, home: Path | None = None) -> SourceConfig:
|
|
25
|
+
path = database_path(home).parent / "config.json"
|
|
26
|
+
_require_database_location(path)
|
|
27
|
+
if not path.exists():
|
|
28
|
+
return {"schemaVersion": 1, "autoRegister": True, "scope": None,
|
|
29
|
+
"sources": ["memory", "manager", "task"], "includeProjects": [],
|
|
30
|
+
"excludeProjects": [], "includeGroups": [], "excludeGroups": []}
|
|
31
|
+
payload = load_owned_object(path, artifact="doyouknow config", max_bytes=MAX_INPUT_BYTES)
|
|
32
|
+
validate_source_value(payload)
|
|
33
|
+
serialize_owned_object(path, payload, artifact="doyouknow config", schema=asset_object("doyouknow-config-v1.schema.json"))
|
|
34
|
+
return payload
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
def save_config(payload: SourceConfig, *, home: Path | None = None) -> SourceConfig:
|
|
38
|
+
validate_source_value(payload)
|
|
39
|
+
path = database_path(home).parent / "config.json"
|
|
40
|
+
_require_database_location(path)
|
|
41
|
+
schema = asset_object("doyouknow-config-v1.schema.json")
|
|
42
|
+
serialize_owned_object(path, payload, artifact="doyouknow config", schema=schema)
|
|
43
|
+
ensure_storage_root(path.parent)
|
|
44
|
+
with dir_flock(path.parent, ".config.lock"):
|
|
45
|
+
write_owned_object_atomic(path, payload, artifact="doyouknow config", schema=schema)
|
|
46
|
+
return payload
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
def includes_project(settings: SourceConfig, project_id: str) -> bool:
|
|
50
|
+
return _included(project_id, settings["includeProjects"], settings["excludeProjects"])
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
def includes_group(settings: SourceConfig, group: str) -> bool:
|
|
54
|
+
return _included(group, settings["includeGroups"], settings["excludeGroups"])
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
def _included(value: str, included: list[str], excluded: list[str]) -> bool:
|
|
58
|
+
return value not in excluded and (not included or value in included)
|