Skip to content

Commit 41be152

Browse files
SmithSmith
authored andcommitted
Enhance ControlFlow Orchestration and Planning Skills
- Updated SKILL.md in controlflow-orchestration to refine execution guidelines, including the introduction of Pre-Wave Cache Guard and improved phase serialization. - Added new references for decision challenges and source grounding to support high-risk decision-making and external claims validation. - Enhanced failure taxonomy with a diagnosis packet for retries and introduced transient wave throttling for improved error handling. - Revised phase checklist to include inspections for shared components and recent task artifacts. - Updated runtime policy to include new parameters for transient reduction and batch approval. - Improved planning skills with requirements for revision lineage and verified item checks. - Added negative test fixtures to validate strict plan lifecycle and tier review requirements. - Introduced core portability matrix to document selective core-to-plugin portability contracts.
1 parent 9fa6e57 commit 41be152

59 files changed

Lines changed: 1359 additions & 68 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

NOTES.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
Repo-persistent active-objective state only. See `docs/agent-engineering/MEMORY-ARCHITECTURE.md` for the three-layer memory model; task-episodic history lives under `plans/artifacts/<task-slug>/`.
44

5-
- Active objective: Auto-default + selective pinning complete (4 pinned agents); full eval gate (`cd evals && npm test`) green.
6-
- Blockers: none.
7-
- Pending: optional follow-up to investigate pre-existing capability-matrix live-tree drift flags surfaced by the smoke test.
5+
- Active objective: Codex plugin selective-parity audit complete; LARGE implementation plan ready for PLAN_REVIEW.
6+
- Blockers: Full eval baseline fails at the pre-existing Pass 10 cross-plan overlap gate.
7+
- Pending: Resolve the overlap baseline through its owning plan before final plugin-parity verification.

Planner.agent.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ For all other scopes, record applicability, impact, evidence source, and disposi
4949
2. Match task keywords and domain signals against the index.
5050
3. Select ≤3 most relevant skill files based on task context and complexity tier.
5151
- For spec-bearing phases, consider `skills/patterns/spec-driven-development.md` when requirements, scope boundaries, acceptance criteria, or spec-before-plan discipline are central to safe planning.
52+
- For phases depending on external framework/API/version claims or sibling-source adoption, consider `skills/patterns/source-grounding.md`.
53+
- For high-risk or non-trivial decisions with materially different alternatives, consider one bounded `skills/patterns/decision-challenge.md`.
5254
4. Include selected skill file paths in each applicable phase's `skill_references` array.
5355
Implementation agents load referenced skills before executing phase tasks.
5456
6. Research (delegate CodeMapper-subagent/Researcher-subagent when scope is large).
@@ -115,6 +117,8 @@ Agent-specific additions:
115117
- `plans/project-context.md` (if present)
116118
- `skills/index.md` (domain skill mapping — read during Step 5)
117119
- `skills/patterns/llm-behavior-guidelines.md` (load on non-trivial tasks — anti-pattern guardrails: scope drift, over-abstraction, silent assumptions, weak success criteria)
120+
- `skills/patterns/source-grounding.md` (consider for external claims, provenance, and explicit `UNVERIFIED` state)
121+
- `skills/patterns/decision-challenge.md` (consider once for high-risk or non-trivial decisions)
118122
- Plan artifacts directory: `plans/` (default location for all plan and completion files)
119123

120124
## Tools

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ See [`evals/README.md`](evals/README.md) for pass descriptions and how to add sc
265265
│ ├── tutorial-en/ # Full English-language tutorial (19 chapters)
266266
│ └── tutorial-ru/ # Full Russian-language tutorial (19 chapters)
267267
├── governance/ # Operational knobs and tool grants
268-
├── skills/ # Reusable domain pattern library (18 patterns)
268+
├── skills/ # Reusable domain pattern library (20 patterns)
269269
├── evals/ # Offline validation suite
270270
│ └── scenarios/ # Eval scenario fixtures
271271
├── plans/ # Plan artifacts and templates
@@ -324,6 +324,8 @@ A portable adaptation of ControlFlow for [OpenAI Codex CLI](https://github.com/o
324324

325325
The plugin brings the core ControlFlow disciplines — phased planning, pre-execution plan review, assumption verification, orchestration, evidence-backed code review, and memory hygiene — into Codex without depending on VS Code-specific tool contracts, fixed agent rosters, or `@Agent` syntax.
326326

327+
Version `0.6.0` adds machine-checked selective parity through `plugins/controlflow-shared-source/core-portability-matrix.json`: portable workflow invariants are adopted or adapted, while model routing, tool grants, the fixed roster, session telemetry, compaction, budgets, and `model_unavailable` remain explicit divergences.
328+
327329
### Included Skills
328330

329331
| Skill | Analogous ControlFlow Role |
@@ -449,11 +451,10 @@ See [`plugins/controlflow-codex/USAGE.md`](plugins/controlflow-codex/USAGE.md) f
449451
powershell -ExecutionPolicy Bypass -File plugins/controlflow-codex/scripts/validate-strict-artifacts.ps1 `
450452
-RepoRoot . `
451453
-PlanPath plans/my-task-plan.md `
452-
-RequirePlanAudit `
453-
-RequireAssumptionVerifier
454+
-StrictReviewByTier
454455
```
455456

456-
The `validate-strict-artifacts.ps1` script validates **Codex strict-plan artifacts only**. Do not use it for core VS Code plans. It enforces the mandatory lifecycle sections (`## Progress`, `## Discoveries`, `## Decision Log`, `## Outcomes`, `## Idempotence & Recovery`).
457+
The `validate-strict-artifacts.ps1` script validates **Codex strict-plan artifacts only**. Do not use it for core VS Code plans. It enforces the mandatory lifecycle sections (`## Progress`, `## Discoveries`, `## Decision Log`, `## Outcomes`, `## Idempotence & Recovery`) in exact order. `-StrictReviewByTier` derives required review artifacts from tier and applicable unresolved `HIGH` risk; the existing `-Require*` switches remain additive compatibility controls.
457458

458459
### Intentional Differences from the VS Code Version
459460

Researcher-subagent.agent.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ If `context_packet` is present in your dispatch, read the referenced `artifact_p
3131
- Every claim requires evidence (`file`, `line_start`, optional `line_end`).
3232
- If evidence is insufficient, output `ABSTAIN`.
3333
- Separate observed facts from hypotheses explicitly; tolerate naming/format variance without speculative inference.
34+
- For external framework/API/version claims, follow `skills/patterns/source-grounding.md`: prefer current official primary sources and label material unsupported claims `UNVERIFIED`.
3435

3536
## Archive
3637

@@ -55,6 +56,7 @@ See [skills/patterns/preflect-core.md](skills/patterns/preflect-core.md) for the
5556
- `schemas/code-mapper.discovery.schema.json`
5657
- `docs/agent-engineering/PROMPT-BEHAVIOR-CONTRACT.md`
5758
- `plans/project-context.md` (if present)
59+
- `skills/patterns/source-grounding.md`
5860

5961
## Tools
6062

docs/tutorial-en/00-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The repository delivers:
2727
| Agent prompt files (`*.agent.md`) | 13 | Define role, scope, contracts, and tools for each agent |
2828
| JSON schemas (`schemas/*.json`) | 17 | Formal contracts for inter-agent communication |
2929
| Governance configs (`governance/*.json`) | 7 | Tool permissions, retry budgets, tier routing, model mapping |
30-
| Skill patterns (`skills/patterns/*.md`) | 18 | Reusable domain expertise loaded just-in-time |
30+
| Skill patterns (`skills/patterns/*.md`) | 20 | Reusable domain expertise loaded just-in-time |
3131
| Eval harness (`evals/`) | ~410 checks | Offline validation of schema compliance and behavioral invariants |
3232
| Documentation (`docs/`) || Engineering policies, tutorials, architecture docs |
3333

docs/tutorial-en/11-skills.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ sequenceDiagram
7575
E->>E: apply patterns
7676
```
7777

78-
**Why just in time?** Skills add context to the agent's prompt. Loading all 18 skills upfront wastes tokens and creates noise. Only load what is needed for the current phase.
78+
**Why just in time?** Skills add context to the agent's prompt. Loading all 20 skills upfront wastes tokens and creates noise. Only load what is needed for the current phase.
7979

8080
## Key Skills Deep Dive
8181

docs/tutorial-en/17-glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Alphabetical reference for all key terms. Each entry includes a definition and c
5454

5555
**Confidence** — A numeric value (0–1) in Planner output and gate events reflecting how certain the agent is in its assessment. → Ch.06
5656

57-
**ControlFlow** — A prompt/governance/eval repository for an agent orchestration system. 13 agents, 17 schemas, 7 governance files, 18 skills. → Ch.00
57+
**ControlFlow** — A prompt/governance/eval repository for an agent orchestration system. 13 agents, 17 schemas, 7 governance files, 20 skills. → Ch.00
5858

5959
**Convergence detection** — See stagnation. → Ch.07
6060

docs/tutorial-ru/01-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ControlFlow/
2020
│ └── project-context-registry.json
2121
├── skills/
2222
│ ├── index.md # каталог skill-паттернов
23-
│ └── patterns/ # 18 паттернов
23+
│ └── patterns/ # 20 паттернов
2424
├── evals/ # оффлайн-проверки
2525
│ ├── package.json # npm test → канонический gate
2626
│ ├── validate.mjs # структурный проход

docs/tutorial-ru/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
| 08 | [Пайплайн исполнения](08-execution-pipeline.md) | Волны параллельного исполнения, executor_agent, quality gates, completion gate, optional final review | 8 |
3434
| 09 | [Схемы (контракты)](09-schemas.md) | Разбор всех 17 JSON-схем: какая для какого агента, ключевые поля | 10 |
3535
| 10 | [Governance](10-governance.md) | agent-grants, tool-grants, runtime-policy, model-routing, rename-allowlist | 8 |
36-
| 11 | [Skills (паттерны)](11-skills.md) | Skill library, протокол выбора (≤3 на фазу), 18 паттернов | 7 |
36+
| 11 | [Skills (паттерны)](11-skills.md) | Skill library, протокол выбора (≤3 на фазу), 20 паттернов | 7 |
3737
| 12 | [Архитектура памяти](12-memory.md) | Трёхслойная модель: session / task-episodic / repo-persistent; роль NOTES.md | 6 |
3838
| 13 | [Таксономия сбоев](13-failure-taxonomy.md) | 4 класса: transient / fixable / needs_replan / escalate; retry-политики | 6 |
3939
| 14 | [Eval-харнесс](14-evals.md) | Устройство `cd evals && npm test`, режимы full/structural/behavior | 6 |

evals/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ npm test
179179
| **12 — Governance Policy Assertions** | Runtime policy invariants for tool-output spill, session telemetry, model-routing hints, compaction, memory promotion order, and CodeReviewer security mode. |
180180
| **13 — Final Review Coupling** | `review_scope=final` coupling between CodeReviewer prompt behavior and schema fields, including injected context expectations. |
181181
| **14 — Canonical Source Matrix** | Ensures `plans/project-context.md` keeps the Canonical Source Matrix heading. |
182+
| **15 — Tool Labels / Pattern Budget / Doc Counts / Generation Parity** | Runs the existing live-tree drift checks for registry tool-count labels, skill-pattern line budgets, allowlisted documentation totals, and no-delta Codex generation parity. |
183+
| **16 — Selective Plugin-Core Portability** | Validates `core-portability-matrix.json`: unique invariant IDs, allowed dispositions, evidence paths, and declared semantic anchors without requiring byte parity with core prose. |
182184

183185
### Separate harnesses in `npm test`
184186

0 commit comments

Comments
 (0)