@tacuchi/agent-workflow-cli 21.8.0 → 21.10.0

package/skills/w/context/MANIFEST.json

@@ -57,109 +57,149 @@
     "quick.db-touched": "the task read from or wrote to a database, so there is a statement to derive into the session script"
   },
   "commands": {
-    "quick": {
-      "core": [
-        "commands/quick.md",
-        "loops/quick-loop/LOOP.md",
-        "loops/CHASSIS.md",
-        "loops/CODE-POLICIES.md"
-      ],
+    "discard": {
+      "core": ["commands/discard.md"],
+      "modules": []
+    },
+    "export-diagrams": {
+      "core": ["commands/export-diagrams.md"],
       "modules": [
         {
           "path": "modules/PLAN-MODE.md",
           "signal": "plan-mode"
         },
         {
-          "path": "modules/ADOPTED-CONTEXT.md",
-          "signal": "adopted"
-        },
-        {
-          "path": "modules/PROBE.md",
-          "signal": "probe"
-        },
+          "path": "exports/export-diagrams/EXPORT.md",
+          "signal": "authoring"
+        }
+      ]
+    },
+    "export-manuals": {
+      "core": ["commands/export-manuals.md"],
+      "modules": [
         {
-          "path": "modules/DB-RESEARCH-RULE.md",
-          "signal": "db",
-          "requires": "external-data"
+          "path": "modules/PLAN-MODE.md",
+          "signal": "plan-mode"
         },
         {
-          "path": "modules/DB-SCRIPTS-ONLY.md",
-          "signal": "db",
-          "requires": "external-data"
-        },
+          "path": "exports/export-manuals/EXPORT.md",
+          "signal": "authoring"
+        }
+      ]
+    },
+    "export-reports": {
+      "core": ["commands/export-reports.md"],
+      "modules": [
         {
-          "path": "modules/DESIGN-REFERENCES.md",
-          "signal": "ui"
+          "path": "modules/PLAN-MODE.md",
+          "signal": "plan-mode"
         },
         {
-          "path": "modules/COMPACTION.md",
-          "signal": "compaction",
-          "requires": "compaction"
-        },
+          "path": "exports/export-reports/EXPORT.md",
+          "signal": "authoring"
+        }
+      ]
+    },
+    "export-scripts": {
+      "core": ["commands/export-scripts.md"],
+      "modules": [
         {
-          "path": "modules/SESSION-NUMBERING.md",
-          "signal": "sessions"
+          "path": "modules/PLAN-MODE.md",
+          "signal": "plan-mode"
         },
         {
-          "path": "modules/PROMPT-CONTINUITY.md",
-          "signal": "resume"
+          "path": "exports/export-scripts/EXPORT.md",
+          "signal": "authoring"
         }
       ]
     },
-    "spec-new": {
-      "core": ["commands/spec-new.md"],
+    "fix-git": {
+      "core": ["commands/fix-git.md"],
       "modules": [
         {
           "path": "modules/PLAN-MODE.md",
           "signal": "plan-mode"
-        },
+        }
+      ]
+    },
+    "generate-launch": {
+      "core": ["commands/generate-launch.md"],
+      "modules": [
         {
-          "path": "modules/RECONNAISSANCE.md",
-          "signal": "reconnaissance"
+          "path": "modules/PLAN-MODE.md",
+          "signal": "plan-mode"
         },
         {
-          "path": "modules/SPLIT-GATE.md",
-          "signal": "split"
+          "path": "modules/LAUNCH-DETECTION.md",
+          "signal": "detection"
         }
       ]
     },
-    "spec-refine": {
-      "core": ["commands/spec-refine.md", "loops/spec-refine-loop/LOOP.md", "loops/CHASSIS.md"],
+    "persist": {
+      "core": ["commands/persist.md"],
       "modules": [
         {
           "path": "modules/PLAN-MODE.md",
           "signal": "plan-mode"
         },
         {
-          "path": "modules/SPEC-CHANGE-SHAPE.md",
-          "signal": "shape"
+          "path": "modules/PERSIST-ROUTING.md",
+          "signal": "classification"
         },
         {
-          "path": "modules/SPEC-REFINE-KEYS.md",
-          "signal": "resume"
+          "path": "modules/ADOPTED-CONTEXT.md",
+          "signal": "adopted"
+        }
+      ]
+    },
+    "plan-exec": {
+      "core": [
+        "commands/plan-exec.md",
+        "loops/plan-exec-loop/LOOP.md",
+        "modules/PLAN-EXECUTION-BATCHES.md",
+        "loops/CHASSIS.md",
+        "loops/CODE-POLICIES.md"
+      ],
+      "modules": [
+        {
+          "path": "modules/PLAN-MODE.md",
+          "signal": "plan-mode"
         },
         {
-          "path": "modules/DESIGN-REFERENCES.md",
-          "signal": "ui"
+          "path": "modules/EXEC-PROBE-TASKS.md",
+          "signal": "probe"
         },
         {
-          "path": "modules/IDEATION-GATE.md",
-          "signal": "web",
-          "requires": "web-research"
+          "path": "modules/PROBE.md",
+          "signal": "probe"
         },
         {
-          "path": "modules/ADOPTED-CONTEXT.md",
-          "signal": "adopted"
+          "path": "modules/EXEC-DB-POLICY.md",
+          "signal": "db",
+          "requires": "external-data"
         },
         {
-          "path": "modules/PROBE.md",
-          "signal": "probe"
+          "path": "modules/DB-SCRIPTS-ONLY.md",
+          "signal": "db",
+          "requires": "external-data"
         },
         {
           "path": "modules/DB-RESEARCH-RULE.md",
           "signal": "db",
           "requires": "external-data"
         },
+        {
+          "path": "modules/SIMULATION-LIFECYCLE.md",
+          "signal": "simulation"
+        },
+        {
+          "path": "modules/DESIGN-REFERENCES.md",
+          "signal": "ui"
+        },
+        {
+          "path": "modules/ADOPTED-CONTEXT.md",
+          "signal": "adopted"
+        },
         {
           "path": "modules/COMPACTION.md",
           "signal": "compaction",
@@ -300,11 +340,10 @@
         }
       ]
     },
-    "plan-exec": {
+    "quick": {
       "core": [
-        "commands/plan-exec.md",
-        "loops/plan-exec-loop/LOOP.md",
-        "modules/PLAN-EXECUTION-BATCHES.md",
+        "commands/quick.md",
+        "loops/quick-loop/LOOP.md",
         "loops/CHASSIS.md",
         "loops/CODE-POLICIES.md"
       ],
@@ -314,15 +353,15 @@
           "signal": "plan-mode"
         },
         {
-          "path": "modules/EXEC-PROBE-TASKS.md",
-          "signal": "probe"
+          "path": "modules/ADOPTED-CONTEXT.md",
+          "signal": "adopted"
         },
         {
           "path": "modules/PROBE.md",
           "signal": "probe"
         },
         {
-          "path": "modules/EXEC-DB-POLICY.md",
+          "path": "modules/DB-RESEARCH-RULE.md",
           "signal": "db",
           "requires": "external-data"
         },
@@ -331,23 +370,10 @@
           "signal": "db",
           "requires": "external-data"
         },
-        {
-          "path": "modules/DB-RESEARCH-RULE.md",
-          "signal": "db",
-          "requires": "external-data"
-        },
-        {
-          "path": "modules/SIMULATION-LIFECYCLE.md",
-          "signal": "simulation"
-        },
         {
           "path": "modules/DESIGN-REFERENCES.md",
           "signal": "ui"
         },
-        {
-          "path": "modules/ADOPTED-CONTEXT.md",
-          "signal": "adopted"
-        },
         {
           "path": "modules/COMPACTION.md",
           "signal": "compaction",
@@ -356,18 +382,17 @@
         {
           "path": "modules/SESSION-NUMBERING.md",
           "signal": "sessions"
-        }
-      ]
-    },
-    "status": {
-      "core": ["commands/status.md"],
-      "modules": [
+        },
         {
-          "path": "modules/PLAN-MODE.md",
-          "signal": "plan-mode"
+          "path": "modules/PROMPT-CONTINUITY.md",
+          "signal": "resume"
         }
       ]
     },
+    "reset": {
+      "core": ["commands/reset.md"],
+      "modules": []
+    },
     "resume": {
       "core": ["commands/resume.md"],
       "modules": [
@@ -377,107 +402,90 @@
         }
       ]
     },
-    "persist": {
-      "core": ["commands/persist.md"],
+    "spec-new": {
+      "core": ["commands/spec-new.md"],
       "modules": [
         {
           "path": "modules/PLAN-MODE.md",
           "signal": "plan-mode"
         },
         {
-          "path": "modules/PERSIST-ROUTING.md",
-          "signal": "classification"
+          "path": "modules/RECONNAISSANCE.md",
+          "signal": "reconnaissance"
         },
         {
-          "path": "modules/ADOPTED-CONTEXT.md",
-          "signal": "adopted"
+          "path": "modules/SPLIT-GATE.md",
+          "signal": "split"
         }
       ]
     },
-    "fix-git": {
-      "core": ["commands/fix-git.md"],
+    "spec-refine": {
+      "core": ["commands/spec-refine.md", "loops/spec-refine-loop/LOOP.md", "loops/CHASSIS.md"],
       "modules": [
         {
           "path": "modules/PLAN-MODE.md",
           "signal": "plan-mode"
-        }
-      ]
-    },
-    "generate-launch": {
-      "core": ["commands/generate-launch.md"],
-      "modules": [
+        },
         {
-          "path": "modules/PLAN-MODE.md",
-          "signal": "plan-mode"
+          "path": "modules/SPEC-CHANGE-SHAPE.md",
+          "signal": "shape"
         },
         {
-          "path": "modules/LAUNCH-DETECTION.md",
-          "signal": "detection"
-        }
-      ]
-    },
-    "workspace-init": {
-      "core": ["commands/workspace-init.md"],
-      "modules": [
+          "path": "modules/SPEC-REFINE-KEYS.md",
+          "signal": "resume"
+        },
         {
-          "path": "modules/PLAN-MODE.md",
-          "signal": "plan-mode"
+          "path": "modules/DESIGN-REFERENCES.md",
+          "signal": "ui"
         },
         {
-          "path": "modules/WORKSPACE-SCAFFOLD.md",
-          "signal": "scaffold"
-        }
-      ]
-    },
-    "export-diagrams": {
-      "core": ["commands/export-diagrams.md"],
-      "modules": [
+          "path": "modules/IDEATION-GATE.md",
+          "signal": "web",
+          "requires": "web-research"
+        },
         {
-          "path": "modules/PLAN-MODE.md",
-          "signal": "plan-mode"
+          "path": "modules/ADOPTED-CONTEXT.md",
+          "signal": "adopted"
         },
         {
-          "path": "exports/export-diagrams/EXPORT.md",
-          "signal": "authoring"
-        }
-      ]
-    },
-    "export-manuals": {
-      "core": ["commands/export-manuals.md"],
-      "modules": [
+          "path": "modules/PROBE.md",
+          "signal": "probe"
+        },
         {
-          "path": "modules/PLAN-MODE.md",
-          "signal": "plan-mode"
+          "path": "modules/DB-RESEARCH-RULE.md",
+          "signal": "db",
+          "requires": "external-data"
         },
         {
-          "path": "exports/export-manuals/EXPORT.md",
-          "signal": "authoring"
+          "path": "modules/COMPACTION.md",
+          "signal": "compaction",
+          "requires": "compaction"
+        },
+        {
+          "path": "modules/SESSION-NUMBERING.md",
+          "signal": "sessions"
         }
       ]
     },
-    "export-reports": {
-      "core": ["commands/export-reports.md"],
+    "status": {
+      "core": ["commands/status.md"],
       "modules": [
         {
           "path": "modules/PLAN-MODE.md",
           "signal": "plan-mode"
-        },
-        {
-          "path": "exports/export-reports/EXPORT.md",
-          "signal": "authoring"
         }
       ]
     },
-    "export-scripts": {
-      "core": ["commands/export-scripts.md"],
+    "workspace-init": {
+      "core": ["commands/workspace-init.md"],
       "modules": [
         {
           "path": "modules/PLAN-MODE.md",
           "signal": "plan-mode"
         },
         {
-          "path": "exports/export-scripts/EXPORT.md",
-          "signal": "authoring"
+          "path": "modules/WORKSPACE-SCAFFOLD.md",
+          "signal": "scaffold"
         }
       ]
     }

package/skills/w/loops/CODE-POLICIES.md

@@ -1,9 +1,9 @@
 # CODE-POLICIES — policies for code-editing loops
 
 They apply to **`plan-exec-loop`** (per effective batch) and **`quick-loop`** (the single task;
-**proportional** gate): each reads this doc with the chassis. Document loops do not edit code and
-do not load it. These policies own the DB scripts-only, safe Git and closing-review invariants;
-code loops keep only a short inline floor for advisory hosts.
+**proportional** gate): each reads this doc with the chassis, and no document loop loads it. These
+policies own the DB scripts-only, safe Git and closing-review invariants; code loops keep only a
+short inline floor for advisory hosts.
 
 ## Safe git — verified branch + proposed commits
 
@@ -15,13 +15,13 @@ recorded as uncommitted in `CHECKPOINT` and `BACKLOG`. Between units each workin
 explicitly acknowledged; a `continuous` batch is the narrow exception that intentionally co-mingles
 its internal phases in one reviewed commit, and no batch may co-mingle with another.
 
-Concurrent flows never share a working tree: each edits in its own **isolation unit** — a worktree
-of the source on its own branch (`aw worktree ensure | list | release`). An edit outside it is
-blocked naming the command that creates one, and at close `aw worktree integrate` merges that
-branch into the source's declared work branch; a conflict is reported and routed to
-`aw fix-git --path`, never resolved alone.
+Concurrent flows never share a working tree: a run declares its sources and takes an **isolation
+unit** in each before writing — a worktree on its own branch
+(`aw worktree ensure | list | release`), where branch and commits are read. An edit outside is
+blocked naming the command that gets one, and at close `aw worktree integrate` merges each into
+the source's work branch; a conflict is reported, routed to `aw fix-git --path`, never alone.
 
-> **When the branch is verified, when a commit becomes available and what an approval covers is not this document's call:** the deterministic steps below are decided by the CLI (`aw flow advance`), not by this document. Approving is the person's act and committing is a separate effect that comes back as the sources' real git state — which is also what makes "the checks passed" impossible to assert without having run them.
+> **When the branch is verified, when a commit becomes available and what an approval covers is not this document's call:** the deterministic steps below are decided by the CLI (`aw flow advance`), not by this document. Approving is the person's act and committing is a separate effect that comes back as the units' own git state — which is what makes "the checks passed" impossible to assert without having run them.
 
 ## Closing review gate (conventions, pre-commit)
 

package/skills/w/loops/plan-exec-loop/LOOP.md

@@ -192,8 +192,17 @@ deferred with justification when they are not blockers.
   passed. In a continuous batch every phase waits for the batch review; an operative handoff leaves
   the affected phase `bloqueada` and the unit uncommitted.
 - **The plan's own state is the third axis, and it stays `open` during the whole run.** Every phase `validada` is **not** the plan closed: the final validation still has to run. Keep `> Estado: open` under the title while executing — stamping it on the first write if the plan carries none — and never write `done` from the counters — a legacy plan with every box ticked is not closed by that fact (§ *Legacy plans degrade safely*).
-- **Every phase `validada` + final validation passed** unlocks completion, and on the last batch the
-  same Git approval covers this mark, so the status write lands in the same source commit.
+- **Every phase `validada` + final validation passed** unlocks completion, and the mark is written
+  **after Git**: commit each unit, integrate it, and only then seal `done`. A run that isolates its
+  writing holds commits that live on `aw/<session>` and nowhere else, so a `done` stamped before the
+  merge would be true of no branch anybody reads.
+- **Integrating is part of closing, not a chore after it.** `aw worktree integrate --code <NNN>`
+  merges every unit of the session into its source's working branch, in alias order, one at a time
+  over the live branch — never a rebase, a force, a push or a silent branch switch. A **conflict is a
+  live state, not a failure**: the unit, its commits and the merge are kept, the receipt names the
+  plan, the source and the files, and `aw fix-git --path <source>` (`prepare` → `apply` →
+  `commit --confirm`) resolves it; then integrate again to confirm and give the unit back. The plan
+  is not `done` and the session does not close while a unit is still alive.
 - **Marking done = ONE status line in the plan-doc**, under the title's blockquote: `> Estado: done`, updated in place on a re-run. The machine value **stands alone** — the date and session go on their own `> Cierre: YYYY-MM-DD · sesión NNN` line right under it, for the same reason a blocker never rides on a phase's state line. It never replaces the per-phase lines inside the `### Fn` blocks — position tells the two apart. No per-phase result tables, no ✅ suffixes — that record lives in the session (`DECISION`/`CHECKPOINT`).
 - **Legacy status line, migrated on write.** A plan carrying the old single-line form (`> Estado: done — YYYY-MM-DD · sesión NNN`) is still **read** as closed; the first time this loop legitimately writes that document, it is rewritten to the two-line form. Compatibility is for reading old plans — every new write uses the normalized contract.
 - **No automatic export**: the artifacts (`SCRIPTS.sql`, `DECISION`, …) stay in the session. Promoting them to `docs/` (scripts, manuals, …) is a separate step via `export-*`.
@@ -235,30 +244,31 @@ plan-exec-loop(PPP-plan-<slug>.md):
     if any proof/check/review/exit condition is not green:
       preserve actual states + combined uncommitted diff; record unblocking action; stop
     set every Batch phase > Estado: validada; update CHECKPOINT
-    prepare exactly one commit per affected source
-      if last Batch + final validation green:
-        pre-authorized → mark plan done, then commit once per affected source without asking
-        otherwise → structured_choice(content: [Marcar plan done, Preguntar algo más], flow: [Compactar, Cerrar])
-          Marcar plan done → approve; mark done; commit all source changes once
-      else if pre-authorized → commit without another question
+    prepare exactly one commit per affected source, in its own isolation unit
+      pre-authorized → commit without another question
       else → one consolidated approval for all source commits
       rejected → changes stay; record "batch uncommitted"
+    if last Batch + final validation green:
+      integrate: aw worktree integrate --code NNN            # every unit, alias order, live branch
+        conflict → keep unit + merge; report plan/source/files; aw fix-git --path <source>
+                   (prepare → apply → commit --confirm) → integrate again → release
+        refused (dirty checkout / off branch / uncommitted unit) → fix what it names; retry
+      then mark plan done: > Estado: done + > Cierre: YYYY-MM-DD · sesión NNN under the title (Delta 6)
     next-batch precondition: working trees clean or acknowledged
   if no Batch ran and phases are already validada:
-    run final validation now
-    if green:
-      use the same pre-authorized/final structured-choice completion branch
-      when authorized → mark plan done with > Estado: done + > Cierre: YYYY-MM-DD · sesión NNN under the title (Delta 6), then commit that source once
+    run final validation now; if green → same integrate-then-mark-done branch
   if plan is not done:
     the plan-level > Estado: stays open → CHECKPOINT.Next = the action that unblocks the phase(s)
   # NO export: artifacts stay in the session; a separate export-* promotes them
 finalize: CHECKPOINT (+ BACKLOG if something is deferred) + close session + report
+  a session holding a live unit does NOT close: integrate it, or record why it stays
 ```
 
 ## Convergence / exit
 
 - **Every phase `validada`** + final validation passed + every effective batch reviewed before its
-  commits → `Marcar plan done`. Any pending/running/blocked phase keeps the plan open.
+  commits + every unit integrated → `Marcar plan done`. Any pending/running/blocked phase keeps the
+  plan open, and so does any unit still holding commits.
 - A **structural deviation** or a **functional change** exits this loop without converging (§ *Deviation gate*): `CHECKPOINT` + `finalize`, and the work continues in `plan-refine` / `spec-refine`. Same exit when the entry gate finds a structural gap.
 - `Cerrar` (`flow` control, at any time) → `finalize` persists `CHECKPOINT` (and `BACKLOG` only if something remained unexecuted / uncommitted / unapplied), closes the session, reports.
 - Promoting artifacts to `docs/` (via `export-*`) is **always** a later, explicit step outside this loop.

package/skills/w/loops/plan-new-loop/LOOP.md

@@ -32,7 +32,7 @@ PLAN
 ## Writes
 `docs/plans/PPP-plan-<slug>.md` (`generate`; **overwrites with confirmation** if it exists) — or **several sibling plans** when an accepted split applies (§ *Split gate (multi-plan)*). With UI, also the design revision it publishes under `docs/designs` (chassis § *docs/ boundary*). It never graduates/exports anything else to `docs/` — that is separate `export-*` work.
 
-> **Naming** follows [`PLAN-INPUT`](../../modules/PLAN-INPUT.md) § *Numbering*: `aw next-number docs/plans --claim plan-<slug>.md` CLAIMS `PPP` — two concurrent flows never get the same one. To locate plans, glob `docs/plans/PPP-plan-*.md`.
+> **Naming** follows [`PLAN-INPUT`](../../modules/PLAN-INPUT.md) § *Numbering*: the claim CLAIMS `PPP` **for its run** — two flows never get the same one, only its owner fills it; closing unpublished frees it. Plans glob as `docs/plans/PPP-plan-*.md`.
 
 > **Adoption (command mode 4):** an **externally-built plan** (host plan mode, hand-written, another agent) is materialized by the **command** in a single pass — this loop does not run: transcribe + normalize into the Delta 1 schema, `## Origin` = "adopted from <source>" + attribution; then `plan-refine` closes schema gaps (its coherence gate degrades for spec-less plans). See `../../modules/PLAN-INPUT.md` (the command's `input` module).
 

package/skills/w/modules/PLAN-INPUT.md

@@ -25,4 +25,4 @@ Loaded when the input is not plainly a `ready-for-plan` spec (signal `input`).
 
 ## Numbering
 
-The plan is named `docs/plans/PPP-plan-<slug>.md`; `aw next-number docs/plans --claim plan-<slug>.md` claims it; the slug comes from the Requirement. It does **not inherit the spec's `NNN`** — the link is established by reference in `## Origin`, never by number.
+The plan is named `docs/plans/PPP-plan-<slug>.md`; `aw next-number docs/plans --claim plan-<slug>.md --code <NNN>` claims it **for its run**; the slug comes from the Requirement. It does **not inherit the spec's `NNN`** — the link is established by reference in `## Origin`, never by number.