@tacuchi/agent-workflow-cli 12.4.0 → 12.6.0

package/dist/cli/tui/data/workflow-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-content.js","sourceRoot":"","sources":["../../../../src/cli/tui/data/workflow-content.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,sEAAsE;AACtE,oEAAoE;AACpE,8EAA8E;AAC9E,mEAAmE;AACnE,qDAAqD;AACrD,EAAE;AACF,0EAA0E;AAC1E,gFAAgF;AAChF,0EAA0E;AAmB1E,MAAM,CAAC,MAAM,gBAAgB,GAAoB;IAC/C,QAAQ,EACN,gJAAgJ;IAElJ,0EAA0E;IAC1E,sEAAsE;IACtE,MAAM,EAAE;QACN;YACE,EAAE,EAAE,gBAAgB;YACpB,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,gBAAgB;YACvB,IAAI,EAAE,mGAAmG;YACzG,QAAQ,EAAE,CAAC,gBAAgB,CAAC;YAC5B,KAAK,EAAE,mBAAmB;YAC1B,IAAI,EAAE,cAAc;SACrB;QACD;YACE,EAAE,EAAE,MAAM;YACV,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,iBAAiB;YACxB,IAAI,EAAE,4FAA4F;YAClG,QAAQ,EAAE,CAAC,UAAU,EAAE,aAAa,CAAC;YACrC,KAAK,EAAE,8BAA8B;YACrC,IAAI,EAAE,GAAG;SACV;QACD;YACE,EAAE,EAAE,eAAe;YACnB,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,yBAAyB;YAChC,IAAI,EAAE,oFAAoF;YAC1F,QAAQ,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC;YACnC,KAAK,EAAE,4BAA4B;YACnC,IAAI,EAAE,0BAA0B;SACjC;QACD;YACE,EAAE,EAAE,OAAO;YACX,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,sBAAsB;YAC7B,IAAI,EAAE,qEAAqE;YAC3E,QAAQ,EAAE,CAAC,OAAO,CAAC;YACnB,KAAK,EAAE,UAAU;YACjB,IAAI,EAAE,YAAY;SACnB;QACD;YACE,EAAE,EAAE,QAAQ;YACZ,CAAC,EAAE,CAAC;YACJ,KAAK,EAAE,2BAA2B;YAClC,IAAI,EAAE,uFAAuF;YAC7F,QAAQ,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,CAAC;YACnF,KAAK,EAAE,qBAAqB;YAC5B,IAAI,EAAE,GAAG;SACV;KACF;IAED,yEAAyE;IACzE,6EAA6E;IAC7E,wDAAwD;IACxD,eAAe,EAAE;QACf;YACE,EAAE,EAAE,SAAS;YACb,KAAK,EAAE,mBAAmB;YAC1B,KAAK,EAAE,CAAC,UAAU,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,CAAC;SAC9F;QACD;YACE,EAAE,EAAE,YAAY;YAChB,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE;gBACL,iBAAiB;gBACjB,kBAAkB;gBAClB,qBAAqB;gBACrB,uBAAuB;aACxB;SACF;QACD;YACE,EAAE,EAAE,SAAS;YACb,KAAK,EAAE,oBAAoB;YAC3B,KAAK,EAAE;gBACL,SAAS;gBACT,oBAAoB;gBACpB,gBAAgB;gBAChB,kBAAkB;gBAClB,kBAAkB;gBAClB,cAAc;aACf;SACF;QACD;YACE,EAAE,EAAE,eAAe;YACnB,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,gBAAgB,CAAC;SAClD;QACD;YACE,EAAE,EAAE,QAAQ;YACZ,KAAK,EAAE,eAAe;YACtB,KAAK,EAAE;gBACL,eAAe;gBACf,cAAc;gBACd,cAAc;gBACd,gBAAgB;gBAChB,cAAc;gBACd,WAAW;gBACX,mBAAmB;gBACnB,eAAe;aAChB;SACF;QACD;YACE,EAAE,EAAE,OAAO;YACX,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,CAAC,mBAAmB,EAAE,yBAAyB,EAAE,yBAAyB,CAAC;SACnF;QACD;YACE,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,iBAAiB,CAAC;SACjF;QACD;YACE,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,UAAU;YACjB,KAAK,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC;SACtD;QACD;YACE,EAAE,EAAE,MAAM;YACV,KAAK,EAAE,MAAM;YACb,KAAK,EAAE;gBACL,aAAa;gBACb,cAAc;gBACd,gBAAgB;gBAChB,mBAAmB;gBACnB,UAAU;gBACV,gBAAgB;aACjB;SACF;KACF;IAED,mEAAmE;IACnE,aAAa,EAAE;QACb,mBAAmB;QACnB,aAAa;QACb,gBAAgB;QAChB,aAAa;QACb,cAAc;QACd,UAAU;QACV,mBAAmB;QACnB,mBAAmB;QACnB,oBAAoB;QACpB,mBAAmB;KACpB;IAED,gEAAgE;IAChE,KAAK,EAAE;QACL;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,sBAAsB;YAC/B,KAAK,EAAE,0DAA0D;SAClE;QACD;YACE,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,mDAAmD;YAC5D,KAAK,EAAE,wDAAwD;SAChE;QACD;YACE,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,sCAAsC;SAC9C;QACD;YACE,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,0DAA0D;SAClE;QACD;YACE,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,iDAAiD;SACzD;KACF;CACF,CAAC"}
+{"version":3,"file":"workflow-content.js","sourceRoot":"","sources":["../../../../src/cli/tui/data/workflow-content.ts"],"names":[],"mappings":"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"}

package/dist/ports/git.d.ts

@@ -28,5 +28,10 @@ export interface GitPort {
     isMerging(repoPath: string): Promise<boolean>;
     /** Unmerged paths: `git diff --name-only --diff-filter=U`. */
     conflictedFiles(repoPath: string): Promise<string[]>;
+    /**
+     * Branch name being merged in (theirs), via `git name-rev` on MERGE_HEAD.
+     * Undefined when not mid-merge or the commit can't be named to a ref.
+     */
+    mergeOrigin(repoPath: string): Promise<string | undefined>;
 }
 //# sourceMappingURL=git.d.ts.map

package/dist/ports/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/ports/git.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,OAAO;IACtB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,6DAA6D;IAC7D,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC3D,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,+DAA+D;IAC/D,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,iFAAiF;IACjF,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAClE,oFAAoF;IACpF,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,4DAA4D;IAC5D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,8DAA8D;IAC9D,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACtD"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/ports/git.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,OAAO,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,OAAO;IACtB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,6DAA6D;IAC7D,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC3D,kDAAkD;IAClD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,+DAA+D;IAC/D,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,iFAAiF;IACjF,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAClE,oFAAoF;IACpF,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,4DAA4D;IAC5D,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,8DAA8D;IAC9D,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrD;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC5D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tacuchi/agent-workflow-cli",
-  "version": "12.4.0",
+  "version": "12.6.0",
   "description": "Agnostic runtime CLI for AI development workflows — a stages + loops + artifacts harness. Bundles the universal `w` skill set under `skills/w/` (slash commands `/w:*`: spec-new/spec-refine, plan-new/plan-exec, quick, workspace-init, export-*); `self install --target <host>` copies SKILL + commands + hooks into the host. Pluggable capability skills via `.workflow/skills.toml`. Multi-empresa parametrization via `profile.json` cascade. Namespace auto-detected from any `.<ns>/sessions/` dir in CWD; default `workflow`.",
   "type": "module",
   "bin": {

package/skills/w/README.md

@@ -19,7 +19,7 @@ LAYER 2 · LOOPS  (the AI runs them whole)                    │
         │ create / manage                                     │
         ▼                                                     │
 LAYER 3 · SESSIONS + ARTIFACTS  (.workflow/sessions/)  ───────┘ export-* read these
-  research · refine/control · exec · quick
+  refine · exec · quick   (research = capacidad inline, no un tipo de session)
 
 ZONE docs/ — permanent, user-facing deliverables
   specs · plans · tools   (flows)   ·   scripts · manuals · diagrams · reports   (export-*)
@@ -33,6 +33,7 @@ ZONE docs/ — permanent, user-facing deliverables
 | [`loops/`](loops/) | 2 | The 4 loops (chassis `spec-refine-loop` + heirs) the AI runs |
 | [`exports/`](exports/) | 1 | The `export-*` family — the only artifact→`docs/` promotion path |
 | [`roles/`](roles/) | cross-cutting | Pluggable capability skills (built-in defaults; rebindable via `.workflow/skills.toml`) |
+| [`harness/`](harness/SKILL.md) | cross-cutting | Capability→harness-mechanism binding (agnostic across Claude Code / Codex / opencode / Gemini) |
 | [`artifacts/`](artifacts/) | 3 | Session artifact templates the loops manage |
 | [`hooks/`](hooks/) | — | Host hook template (branch-check, sql-mutation-guard, checkpoint, …) |
 | [`SKILL.md`](SKILL.md) | overview | The `workflow` orientation skill (whole-model guide) |
@@ -42,11 +43,13 @@ ZONE docs/ — permanent, user-facing deliverables
 | Flow | Commands | `docs/` owned | Loops |
 |---|---|---|---|
 | **SPEC** | `spec-new` *(single-pass)* · `spec-refine` | `docs/specs` | `spec-refine-loop` |
-| **PLANIFICATION** | `plan-new` · `plan-exec` | `docs/plans` · `docs/tools` | `plan-new-loop` · `plan-exec-loop` |
+| **PLAN** | `plan-new` · `plan-exec` | `docs/plans` · `docs/tools` | `plan-new-loop` · `plan-exec-loop` |
 | **QUICK** | `quick` | — | `quick-loop` |
 
 SPEC defines the **what** → PLAN the **how** and executes it → QUICK is the lightweight shortcut. Promotion to `docs/` (scripts/manuals/diagrams/reports) is **always** a separate step via `export-*`.
 
+> **Transversal commands** (no flow, not counted in 5/4): `/w:status` (read-only workspace dashboard) · `/w:fix-git` (resolve an in-progress merge conflict, git-safe — works on any repo). Setup: `/w:workspace-init`.
+
 ## Bootstrap
 
 Run [`/w:workspace-init`](commands/workspace-init.md) once to turn a folder into a workspace (`.workflow/` + `docs/` taxonomy + `WORKSPACE` block + `.workflow/skills.toml`). No project/hub distinction — a workspace has 1+ sources.
@@ -58,7 +61,7 @@ Run [`/w:workspace-init`](commands/workspace-init.md) once to turn a folder into
 3. **spec & plan are documents** (`docs/`), not artifacts.
 4. **DB scripts-only** — the AI never executes DML/DDL; migrations land in `SCRIPTS.sql` and ship via `export-scripts`; reads are read-only via MCP.
 5. **Git-safe** — verify the expected branch before editing; propose commits per source; never `push`/`--amend`/`--no-verify`.
-6. **All loops** — gap-driven convergent; `AskUserQuestion` with ≤3 content tabs + 1 always-present `flow` tab (`Compactar`/`Cerrar`); compact/resume; `Cerrar` persists `CHECKPOINT`+`BACKLOG`.
+6. **All loops** — gap-driven convergent; one session per run (research inline); **structured-choice** (capability — see [`harness/`](harness/SKILL.md); on Claude Code: `AskUserQuestion`) with ≤3 content questions + 1 always-present `flow` control (`Compactar`/`Cerrar`); a **convergence gate** before saving; compact/resume; artifacts as a live log (`CHECKPOINT` always; `BACKLOG` only when deferring).
 
 ## Pluggable capabilities
 

package/skills/w/SKILL.md

@@ -63,7 +63,7 @@ USUARIO invoca
 | **PLAN** (el *cómo* + ejecutar) | `plan-new` · `plan-exec` | `docs/plans` · `docs/tools` | `plan-new-loop` · `plan-exec-loop` |
 | **QUICK** (atajo liviano) | `quick` | — | `quick-loop` |
 
-Cadena típica: prompt → `spec-new` genera `docs/specs/NNN-spec.md` → `spec-refine` corre el loop → `NNN-spec-refined.md` → `plan-new` → `docs/plans/PPP-plan.md` → `plan-exec` ejecuta y actualiza el plan (living doc) + artefactos en sesiones. La promoción del resto a `docs/` es **siempre** un paso aparte vía `export-*`.
+Cadena típica: prompt → `spec-new` genera `docs/specs/NNN-spec-<slug>.md` → `spec-refine` corre el loop y refina **ese mismo spec in place** → `plan-new` → `docs/plans/PPP-plan-<slug>.md` → `plan-exec` ejecuta y actualiza el plan (living doc) + artefactos en sesiones. La promoción del resto a `docs/` es **siempre** un paso aparte vía `export-*`.
 
 ### The commands (`/w:` namespace)
 
@@ -73,6 +73,8 @@ Cadena típica: prompt → `spec-new` genera `docs/specs/NNN-spec.md` → `spec-
 - `/w:plan-new` — arranca `plan-new-loop` para derivar un plan ejecutable del spec refinado.
 - `/w:plan-exec` — arranca `plan-exec-loop` para ejecutar y mantener el plan.
 - `/w:quick` — arranca `quick-loop` (atajo, sin `docs/`).
+- `/w:status` — dashboard read-only del workspace (Hecho/Falta/Descartó, con fechas en español). Transversal: no es un flow, no escribe nada; se apoya en `aw status`.
+- `/w:fix-git` — resuelve conflictos de un merge en curso en cualquier repo (identifica origen↔destino, analiza intención, *structured-choice* ante ambigüedad). Transversal: no es flow, no crea session, no toca `docs/`; git-safe; se apoya en `aw merge-state`.
 - `/w:export-scripts` · `/w:export-manuals` · `/w:export-diagrams` · `/w:export-reports` — promueven artefactos a `docs/`.
 
 ### The loops (Layer 2)
@@ -80,13 +82,15 @@ Cadena típica: prompt → `spec-new` genera `docs/specs/NNN-spec.md` → `spec-
 Un loop es una skill que enseña a la IA **cómo iterar** hasta un entregable. Propiedades comunes (el chasis, en `spec-refine-loop`, lo heredan los demás):
 
 1. **Gap-driven convergente** — cada ciclo: detecta huecos → resuelve (pregunta al humano o investiga) → integra → repite hasta converger.
-2. **Puede crear sessions internas** — si el trabajo es profundo (ej. investigar el código), el loop crea una session (`research`, etc.), maneja sus artefactos en `.workflow/sessions/`, la cierra y reporta. El usuario nunca crea esas sessions.
-3. **AskUserQuestion con dos tipos de tab**:
-   - **tab(s) de contenido** — la pregunta real del momento.
-   - **tab `flow`** — control de ciclo de vida, **siempre presente**: `Compactar` / `Cerrar`. Responder el tab de contenido sin tocar `flow` = seguir iterando.
+2. **Una sola session por run + research inline** — el loop crea **una** session (la dueña del run) y maneja sus artefactos en `.workflow/sessions/`. La **investigación es inline**: una actividad dentro de esa misma session (escribe `ANALYSIS-FILE`/`CONCLUSIONS` + `SCRIPTS.sql` read-only si consulta BD), no una session aparte. El usuario nunca crea sessions. Los artefactos son el **registro vivo** del run, **ciclo artifact-first** (sembrar `Pending`/`Next` antes de ejecutar, llevar a `Completed` después); la base guía es el spec/plan.
+3. **Structured-choice con dos tipos de pregunta** — *structured-choice* (capacidad del arnés — ver `harness/SKILL.md`). En **Claude Code** es `AskUserQuestion` (máx 4 preguntas/llamada → **≤3 preguntas de contenido + 1 control `flow`**); en un arnés sin elección estructurada, degrada a **markdown numerado**.
+   - **pregunta(s) de contenido** — la pregunta real del momento.
+   - **control `flow`** — control de ciclo de vida, **siempre presente**: `Compactar` / `Cerrar`. Responder la pregunta de contenido sin tocar `flow` = seguir iterando.
 4. **Escribe solo en su carpeta `docs/`** — y nunca exporta el resto (eso es de `export-*`).
 
-`flow → Compactar` = checkpoint + `/compact` del host y reanuda. `flow → Cerrar` = persiste `CHECKPOINT` + `BACKLOG`, cierra sessions internas, termina.
+`flow → Compactar` = checkpoint + la **compactación** del arnés (en Claude Code: `/compact`; ver `harness/SKILL.md`) y reanuda. `flow → Cerrar` = persiste `CHECKPOINT` (siempre) + `BACKLOG` (solo si difiere), cierra la session, termina.
+
+Cada loop tiene un **convergence gate** read-only antes de ofrecer `Guardar`/`done`: chequea invariantes propios del entregable y lo que falle vuelve como gap (en `spec-refine-loop` es el *analyze gate*; en `plan-new-loop`, la coherencia del plan; en `plan-exec-loop`, la validación final; en `quick-loop`, una validación puntual lightweight). El detalle vive en cada loop.
 
 `spec-new` no tiene loop (single-pass): **5 comandos / 4 loops**.
 
@@ -127,7 +131,7 @@ Catálogo de roles y su default:
 | `git` | `git` | must | `plan-exec-loop` · `quick-loop` |
 | `coding-standards` | `coding-standards` | must | `plan-exec-loop` · `quick-loop` |
 | `writing` | `writing` | must | todos los loops · `export-manuals`/`export-reports` |
-| `research` | `research` | should | todos los loops (on-demand) |
+| `research` | `research` | should | todos los loops (capacidad inline) |
 | `testing` | `testing` | should | `plan-exec-loop` · `quick-loop` |
 | `tools` | `tools` | should | `plan-exec-loop` |
 | `diagrams` | `diagrams` | should | `export-diagrams` |
@@ -135,6 +139,18 @@ Catálogo de roles y su default:
 
 El **chasis del loop** NO se bindea: **es** el loop, no es enchufable.
 
+### Harness (agnóstico al arnés)
+
+La doctrina nombra **capacidades** abstractas, no tools concretos de un arnés. Un solo doc —`harness/SKILL.md`— liga cada capacidad al mecanismo de cada arnés (Claude Code, Codex, opencode, Gemini, genérico). Dos principios: **capacidad-no-tool** (los loops/comandos referencian la capacidad por nombre) y **progressive-enhancement** (usar el mecanismo más rico del arnés; degradar a un fallback universal cuando no exista).
+
+Capacidades clave:
+
+- **structured-choice** — preguntar al humano ≤3 preguntas de contenido + 1 control `flow`. Claude Code: `AskUserQuestion`. Fallback: markdown numerado.
+- **compaction** — encoger el contexto sin perder el hilo. Claude Code: `/compact`. Fallback: `CHECKPOINT` + resume.
+- **command-invocation** · **procedure-loading** · **subagent-dispatch** (opt.) · **persistent-context** · **external-data** (MCP) · **dry-run/preview**.
+
+Las únicas `must` para el ciclo de un loop son **structured-choice** y **compaction**, y ambas degradan a texto → cualquier arnés con chat + archivos corre el modelo completo. Detalle, matriz de binding y distribución (`AGENTS.md` canónico + symlink `CLAUDE.md`): ver `harness/SKILL.md`.
+
 ### The 6 hard invariants
 
 1. **Sin auto-export** — los loops nunca graduan/exportan a `docs/`. Solo `export-*` lo hace, explícito.
@@ -142,7 +158,7 @@ El **chasis del loop** NO se bindea: **es** el loop, no es enchufable.
 3. **El spec y el plan son documentos** (`docs/`), no artefactos de sesión.
 4. **BD solo-scripts** — la IA nunca ejecuta DML/DDL; las migraciones quedan en `SCRIPTS.sql` y las aplica el usuario. Solo lecturas read-only vía MCP.
 5. **Git seguro** — rama esperada verificada antes de editar; commits propuestos por fuente; nunca `push`/`--amend`/`--no-verify`.
-6. **Chasis de loops** — gap-driven convergente · `AskUserQuestion` con ≤3 tabs de contenido + 1 tab `flow` (`Compactar`/`Cerrar`) siempre · compact/resume · `Cerrar` persiste `CHECKPOINT`+`BACKLOG`.
+6. **Chasis de loops** — gap-driven convergente · una sola session por run (research inline) · **structured-choice** con ≤3 preguntas de contenido + 1 control `flow` (`Compactar`/`Cerrar`) siempre · compactación/resume · convergence gate read-only antes de cerrar · artefactos como log vivo **artifact-first** (sembrar `Pending`/`Next` antes, `Completed` después; `CHECKPOINT` siempre; `BACKLOG` solo si difiere).
 
 ## Output
 
@@ -150,4 +166,4 @@ Ninguno. Es orientación pura: no escribe documentos ni artefactos.
 
 ## Source
 
-Autorada del modelo de diseño (`docs/referencias/`): README de arquitectura (3 capas + 6 invariantes), `workflow-commands/`, `workflow-loops/`, `workflow-exports/`, `workflow-skills/`. Reemplaza la orientación del bundle viejo (`session` + flows dev/design/analyze, CLI v11), que se descarta.
+Autorada del modelo de diseño (`docs/referencias/`): README de arquitectura (3 capas + 6 invariantes), `workflow-commands/`, `workflow-loops/`, `workflow-artifacts/`, `workflow-exports/`, `workflow-skills/`, `workflow-harness/`. Modelo actual, desplegado. (Compat: reemplaza la orientación del bundle legacy `session` + flows dev/design/analyze.)

package/skills/w/artifacts/README.md

@@ -1,6 +1,6 @@
 # workflow-artifacts — Artifact catalog (Layer 3)
 
-> Reference for the **new agent-workflow model**. This folder contains the **artifact templates**: process files managed by **sessions** inside `.workflow/sessions/`.
+> Reference for the agent-workflow model (current, deployed). This folder contains the **artifact templates**: process files managed by **sessions** inside `.workflow/sessions/`.
 > Siblings: [`../commands/`](../commands/) (Layer 1) · [`../loops/`](../loops/) (Layer 2) · [`../roles/`](../roles/) (pluggable skills).
 
 ---
@@ -23,14 +23,15 @@ Central distinction of the model:
 
 ## Sessions & their artifacts
 
-Sessions are created by the loops as needed. Each session type manages a set of artifacts:
+Sessions are created by the loops as needed — **one session per run**. The session types loops create are `refine`, `exec`, `quick`:
 
 | Session type | Created by | Artifacts | Notes |
 |---|---|---|---|
-| **research** | all loops, on-demand | `SESSION` · `ANALYSIS-FILE` · `CONCLUSIONS` · `SCRIPTS.sql` (if DB) | On-demand, **not resumable** (run-and-close). No own `CHECKPOINT`/`BACKLOG` — those live in the owning `refine/control` session. |
-| **refine / control** | `spec-refine-loop` · `plan-new-loop` · `plan-exec-loop` | `SESSION` · `CHECKPOINT` · `BACKLOG` (on close) | Owns the loop run. Tracks open research sessions. |
-| **exec** (one per phase) | `plan-exec-loop` | `SESSION` · `DECISION` · `SCRIPTS.sql` · `CHECKPOINT` | No `TECHNICAL-NOTE` or own `TASKS` — detail lives in the plan-doc (living). `TASKS` is optional for internal breakdown. |
-| **quick** (one, lightweight) | `quick-loop` | `SESSION` · `DECISION` · `SCRIPTS.sql` · `CHECKPOINT` · `BACKLOG` (on close) | Single session, single commit. |
+| **refine** | `spec-refine-loop` · `plan-new-loop` | `SESSION` · `CHECKPOINT` · `BACKLOG` (on close, if any) | Owns the loop run (spec-refine, plan-new). |
+| **exec** | `plan-exec-loop` | `SESSION` · `CHECKPOINT` · `BACKLOG` (on close, if any) · `DECISION` · `SCRIPTS.sql` | A single per-run exec session (**not** one per phase). No `TECHNICAL-NOTE` or own `TASKS` — detail lives in the plan-doc (living). `TASKS` is optional for internal breakdown. |
+| **quick** | `quick-loop` | `SESSION` · `CHECKPOINT` · `BACKLOG` (on close, if any) · `DECISION` · `SCRIPTS.sql` | Single session, single commit. |
+
+> **Inline research (any session):** research is **not** a session type. When any session (`refine`/`exec`/`quick`) needs to investigate, it produces research artifacts **inline**: `ANALYSIS-FILE` (optional scratchpad), `CONCLUSIONS`, and read-only `SCRIPTS.sql` (if DB). These are written into the active session — there is no separate research session.
 
 > **PLAN note (rich plan):** the plan-doc (`docs/plans/PPP-plan.md`) absorbs inline the `TECHNICAL-NOTE` level (Solution/Impacted/AS-IS/TO-BE/Validations…) **and** the `Phases`/`Tasks`. Therefore exec sessions do **not** carry a `TECHNICAL-NOTE` or own `TASKS` artifact: the technical detail and progress live in the plan-doc (living). `TASKS` remains as an optional artifact for sessions that need their own internal breakdown.
 
@@ -38,7 +39,7 @@ Sessions are created by the loops as needed. Each session type manages a set of
 
 ## Common artifacts (any session)
 
-`SESSION` (descriptor) · `CHECKPOINT` (resume) · `SCRIPTS.sql` (read-only queries **executable** + DDL/DML migrations **deliverable**, not executed) · `TASKS` · `BACKLOG`.
+`SESSION` (descriptor: Objective / Origin / Type; + research-only Success criteria) · `CHECKPOINT` (resume) · `SCRIPTS.sql` (read-only queries **executable** + DDL/DML migrations **deliverable**, not executed) · `TASKS` · `BACKLOG` (only when there's something to defer).
 
 ---
 
@@ -47,8 +48,8 @@ Sessions are created by the loops as needed. Each session type manages a set of
 | Folder | Role | Contains |
 |---|---|---|
 | [`artifacts-core/`](artifacts-core/) | common to any session | `SESSION` · `TASKS` · `CHECKPOINT` · `BACKLOG` · `SCRIPTS.sql` |
-| [`artifacts-research/`](artifacts-research/) | `research` session | `ANALYSIS-FILE` · `CONCLUSIONS` |
-| [`artifacts-dev/`](artifacts-dev/) | `exec` session | `DECISION` · `TECHNICAL-NOTE` |
+| [`artifacts-research/`](artifacts-research/) | inline research (any session) | `ANALYSIS-FILE` · `CONCLUSIONS` |
+| [`artifacts-exec/`](artifacts-exec/) | `exec` / `quick` session | `DECISION` · `TECHNICAL-NOTE` (schema reference; absorbed by the plan-doc) |
 
 ---
 

package/skills/w/artifacts/artifacts-core/BACKLOG.md

@@ -1,12 +1,9 @@
 # BACKLOG.md — deferred items and follow-ups (common)
 
-> What it is: items deferred or surfaced during the session that do not block closure but should not be lost. Written by the loop when `Cerrar` is triggered. Owned by `refine/control` and `quick` sessions.
+> What it is: items deferred or surfaced during the session that do not block closure but should not be lost. Written by the loop when `Cerrar` is triggered, **only when there is something to defer or follow up** — no empty BACKLOG. Owned by `refine` and `quick` sessions.
 
-## Deferred (text):
-List of phases/tasks (ref: plan-doc `docs/plans/PPP-plan.md`; or `TASKS.md` if the session created its own breakdown) deferred with reason.
+## Deferred
+Phases/tasks (ref: plan-doc `docs/plans/PPP-plan.md`; or `TASKS.md` if the session created its own breakdown) deferred with reason.
 
-## Followups (text):
-List of activities / suggestions / dependencies for future follow-up.
-
-## Notes (list):
-Miscellaneous notes.
+## Followups
+Activities / suggestions / dependencies for future follow-up.

package/skills/w/artifacts/artifacts-core/CHECKPOINT.md

@@ -1,22 +1,23 @@
 # CHECKPOINT.md — session resume state (common)
 
-> What it is: the resume state of a session. Written by the loop when the user triggers `Compactar` or `Cerrar`. Allows the loop to resume exactly where it left off.
-> Owned by: `refine/control` sessions (and `exec` / `quick` sessions that carry a checkpoint).
+> What it is: the live resume state of a session — lets the loop resume exactly where it left off.
+> **Live log (artifact-first):** `Pending`/`Next` = the intent (what is about to be done, seeded BEFORE executing); `Completed` = the result (AFTER). Updated at every gap/phase boundary, not only on `Compactar`/`Cerrar`.
+> Owned by: `refine` sessions (and `exec` / `quick` sessions that carry a checkpoint).
 
-## Activity (text):
+## Activity
 Summary of the activity done so far.
 
-## Critical context (text):
-Critical context / key decisions / references to other artifacts or documents needed to continue.
+## Critical context
+Key decisions / references to other artifacts or documents needed to continue.
 
-## Completed (list):
-List of completed phases (ref: plan-doc `docs/plans/PPP-plan.md`; or `TASKS.md` if the session created its own breakdown).
+## Completed
+Completed phases/tasks (ref: plan-doc `docs/plans/PPP-plan.md`; or `TASKS.md` if the session created its own breakdown).
 
-## Excluded (list):
-List of excluded phases/tasks (ref: plan-doc `docs/plans/PPP-plan.md`; or `TASKS.md`) with reason.
+## Excluded
+Excluded phases/tasks (ref: plan-doc; or `TASKS.md`) with reason.
 
-## Pending (list):
-List of pending phases (ref: plan-doc `docs/plans/PPP-plan.md`; or `TASKS.md`) still to do.
+## Pending
+Pending phases/tasks (ref: plan-doc; or `TASKS.md`) still to do.
 
-## Next (text):
-Next phase/task (ref: plan-doc `docs/plans/PPP-plan.md`; or `TASKS.md`) to continue from on resume.
+## Next
+Next phase/task (ref: plan-doc; or `TASKS.md`) to continue from on resume.

package/skills/w/artifacts/artifacts-core/SESSION.md

@@ -3,25 +3,24 @@
 > What it is: the brief descriptor of an **internal session** (Layer 3). Created by a **loop**, not by the user.
 > The `Type` is set by the owning loop. Authoritative type catalog: `../README.md` (table "Sessions & their artifacts").
 
-## Objective (text):
+## Objective
 What this session resolves: the gap, the question, or the concrete block of work.
 
-## Origin (list):
+## Origin
 Who created it and from where:
 - Parent loop (e.g. `spec-refine-loop`)
 - Source document (e.g. `docs/specs/003-spec.md`)
 - Trigger (e.g. gap "Context incomplete")
 
-## Type (text):
+## Type
 Session type, **set by the parent loop** (not the user). Authoritative catalog: `../README.md`.
-- `research` — investigate/conclude (read-only); on-demand, **not resumable** (run-and-close)
-- `exec` — execute work, one per phase (PLAN)
+- `refine` — owns a spec-refine / plan-new loop run (SESSION + CHECKPOINT; + BACKLOG on close)
+- `exec` — execute work; a single per-run session (PLAN), not one per phase
 - `quick` — lightweight execution (≈ `exec`: single session, single commit) (QUICK)
-- `refine` / `control` — owns a loop run (SESSION + CHECKPOINT; + BACKLOG on close)
 
-## Components (list):
-Projects / systems / sources / databases involved.
+> `research` is **not** a session type the loops create. Research is an **inline** activity: ANALYSIS-FILE / CONCLUSIONS are written into whatever session is active (`refine`/`exec`/`quick`) when it does investigation.
 
-## Success criteria (list):
-Checklist `[ ]` that, when met, **closes the session and triggers the report** back to the loop.
-If NOT met (e.g. research without evidence, DB unavailable): the session **closes anyway with state `inconcluso`** and reports the reason; the parent loop degrades the gap (asks the human or defers to `Open questions`).
+## Success criteria
+Present **only for research** activity (investigate/conclude). It is a checklist `[ ]` that, when met, marks the research as concluded.
+If NOT met (e.g. research without evidence, DB unavailable): the research closes as `inconcluso` and reports the reason; the parent loop degrades the gap (asks the human or defers to `Open questions`).
+For `exec` / `quick` / `refine` sessions the closing criteria live in the **plan/spec**, not here — omit this section.

package/skills/w/artifacts/artifacts-core/TASKS.md

@@ -1,16 +1,16 @@
 # TASKS.md — internal task breakdown (optional, common)
 
-> What it is: an internal phases/tasks breakdown for sessions that need their own desglose. **Optional artifact** — in PLANIFICATION, phases and tasks live in the **plan-doc** (`docs/plans/PPP-plan.md`, living). Use this only when a session needs a breakdown that is not covered by the plan-doc.
+> What it is: an internal phases/tasks breakdown for sessions that need their own desglose. **Optional artifact** — in the PLAN flow, phases and tasks live in the **plan-doc** (`docs/plans/PPP-plan.md`, living). Use this only when a session needs a breakdown that is not covered by the plan-doc.
 
-## Phases (list):
-List of grouping phases. Phases should have a complexity between XS and S.
+## Phases
+Grouping phases. Phases should have a complexity between XS and S.
 
 Example:
 - F1: Investigate billing flow
 - F2: Design new button for new payment method
 
-## Tasks (list):
-List of tasks ordered by phase. Tasks should have a maximum complexity of XS.
+## Tasks
+Tasks ordered by phase. Tasks should have a maximum complexity of XS.
 
 Example:
 - T1 (F1): Analyze sources ms-motor, ms-solicitud

package/skills/w/artifacts/{artifacts-dev → artifacts-exec}/DECISION.md

@@ -2,10 +2,10 @@
 
 > What it is: a log of non-obvious decisions made during an `exec` or `quick` session. Kept per-session so the loop and the human can trace why things were done a certain way.
 
-## Origin (list):
+## Origin
 Reference work unit (per the owning loop):
 - in `exec` → the Task from the plan-doc (`docs/plans/PPP-plan.md`, e.g. "T2 (F1)")
 - in `quick` → the prompt / work unit (no task numbering)
 
-## Decision (list):
-List of non-obvious decisions. For each: the decision taken, the reason, and the alternatives considered.
+## Decision
+Non-obvious decisions. For each: the decision taken, the reason, and the alternatives considered.

package/skills/w/artifacts/{artifacts-dev → artifacts-exec}/TECHNICAL-NOTE.md

@@ -1,22 +1,22 @@
 # TECHNICAL-NOTE.md — technical design note (schema reference)
 
-> **Model note:** in PLANIFICATION these sections live **inline in the plan-doc** (`docs/plans/PPP-plan.md`, rich plan), not as an exec-session artifact. This file is kept as a reference of the technical schema that the plan absorbs. Use it standalone only when the plan-doc approach does not apply (e.g. a `quick` session that needs scoped technical context).
+> **Model note:** in PLAN these sections live **inline in the plan-doc** (`docs/plans/PPP-plan.md`, rich plan, in `plan-new-loop`), not as an exec-session artifact. This file is kept **only** as a reference of the technical schema that the plan absorbs — **no `TECHNICAL-NOTE` is created in sessions**. Use it standalone only when the plan-doc approach does not apply (e.g. a `quick` session that needs scoped technical context).
 
-## Solution (text|list):
+## Solution
 Technical/functional explanation of how the solution will be implemented.
 
-## Impacted (list):
-List of impacted components:
+## Impacted
+Impacted components:
 - Frontend
 - Backend
 - Database (schemas/tables/functions)
 - APIs (controllers/endpoints)
 - Integrations with external systems
 
-## Dependencies (list):
-List of dependencies: sessions / documents / projects / sources / databases, etc.
+## Dependencies
+Dependencies: sessions / documents / projects / sources / databases, etc.
 
-## Current State (text):
+## Current State
 Simple representation of the wiring or cabling (interfaces and methods) — AS-IS behavior.
 
 Example:
@@ -42,10 +42,10 @@ PreviewController.efectivoHtml()  ──> respond TEXT_HTML
                                                        respond APPLICATION_PDF
 ```
 
-## Target State (text):
+## Target State
 Simple representation of the wiring or cabling (interfaces and methods) — TO-BE behavior.
 
-## Final Behavior (text|list):
+## Final Behavior
 How the entire flow should behave at the end (must be aligned with the requirements and acceptance/success criteria in SESSION.md).
 
 Example:
@@ -58,13 +58,13 @@ The user must be able to recover their password via OTP to their mobile number a
 6. [System] Confirms OTP
 7. [System] Saves the mobile number and associates it with the [User]
 
-## Impact / Risks (list):
+## Impact / Risks
 Technical impacts and risks.
 
-## Assumptions (list):
-List of assumptions.
+## Assumptions
+Assumptions.
 
-## Estimated Time (list):
+## Estimated Time
 Time estimates for [Development] and [Internal Testing].
 The work week has 5 days (Monday–Friday only).
 Size scale XS/S/M/L/XL:
@@ -74,8 +74,8 @@ Size scale XS/S/M/L/XL:
 - L  -> 6 to 10 days
 - XL -> More than 10 days
 
-## Validations (list):
+## Validations
 Validations, constraints, business-specific logic.
 
-## Open Questions (text|list):
+## Open Questions
 Pending items, doubts, open questions.

package/skills/w/artifacts/artifacts-research/ANALYSIS-FILE.md

@@ -1,48 +1,35 @@
-# ANALYSIS-FILE.md — research session analysis file
+# ANALYSIS-FILE.md — research analysis scratchpad
 
-> What it is: the working analysis document of a `research` session. Created on-demand by any loop. Not resumable (run-and-close) — the owning `refine/control` session's CHECKPOINT tracks open research sessions.
+> What it is: an **optional** working scratchpad for deeper investigations, written inline into the active session (`refine`/`exec`/`quick`). For light research, writing only `CONCLUSIONS` is fine — skip this file.
 
-# Case (text):
+## Case
 Short title.
 
-## Question (text)
-What needs to be clarified or demonstrated?
+## Question
+What needs to be clarified or demonstrated? Example: why does endpoint X return stale data after the cache refresh?
 
-Example:
-Why does client X appear with a pending balance if they already made the payment?
+## Context
+Optional — one line of scope if useful: system / module + what's in scope.
 
-## Context (text)
-Example:
-- Requester:
-- Area:
-- System / module:
-- Case date:
-- Known impact:
-
-## Initial Hypotheses (text|list)
+## Initial Hypotheses
 - H1:
 - H2:
-- H3:
 
-## Evidences (list|table):
+## Evidences
+Open-ended — add rows for whatever dev-relevant sources you actually used. Seeded with the common ones:
 | ID | Source | Finding | Link / file / query |
 |---|---|---|---|
 | E1 | DB | | |
 | E2 | Code | | |
 | E3 | Logs | | |
-| E4 | Email | | |
-| E5 | File | | |
 
-## Findings (text|list)
+## Findings
 What do the evidences indicate?
 
-- Evidence E1 shows that...
-- Evidence E2 confirms that...
-- Evidence E3 rules out that...
+- E1 shows...
+- E2 confirms...
 
-## Identified Cause (text|list)
+## Identified Cause
 - Technical:
-- Functional:
-- Operational:
 - Data:
 - Undetermined:

package/skills/w/artifacts/artifacts-research/CONCLUSIONS.md

@@ -1,20 +1,17 @@
-# CONCLUSIONS.md — research session conclusions
+# CONCLUSIONS.md — research conclusions
 
-> What it is: the conclusions of a `research` session. Produced when the session closes (success or `inconcluso`). The parent loop reads this to resolve the gap that triggered the research.
+> What it is: the conclusions of an **inline research** activity, written into the active session (`refine`/`exec`/`quick`). Produced when the research concludes (success or `inconcluso`). The parent loop reads this to resolve the gap that triggered the research.
 
-## Conclusion (text|list)
+## Conclusion
 Direct answer to the initial question.
 
-## Recommended Action (text|list)
-
+## Recommended Action
 Example:
-- [ ] Create bugfix
-- [ ] Create requirement
-- [ ] Correct data
-- [ ] Escalate to business
-- [ ] Train user
-- [ ] Close without technical action
-- [ ] Request more information
+- [ ] Fix code
+- [ ] Open follow-up task
+- [ ] Update docs
+- [ ] Defer (insufficient evidence)
+- [ ] No action
 
-## Details (text):
+## Details
 Supporting detail, evidence references, or additional context.

package/skills/w/commands/README.md

@@ -3,7 +3,7 @@
 > This is the **bundle README** for the `/w:` slash-command namespace. Every command listed here is something the **user** invokes directly.
 > Related layers: [`../loops/`](../loops/) (Layer 2, AI-driven) · artifacts live in `.workflow/sessions/` (Layer 3) · permanent deliverables in `docs/`.
 >
-> **Namespace:** all commands are under `w:` (`w` = *workflow*): `/w:spec-new`, `/w:spec-refine`, `/w:plan-new`, `/w:plan-exec`, `/w:quick`, `/w:workspace-init`, `/w:export-*`.
+> **Namespace:** all commands are under `w:` (`w` = *workflow*): `/w:spec-new`, `/w:spec-refine`, `/w:plan-new`, `/w:plan-exec`, `/w:quick`, `/w:workspace-init`, `/w:status` (transversal), `/w:fix-git` (transversal), `/w:export-*`.
 
 ---
 
@@ -20,7 +20,7 @@
                             ▼
 ┌─ LAYER 2 · LOOPS (../loops/) — AI runs these end-to-end ───────────────┐
 │   spec-refine-loop · plan-new-loop · plan-exec-loop · quick-loop        │
-│   Gap-driven · AskUserQuestion with ≤3 content tabs + 1 `flow` tab     │
+│   Gap-driven · structured-choice: ≤3 content questions + 1 `flow`     │
 │   (Compactar / Cerrar always present) · compact/resume support.        │
 └───────────────────────────┬────────────────────────────────────────────┘
                             │ creates / reads / writes
@@ -45,25 +45,29 @@
 | Flow | docs/ target | Entry command | Advance command | Loops involved |
 |---|---|---|---|---|
 | **SPEC** | `docs/specs/` | `spec-new` *(single-pass)* | `spec-refine` | `spec-refine-loop` |
-| **PLANIFICATION** | `docs/plans/` + `docs/tools/` | `plan-new` | `plan-exec` | `plan-new-loop`, `plan-exec-loop` |
+| **PLAN** | `docs/plans/` + `docs/tools/` | `plan-new` | `plan-exec` | `plan-new-loop`, `plan-exec-loop` |
 | **QUICK** | — *(no doc)* | `quick` | — | `quick-loop` |
 
-> **Intentional asymmetry:** in SPEC, `spec-new` generates the draft in a **single pass** (no loop) and the loop is in `spec-refine`. In PLANIFICATION, **both** commands start loops. Total: **5 flow commands / 4 loops**.
+> **Intentional asymmetry:** in SPEC, `spec-new` generates the draft in a **single pass** (no loop) and the loop is in `spec-refine`. In PLAN, **both** commands start loops. Total: **5 flow commands / 4 loops**.
+
+> **Transversal (no flow):** [`/w:status`](status.md) is a read-only dashboard of the whole workspace — what's done / pending / discarded, with friendly Spanish dates. It leans on `aw status`, writes nothing, and belongs to no flow.
+>
+> **Transversal (no flow):** [`/w:fix-git`](fix-git.md) resolves an **in-progress merge conflict** for any repo — identify origin↔destination, analyze both sides' intent, resolve (structured-choice on ambiguity), propose the merge commit (git-safe). Leans on `aw merge-state`; writes no `docs/`; works without a workspace. Neither transversal is counted in **5 flow / 4 loops**.
 
 ## Pipeline
 
 ```mermaid
 flowchart LR
     prompt(["user prompt"]) --> sn["/w:spec-new"]
-    sn -->|generates| spec["docs/specs/NNN-spec.md"]
+    sn -->|generates| spec["docs/specs/NNN-spec-<slug>.md"]
     spec -.->|optional manual edit| spec
     spec --> sr["/w:spec-refine"]
     sr -->|starts| srl(["spec-refine-loop"])
-    srl -->|generates| specr["docs/specs/NNN-spec-refined.md"]
+    srl -->|refines IN PLACE| spec
 
-    specr --> pn["/w:plan-new"]
+    spec --> pn["/w:plan-new"]
     pn -->|starts| pnl(["plan-new-loop"])
-    pnl -->|generates| plan["docs/plans/PPP-plan.md"]
+    pnl -->|generates| plan["docs/plans/PPP-plan-<slug>.md"]
 
     plan --> pe["/w:plan-exec"]
     pe -->|starts| pel(["plan-exec-loop"])
@@ -76,7 +80,7 @@ flowchart LR
     q -->|starts| ql(["quick-loop"])
 ```
 
-**Pipeline reading:** SPEC defines *what* (refined spec) → PLANIFICATION defines *how* (plan) and *executes it* → QUICK is a lightweight shortcut for scoped work that does not warrant spec or plan.
+**Pipeline reading:** SPEC defines *what* (refined spec) → PLAN defines *how* (plan) and *executes it* → QUICK is a lightweight shortcut for scoped work that does not warrant spec or plan.
 
 > **`docs/` boundary:** each flow only touches its own folders — **SPEC** → `docs/specs`; **PLAN** → `docs/plans` + `docs/tools`. The rest of `docs/` (`scripts`, `manuals`, `diagrams`, `reports`) is written **only** by `export-*` skills (a separate, never-automatic step). See [`../loops/`](../loops/) and workflow-exports reference.
 
@@ -98,7 +102,7 @@ Each `<command>.md` in this bundle uses this frontmatter + body structure:
 3. **Spec and plan are documents** (`docs/`), not artifacts.
 4. **DB scripts-only**: AI **never executes DML/DDL**; migrations live in `SCRIPTS.sql` (type B) and are delivered via `export-scripts`. Only read-only queries via MCP.
 5. **Git-safe**: verify branch before editing; **propose** commits by source; never `push`/`--amend`/`--no-verify`.
-6. **All loops**: gap-driven convergent · `AskUserQuestion` with ≤3 content tabs + 1 `flow` tab (`Compactar`/`Cerrar`) always · compact/resume · `Cerrar` persists `CHECKPOINT`+`BACKLOG`.
+6. **All loops**: gap-driven convergent · one session per run (research inline) · *structured-choice* (capacidad del arnés — ver [`../harness/SKILL.md`](../harness/SKILL.md); en **Claude Code** es `AskUserQuestion`) con **≤3 preguntas de contenido + 1 control `flow`** (`Compactar`/`Cerrar`) siempre · compact/resume · artifacts as a live log (`CHECKPOINT` always; `BACKLOG` only when deferring).
 
 ## Index
 
@@ -110,6 +114,8 @@ Each `<command>.md` in this bundle uses this frontmatter + body structure:
 | `plan-new` | [`plan-new.md`](plan-new.md) | starts `plan-new-loop` |
 | `plan-exec` | [`plan-exec.md`](plan-exec.md) | starts `plan-exec-loop` |
 | `quick` | [`quick.md`](quick.md) | starts `quick-loop` |
+| `status` | [`status.md`](status.md) | single-pass, read-only (transversal) |
+| `fix-git` | [`fix-git.md`](fix-git.md) | single-pass, read/edit working tree (transversal) |
 | `export-scripts` | [`export-scripts.md`](export-scripts.md) | single-pass, read-only |
 | `export-manuals` | [`export-manuals.md`](export-manuals.md) | single-pass, read-only |
 | `export-diagrams` | [`export-diagrams.md`](export-diagrams.md) | single-pass, read-only |