dorfl 0.1.2 → 0.2.1

package/dist/apply-persist.js

@@ -1,9 +1,11 @@
-import { existsSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import { run } from './git.js';
+import { setFrontmatterMarker } from './frontmatter.js';
 import { applyAtomic } from './sidecar-apply.js';
-import { allAnswered, appendQuestions, parseSidecar, sidecarPathFor, } from './sidecar.js';
+import { allAnswered, appendQuestions, parseSidecar, resolveSidecarIdentity, sidecarPathFor, } from './sidecar.js';
 import { APPLY_LIFECYCLE_FOLDERS, resolveItemPathByIdentity, } from './item-path.js';
+import { workItemRel } from './work-layout.js';
 /**
  * The engine-owned APPLY PERSIST (spec `advance-loop`, task `advance-rung-apply`;
  * AGENTIC apply, task `agentic-apply-retire-disposition-vocabulary`) — the half of
@@ -15,10 +17,15 @@ import { APPLY_LIFECYCLE_FOLDERS, resolveItemPathByIdentity, } from './item-path
  *   - **append / re-pause** — when the apply has NEW questions to ask: append
  *     `qN+1…`, stay `needsAnswers:true`, re-pause (the "all answered?" flips back
  *     to false); OR
- *   - **discharge by deletion** — when the caller decided the SOURCE should leave
- *     by deletion (`discharge` set): `git rm` the source + sidecar in a STANDALONE
- *     revertible commit, the reason in the commit message (git history is the
- *     archive); OR
+ *   - **dispose** — when the caller decided the SOURCE should be DISPOSED
+ *     (`dispose` set): REGIME-POLYMORPHIC on the source's type (task
+ *     `apply-disposition-delete-to-dispose-regime-polymorphic`, spec
+ *     `surface-stuck-as-questions-and-retire-stuck-lock-state` decision #5):
+ *     an OBSERVATION is `git rm`-ed with its sidecar in one revertible commit
+ *     (reason in the message, git history = archive); a TASK is `git mv`-ed to
+ *     `tasks/cancelled/` (RETAINED, `reason:` written into the moved body); a
+ *     SPEC is `git mv`-ed to `specs/dropped/` (RETAINED). A task can NEVER be
+ *     hard-deleted from here — dispose is the only path off the board; OR
  *   - **resolve fully** (the default) — clear `needsAnswers` + DELETE the sidecar
  *     in the SAME atomic commit (the invariant `needsAnswers:false ⟺ no active
  *     sidecar`); the item advances toward build by its normal lifecycle.
@@ -29,19 +36,19 @@ import { APPLY_LIFECYCLE_FOLDERS, resolveItemPathByIdentity, } from './item-path
  * no `keep`/`triaged:keep` resting state. A sidecar entry is BINARY (no-answer |
  * answered); what to DO with a fully-answered OBSERVATION is decided by the
  * AGENTIC apply decision in the advance tick (`advance.ts` `applyRung` over the
- * shared `decide` engine), which then routes here (re-pause / discharge / via
+ * shared `decide` engine), which then routes here (re-pause / dispose / via
  * `promoteObservation` for a mint). A signal is still-open, acted-on, or deleted
  * — there is no \"retain as resolved\" state.
  *
  * The work-item (task/spec) terminal MOVES (`tasks/cancelled`, `specs/dropped`) and
- * the `needs-attention/` LIFECYCLE state are a SEPARATE lifecycle concern (a
+ * the stuck (lock `state: stuck`) LIFECYCLE state are a SEPARATE lifecycle concern (a
  * task/spec is dropped by its own lifecycle, not by a question answer) — they are
  * NOT routed from here any more (they were the removed disposition vocabulary).
  *
  * It is the SIBLING of {@link import('./surface-persist.js').persistSurfacedQuestions}:
  * that is the SURFACE rung's one-commit primitive (append-or-create + set
  * `needsAnswers`); this is the APPLY rung's (apply answers + resolve / re-pause /
- * discharge). Kept file-orthogonal so the rung bodies land in different tasks.
+ * dispose). Kept file-orthogonal so the rung bodies land in different tasks.
  *
  * **NEVER invents an answer (US #4).** The apply rung applies ONLY what the human
  * authored — the recorded `answer:` text. It does NOT fill, guess, or author an
@@ -78,7 +85,7 @@ const APPLIED_HEADING = '## Applied answers';
  * (backward compat — no marker ⇒ nothing to strip ⇒ identical bytes).
  *
  * The sibling task `templates-mark-transient-open-questions-block` introduces
- * the markers in the prd/task templates; this task exports the constants so
+ * the markers in the spec/task templates; this task exports the constants so
  * the two tasks agree on the literal byte sequence.
  */
 export const OPEN_QUESTIONS_MARKER_OPEN = '<!-- open-questions -->';
@@ -195,9 +202,12 @@ function stripOpenQuestionsBlocks(body) {
  *
  *   1. **append / re-pause** — `appendQuestions` is non-empty: append `qN+1…`,
  *      keep `needsAnswers:true`, re-pause (one commit, body + sidecar).
- *   2. **discharge by deletion** — `discharge` is set (the `delete-source`
- *      verdict): `git rm` the source + sidecar in a standalone revertible commit,
- *      the reason in the commit message.
+ *   2. **dispose** — `dispose` is set (the `dispose` verdict): REGIME-POLYMORPHIC
+ *      on the source's type — an OBSERVATION is `git rm`-ed with its sidecar in
+ *      a standalone revertible commit (reason in the message); a TASK is `git
+ *      mv`-ed to `tasks/cancelled/` (`reason:` written into the moved body,
+ *      sidecar `git rm`-ed in the same commit); a SPEC is `git mv`-ed to
+ *      `specs/dropped/` (same shape as the task branch).
  *   3. **resolve fully** (the default) — clear `needsAnswers` + delete the sidecar
  *      in ONE commit; the item advances toward build by its normal lifecycle.
  */
@@ -243,7 +253,7 @@ export function applyAnsweredQuestions(options) {
     const by = options.by || resolveBy(cwd, env);
     // (1) APPEND / RE-PAUSE: the apply has new questions. Append them (`qN+1…`,
     // never mutating an answered entry), stay needsAnswers:true, re-pause. Re-pause
-    // WINS over a discharge — you cannot discharge a source you are still asking
+    // WINS over a dispose — you cannot dispose a source you are still asking
     // about.
     const followups = options.appendQuestions ?? [];
     if (followups.length > 0) {
@@ -268,17 +278,39 @@ export function applyAnsweredQuestions(options) {
             message,
         };
     }
-    // (2) DISCHARGE BY DELETION: the caller decided the source should leave by
-    // deletion (the `delete-source` verdict). `git rm` the source + sidecar in a
-    // STANDALONE revertible commit, the reason in the commit message (git history =
-    // archive). DIRECT — no preview/confirm (decision 12); the human's answer is
-    // the source of truth.
-    if (options.discharge !== undefined) {
-        return dischargeByDeletion({
+    // (2) DISPOSE: the caller decided the source should be DISPOSED (the `dispose`
+    // verdict). REGIME-POLYMORPHIC on the source type (task
+    // `apply-disposition-delete-to-dispose-regime-polymorphic`, spec
+    // `surface-stuck-as-questions-and-retire-stuck-lock-state` decision #5):
+    //   - observation → `git rm` the note + sidecar in one revertible commit
+    //     (reason in the message; notes leave by deletion, decision 12);
+    //   - task → `git mv` to `tasks/cancelled/` (RETAINED; `reason:` written into
+    //     the moved body; sidecar `git rm`-ed in the same commit);
+    //   - spec → `git mv` to `specs/dropped/` (RETAINED, same shape).
+    // DIRECT — no preview/confirm (decision 12); the human's answer is the source
+    // of truth. A TASK is never `git rm`-ed here (true by construction: the
+    // task-branch calls `git mv`, no branch of this dispatcher hard-deletes a
+    // task).
+    if (options.dispose !== undefined) {
+        const { type } = resolveSidecarIdentity(item);
+        if (type === 'observation') {
+            return disposeObservationByDeletion({
+                cwd,
+                item,
+                itemPath,
+                reason: options.dispose.reason,
+                sidecarPath,
+                by,
+                env,
+                note,
+            });
+        }
+        return disposeToTerminal({
             cwd,
             item,
             itemPath,
-            reason: options.discharge.reason,
+            type,
+            reason: options.dispose.reason,
             sidecarPath,
             by,
             env,
@@ -313,23 +345,25 @@ export function applyAnsweredQuestions(options) {
     };
 }
 /**
- * DISCHARGE a source by DELETION (the `delete-source` verdict, US #5/#11): `git
- * rm` the source AND its answered sidecar in ONE STANDALONE commit, the human's
- * discharge reason recorded in the commit MESSAGE (git history is the archive).
- * There is no spawned artifact for a discharge, so the deletion is a standalone
- * commit (a `mint`, by contrast, rides the new artifact's create commit through
- * `promoteObservation`).
+ * DISPOSE an OBSERVATION by DELETION (task
+ * `apply-disposition-delete-to-dispose-regime-polymorphic`; US #5/#11): `git rm`
+ * the observation-note AND its answered sidecar in ONE STANDALONE commit, the
+ * human's dispose reason recorded in the commit MESSAGE (git history = archive).
+ * There is no spawned artifact for a dispose-by-deletion, so the deletion is a
+ * standalone commit (a `mint`, by contrast, rides the new artifact's create
+ * commit through `promoteObservation`).
  *
- * A discharged item leaves by being GONE — no resting body marker, no `triaged:`
- * stamp (the resting-state machinery is retired; an item is still-open, acted-on,
- * or deleted). This is the apply rung applying the human's RATIFIED answer (the
- * deletion is human-authored), and it is git-recoverable (a single revertible
- * commit) — a wrong inference is never catastrophic.
+ * A disposed observation leaves by being GONE — notes have no terminal folder
+ * (decision 12: "notes leave by deletion"), unlike a task/spec which is `git
+ * mv`-ed to its regime's terminal by {@link disposeToTerminal}. This is the
+ * apply rung applying the human's RATIFIED answer (the deletion is
+ * human-authored), and it is git-recoverable (a single revertible commit) — a
+ * wrong inference is never catastrophic.
  */
-function dischargeByDeletion(input) {
+function disposeObservationByDeletion(input) {
     const { cwd, item, itemPath, reason, sidecarPath, by, env, note } = input;
     // `git rm` the source. The sidecar may not exist in every path; rm it too when
-    // present, so the discharge leaves no answered-sidecar residue. Both ride ONE
+    // present, so the dispose leaves no answered-sidecar residue. Both ride ONE
     // commit.
     const rmPaths = [itemPath];
     if (existsSync(join(cwd, sidecarPath))) {
@@ -338,7 +372,7 @@ function dischargeByDeletion(input) {
     gitHard(['rm', '--quiet', '--', ...rmPaths], cwd, env);
     const reasonLine = reason.trim() === '' ? '(no reason given)' : reason.trim();
     const subject = `advance: ${item} → deleted (by ${by})`;
-    const messageBody = `Discharged by deletion (the human's ratified answer authors it; ` +
+    const messageBody = `Disposed by deletion (the human's ratified answer authors it; ` +
         `git history is the archive).\n\nreason: ${reasonLine}`;
     gitHard(['commit', '--quiet', '-m', subject, '-m', messageBody], cwd, env);
     const commit = gitHard(['rev-parse', 'HEAD'], cwd, env).stdout.trim();
@@ -353,6 +387,101 @@ function dischargeByDeletion(input) {
         message,
     };
 }
+/**
+ * The per-regime WON'T-PROCEED TERMINAL folder key {@link disposeToTerminal}
+ * moves a task/spec into. The folder WORDS are deliberately different
+ * (`cancelled` for tasks, `dropped` for specs) so a task and spec sharing a slug
+ * cannot collide on one terminal path — the two regimes have namespaced
+ * terminals by design (spec `surface-stuck-as-questions-and-retire-stuck-lock-
+ * state`, and see `work-layout.ts`). Do NOT rename the folders here; the token
+ * that changed is the verdict outcome (`dispose`), NOT the folder words.
+ */
+const DISPOSE_TERMINAL_FOLDER = {
+    task: 'cancelled',
+    spec: 'specs-dropped',
+};
+/**
+ * DISPOSE a TASK or SPEC to its regime's won't-proceed TERMINAL folder (task
+ * `apply-disposition-delete-to-dispose-regime-polymorphic`, spec
+ * `surface-stuck-as-questions-and-retire-stuck-lock-state` decision #5): `git
+ * mv` the item to `tasks/cancelled/` (task) or `specs/dropped/` (spec), with the
+ * human's dispose reason written into the moved body's `reason:` frontmatter
+ * (durable, in-file archive of WHY the item won't proceed — symmetric across
+ * both regimes; the source of the moved item is the human's ratified answer),
+ * then `git rm` the answered sidecar, all in ONE commit.
+ *
+ * ## Decisions (recorded here per task etiquette)
+ *
+ * - **`reason:` frontmatter, symmetric across task AND spec.** The acceptance
+ *   criteria explicitly require the reason for the task branch; the spec
+ *   branch is only required to `git mv` to `specs/dropped/`. We nonetheless
+ *   write the same `reason:` marker onto a disposed SPEC too, because (a) the
+ *   two regimes are the same shape ("disposed to terminal"), so asymmetric
+ *   behaviour would be a surprise; (b) the spec regime's dropped/ folder had
+ *   no in-file WHY at all before, so any adjacent surface (an operator
+ *   inspecting `specs/dropped/`) would otherwise have to grep the commit
+ *   history for the reason. Setting it uses the same {@link
+ *   setFrontmatterMarker} the surface rung already uses for `needsAnswers`.
+ *   The commit message still carries the reason too (belt + braces — the
+ *   frontmatter is the durable in-file record, the commit is the audit
+ *   history). If a reviewer disagrees they can flip the spec branch back to a
+ *   bare `git mv` in one line — the task branch is the load-bearing acceptance.
+ *
+ * - **The sidecar is `git rm`-ed in the same commit as the mv.** A disposed
+ *   item is no longer in the question-loop (the answer settled it), so the
+ *   sidecar has no reason to survive at the terminal folder. Same commit
+ *   preserves the sidecar's `needsAnswers ⇔ active sidecar` invariant.
+ *
+ * A TASK is NEVER `git rm`-ed on this branch (that is the invariant this
+ * function exists to enforce): the disposal is a `git mv` to `tasks/cancelled/`,
+ * a folder-move that git can revert with a single `git revert`.
+ */
+function disposeToTerminal(input) {
+    const { cwd, item, itemPath, type, reason, sidecarPath, by, env, note } = input;
+    const { slug } = resolveSidecarIdentity(item);
+    const folderKey = DISPOSE_TERMINAL_FOLDER[type];
+    const terminalPath = workItemRel(folderKey, `${slug}.md`);
+    // (a) Rewrite the item body with the `reason:` frontmatter marker BEFORE the
+    // mv so the marker rides the same commit as the terminal move. `git mv` reads
+    // the working-tree file, so a pre-mv rewrite is picked up by the subsequent
+    // stage of the moved path.
+    const reasonLine = reason.trim() === '' ? '(no reason given)' : reason.trim();
+    const itemAbs = join(cwd, itemPath);
+    const rewritten = setFrontmatterMarker(readFileSync(itemAbs, 'utf8'), 'reason', reasonLine);
+    writeFileSync(itemAbs, rewritten);
+    // (b) Ensure the terminal folder exists (git mv fatals on a missing parent).
+    mkdirSync(dirname(join(cwd, terminalPath)), { recursive: true });
+    // (c) `git mv` the source to its regime terminal.
+    gitHard(['mv', '--', itemPath, terminalPath], cwd, env);
+    // (d) `git rm` the answered sidecar (the loop is settled) in the same commit.
+    const rmPaths = [];
+    if (existsSync(join(cwd, sidecarPath))) {
+        rmPaths.push(sidecarPath);
+    }
+    if (rmPaths.length > 0) {
+        gitHard(['rm', '--quiet', '--', ...rmPaths], cwd, env);
+    }
+    // (e) Stage the rewritten (now-moved) body so its `reason:` marker rides the
+    // same commit as the mv.
+    gitHard(['add', '--', terminalPath], cwd, env);
+    const subject = `advance: ${item} → disposed (by ${by})`;
+    const messageBody = `Disposed to regime terminal '${folderKey}' (the human's ratified answer ` +
+        `authors it; git history + terminal folder are the archive).\n\n` +
+        `reason: ${reasonLine}`;
+    gitHard(['commit', '--quiet', '-m', subject, '-m', messageBody], cwd, env);
+    const commit = gitHard(['rev-parse', 'HEAD'], cwd, env).stdout.trim();
+    const message = `applied ${item} → disposed (source git mv-ed to '${terminalPath}', ` +
+        `reason: written into the moved body's frontmatter, sidecar deleted in the ` +
+        `same commit).`;
+    note(message);
+    return {
+        outcome: 'disposed',
+        commit,
+        sidecarPath,
+        itemPath: terminalPath,
+        message,
+    };
+}
 // Re-export the heading constant the tests assert against, so the byte-level
 // marker stays in one place.
 export { APPLIED_HEADING };

package/dist/apply-persist.js.map

@@ -1 +1 @@
-{"version":3,"file":"apply-persist.js","sourceRoot":"","sources":["../src/apply-persist.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apply-persist.js","sourceRoot":"","sources":["../src/apply-persist.ts"],"names":[],"mappings":"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"}

package/dist/apply-stuck-action.d.ts

@@ -0,0 +1,151 @@
+import { type SidecarEntry } from './sidecar.js';
+/**
+ * The **answered STUCK-QUESTION ACTION DISPATCH** (spec
+ * `surface-stuck-as-questions-and-retire-stuck-lock-state`, task
+ * `apply-resolve-reset-flag-discards-work-branch`; user story 2, resolved
+ * decision #6) — the deterministic, answer-driven RUNNER-ACTION layer that
+ * turns an answered `kind: 'stuck'` sidecar entry (the shape the bounce-surface
+ * path stamps when a task's build bounces) into one of three verbs:
+ *
+ *   - `keep`   -> today's continue-from-WIP: leave the `work/<slug>` branch
+ *                alone; the apply rung falls through to the normal
+ *                `applyAnsweredQuestions` resolve so the next claim continues
+ *                from the branch tip.
+ *   - `reset`  -> discard the WIP branch, rebuild clean: DELETE the remote
+ *                `work/<slug>` branch on the arbiter (via the SHARED
+ *                {@link deleteRemoteWorkBranchIfPresent} primitive the
+ *                `requeue --reset` recovery verb also uses) BEFORE the apply
+ *                rung clears `needsAnswers`, so the next claim starts fresh.
+ *                Safely IDEMPOTENT when no branch exists (an observation, or a
+ *                task never built) — a `remote ref does not exist` push error
+ *                is tolerated as an already-gone no-op.
+ *   - `cancel` -> the existing `dispose` terminal: `git mv` the task to
+ *                `tasks/cancelled/` via `applyAnsweredQuestions`' `dispose`
+ *                option (the answer text is recorded as the human's reason).
+ *
+ * A direct SIBLING of the `apply-merge-action.ts` machinery: the apply rung
+ * KIND-CHECKS the sidecar BEFORE the fall-through persist, so an answered
+ * `kind: 'stuck'` entry dispatches HERE deterministically (mirroring how a
+ * `kind: 'merge'` entry dispatches through `apply-merge-action.ts`). There is
+ * NO agentic decider on the TASK apply-persist path (the `runAgenticDecision`
+ * gate at `advance.ts` fires only for `namespace === 'observation'`), so this
+ * MUST be a deterministic parse+dispatch — the flag SOURCE on the task path
+ * (see the task's `## Re-scope 2026-07-14`).
+ *
+ * # Ordering (delete-before-clear) and partial-failure decision
+ *
+ * The `reset` verb DELETES the remote work branch BEFORE the apply rung
+ * clears `needsAnswers`. On a partial failure (arbiter delete FAILS after the
+ * local tracking ref was cleared), we REFUSE the apply and leave the sidecar
+ * in place (`needsAnswers` stays `true`), so the human sees the failure and
+ * can re-answer. The alternative (clear-then-delete, or clear-anyway on a
+ * failed delete) would leave the item `needsAnswers:false` and CLAIMABLE while
+ * still carrying the WIP branch we meant to discard — exactly the stale-
+ * continue trap the `requeue --reset` code path spends a page of comment
+ * defending against. The two callers (this verb + `requeue --reset`) MUST
+ * stay behaviourally identical; both fail the whole recovery on a genuine
+ * push-delete failure. This is the `## Decisions` entry the done record
+ * links.
+ */
+/** The three deterministic verbs a stuck-question answer encodes. */
+export type StuckActionVerb = 'keep' | 'reset' | 'cancel';
+/** A detected, answer-driven stuck-action keyed off ONE answered `kind: 'stuck'` entry. */
+export interface DetectedStuckAction {
+    /** The deterministic verb parsed from the entry's answer text. */
+    verb: StuckActionVerb;
+    /** The answered `kind: 'stuck'` entry the verb came from. */
+    entry: SidecarEntry;
+}
+/**
+ * Parse the human's plain free-text answer into a {@link StuckActionVerb}.
+ * MIRRORS `parseMergeAnswer` EXACTLY: first whole ASCII word, case-insensitive,
+ * trailing commentary tolerated; `undefined` on anything else (empty / typo /
+ * narrative). NEVER default-guesses a destructive `reset` — an ambiguous
+ * answer falls through to today's plain persist (the safe "keep the branch,
+ * clear the flag" behaviour), never invents a branch discard.
+ */
+export declare function parseStuckAnswer(text: string): StuckActionVerb | undefined;
+/**
+ * Detect the `kind: 'stuck'` action verb that should drive the next apply run.
+ *
+ * ORDERING (mirrors `detectAnsweredMergeAction`'s re-stale re-surface rule):
+ *
+ *   1. If ANY `kind: 'stuck'` entry is UNANSWERED, return `undefined` —
+ *      that is the re-paused state (a freshly-appended follow-up awaiting an
+ *      answer), and the apply MUST NOT fire against a stale prior sibling.
+ *   2. Otherwise return the LATEST answered `kind: 'stuck'` entry — a fresh
+ *      follow-up answer wins over the stale one.
+ *
+ * Returns `undefined` on a missing/unparseable sidecar or when no
+ * `kind: 'stuck'` entry parses to one of the three verbs (the apply rung then
+ * falls through to today's plain persist, which is the `keep` semantic — a
+ * malformed answer NEVER discards a branch).
+ */
+export declare function detectAnsweredStuckAction(cwd: string, item: string): DetectedStuckAction | undefined;
+/** Input the production stuck-action handler consumes. */
+export interface StuckActionInput {
+    /** The detected action (verb + source entry). */
+    action: DetectedStuckAction;
+    /** The namespaced item identity (`task:<slug>`). */
+    item: string;
+    /** The bare slug (the work branch is `work/task-<slug>`). */
+    slug: string;
+    /** The apply rung's working clone. */
+    cwd: string;
+    /** The arbiter remote NAME in `cwd` (defaults to `origin`). */
+    arbiter: string;
+    /** Environment for child git processes. */
+    env?: NodeJS.ProcessEnv;
+    /** Sink for human-readable progress notes. */
+    note?: (message: string) => void;
+}
+/** The terminal verbs the dispatcher reports to the apply rung. */
+export type StuckActionOutcome = 
+/** `answer=keep` -> no action; fall through to the normal apply persist. */
+'keep'
+/**
+ * `answer=reset` -> the remote `work/<slug>` branch was DELETED (or was
+ * already gone); fall through to the normal apply persist so
+ * `needsAnswers` clears. The `already-gone` sub-case is the safe idempotent
+ * no-op for an item with no work branch.
+ */
+ | 'reset'
+/**
+ * `answer=cancel` -> the apply rung dispatches through
+ * `applyAnsweredQuestions`' `dispose` option (task -> `tasks/cancelled/`).
+ * The answer text is the human's reason.
+ */
+ | 'cancel'
+/**
+ * `answer=reset` -> the branch delete FAILED (a real push-delete error, not
+ * `already-gone`). The apply rung SHORT-CIRCUITS: the sidecar stays,
+ * `needsAnswers` stays `true`, no clear — the human sees the failure and
+ * re-answers. Matches the `requeue --reset` "abort the requeue on a failed
+ * arbiter delete" behaviour (delete-before-clear ordering, see the module
+ * docs' partial-failure decision).
+ */
+ | 'refused';
+/** What the production handler returns to the apply rung. */
+export interface StuckActionResult {
+    outcome: StuckActionOutcome;
+    /** Human-readable summary for the rung's message. */
+    message: string;
+}
+/**
+ * The injectable dispatch SEAM. Production wires {@link performStuckAction};
+ * tests inject a stub to assert on the apply-rung's routing WITHOUT touching a
+ * real arbiter.
+ */
+export type StuckActionHandler = (input: StuckActionInput) => Promise<StuckActionResult>;
+/**
+ * The PRODUCTION dispatcher: an answered `kind: 'stuck'` entry's verb drives
+ * one of the four terminals (`keep` / `reset` / `refused` / `cancel`). For
+ * `answer=reset` it dispatches through the SHARED
+ * {@link deleteRemoteWorkBranchIfPresent} primitive the `requeue --reset` verb
+ * also uses — delete-before-clear ordering, local-first write-through,
+ * already-gone tolerance (safe no-op when no branch exists). For `keep` and
+ * `cancel` there is nothing to do on the git side; the apply rung's normal
+ * fall-through handles the persist (`cancel` via the `dispose` option).
+ */
+export declare function performStuckAction(input: StuckActionInput): Promise<StuckActionResult>;
+//# sourceMappingURL=apply-stuck-action.d.ts.map

package/dist/apply-stuck-action.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-stuck-action.d.ts","sourceRoot":"","sources":["../src/apply-stuck-action.ts"],"names":[],"mappings":"AAEA,OAAO,EAIN,KAAK,YAAY,EAEjB,MAAM,cAAc,CAAC;AAGtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AAEH,qEAAqE;AACrE,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAE1D,2FAA2F;AAC3F,MAAM,WAAW,mBAAmB;IACnC,kEAAkE;IAClE,IAAI,EAAE,eAAe,CAAC;IACtB,6DAA6D;IAC7D,KAAK,EAAE,YAAY,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAU1E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,yBAAyB,CACxC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GACV,mBAAmB,GAAG,SAAS,CAsBjC;AAED,0DAA0D;AAC1D,MAAM,WAAW,gBAAgB;IAChC,iDAAiD;IACjD,MAAM,EAAE,mBAAmB,CAAC;IAC5B,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,sCAAsC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,8CAA8C;IAC9C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,mEAAmE;AACnE,MAAM,MAAM,kBAAkB;AAC7B,4EAA4E;AAC1E,MAAM;AACR;;;;;GAKG;GACD,OAAO;AACT;;;;GAIG;GACD,QAAQ;AACV;;;;;;;GAOG;GACD,SAAS,CAAC;AAEb,6DAA6D;AAC7D,MAAM,WAAW,iBAAiB;IACjC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,qDAAqD;IACrD,OAAO,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAChC,KAAK,EAAE,gBAAgB,KACnB,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEhC;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACvC,KAAK,EAAE,gBAAgB,GACrB,OAAO,CAAC,iBAAiB,CAAC,CAoD5B"}

package/dist/apply-stuck-action.js

@@ -0,0 +1,125 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { isEntryAnswered, parseSidecar, sidecarPathFor, } from './sidecar.js';
+import { deleteRemoteWorkBranchIfPresent } from './needs-attention.js';
+/**
+ * Parse the human's plain free-text answer into a {@link StuckActionVerb}.
+ * MIRRORS `parseMergeAnswer` EXACTLY: first whole ASCII word, case-insensitive,
+ * trailing commentary tolerated; `undefined` on anything else (empty / typo /
+ * narrative). NEVER default-guesses a destructive `reset` — an ambiguous
+ * answer falls through to today's plain persist (the safe "keep the branch,
+ * clear the flag" behaviour), never invents a branch discard.
+ */
+export function parseStuckAnswer(text) {
+    const trimmed = text.trim().toLowerCase();
+    if (trimmed === '')
+        return undefined;
+    const match = /^([a-z]+)/.exec(trimmed);
+    if (match === null)
+        return undefined;
+    const word = match[1];
+    if (word === 'keep' || word === 'reset' || word === 'cancel') {
+        return word;
+    }
+    return undefined;
+}
+/**
+ * Detect the `kind: 'stuck'` action verb that should drive the next apply run.
+ *
+ * ORDERING (mirrors `detectAnsweredMergeAction`'s re-stale re-surface rule):
+ *
+ *   1. If ANY `kind: 'stuck'` entry is UNANSWERED, return `undefined` —
+ *      that is the re-paused state (a freshly-appended follow-up awaiting an
+ *      answer), and the apply MUST NOT fire against a stale prior sibling.
+ *   2. Otherwise return the LATEST answered `kind: 'stuck'` entry — a fresh
+ *      follow-up answer wins over the stale one.
+ *
+ * Returns `undefined` on a missing/unparseable sidecar or when no
+ * `kind: 'stuck'` entry parses to one of the three verbs (the apply rung then
+ * falls through to today's plain persist, which is the `keep` semantic — a
+ * malformed answer NEVER discards a branch).
+ */
+export function detectAnsweredStuckAction(cwd, item) {
+    const abs = join(cwd, sidecarPathFor(item));
+    if (!existsSync(abs))
+        return undefined;
+    let model;
+    try {
+        model = parseSidecar(readFileSync(abs, 'utf8'));
+    }
+    catch {
+        return undefined;
+    }
+    for (const entry of model.entries) {
+        if (entry.kind === 'stuck' && !isEntryAnswered(entry))
+            return undefined;
+    }
+    for (let i = model.entries.length - 1; i >= 0; i--) {
+        const entry = model.entries[i];
+        if (entry.kind !== 'stuck')
+            continue;
+        if (!isEntryAnswered(entry))
+            continue;
+        const verb = parseStuckAnswer(entry.answer);
+        if (verb !== undefined) {
+            return { verb, entry };
+        }
+    }
+    return undefined;
+}
+/**
+ * The PRODUCTION dispatcher: an answered `kind: 'stuck'` entry's verb drives
+ * one of the four terminals (`keep` / `reset` / `refused` / `cancel`). For
+ * `answer=reset` it dispatches through the SHARED
+ * {@link deleteRemoteWorkBranchIfPresent} primitive the `requeue --reset` verb
+ * also uses — delete-before-clear ordering, local-first write-through,
+ * already-gone tolerance (safe no-op when no branch exists). For `keep` and
+ * `cancel` there is nothing to do on the git side; the apply rung's normal
+ * fall-through handles the persist (`cancel` via the `dispose` option).
+ */
+export async function performStuckAction(input) {
+    const note = input.note ?? (() => { });
+    const { verb } = input.action;
+    if (verb === 'keep') {
+        return {
+            outcome: 'keep',
+            message: `stuck-question for ${input.item} answered KEEP — leaving ` +
+                `\`work/task-${input.slug}\` untouched (continue-from-WIP; the answer ` +
+                `is recorded in the item body via the normal apply path).`,
+        };
+    }
+    if (verb === 'cancel') {
+        return {
+            outcome: 'cancel',
+            message: `stuck-question for ${input.item} answered CANCEL — dispatching ` +
+                `through the \`dispose\` terminal (\`git mv -> tasks/cancelled/\`).`,
+        };
+    }
+    // verb === 'reset'
+    const dropped = await deleteRemoteWorkBranchIfPresent({
+        cwd: input.cwd,
+        arbiter: input.arbiter,
+        slug: input.slug,
+        env: input.env,
+    });
+    if (dropped.status === 'failed') {
+        const stderr = dropped.stderr;
+        const message = `stuck-question for ${input.item} answered RESET — but the arbiter ` +
+            `delete of ${dropped.branch} on ${input.arbiter} failed ` +
+            `(${stderr || 'unknown error'}). NOT clearing needsAnswers; the sidecar ` +
+            `stays surfaced for a re-answer. The local tracking ref was already ` +
+            `cleared (write-through ordering); a subsequent fetch will restore it ` +
+            `from the arbiter — the local store is BEHIND the arbiter ` +
+            `(self-healing), never AHEAD (which would drive a stale continue).`;
+        note(message);
+        return { outcome: 'refused', message };
+    }
+    const droppedLabel = dropped.status === 'deleted'
+        ? `Deleted the remote branch ${dropped.branch} on ${input.arbiter}`
+        : `Remote branch ${dropped.branch} on ${input.arbiter} was already gone`;
+    const message = `stuck-question for ${input.item} answered RESET — ${droppedLabel} ` +
+        `(next claim starts fresh).`;
+    note(message);
+    return { outcome: 'reset', message };
+}
+//# sourceMappingURL=apply-stuck-action.js.map

package/dist/apply-stuck-action.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-stuck-action.js","sourceRoot":"","sources":["../src/apply-stuck-action.ts"],"names":[],"mappings":"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"}

package/dist/brand.d.ts

@@ -48,8 +48,19 @@ export interface Brand {
     readonly base: string;
     /** The shared env-var prefix: `constantCase(base) + '_'` ⇒ `DORFL_`. */
     readonly envPrefix: string;
-    /** The per-repo config filename: `.{paramCase(base)}.json` ⇒ `.dorfl.json`. */
+    /**
+     * The per-repo config filename PREFERRED + written by default:
+     * `{paramCase(base)}.json` ⇒ `dorfl.json` (a plain, non-dotfile name, so it is
+     * visible in a normal `ls` and reads like other tool configs).
+     */
     readonly repoConfigFilename: string;
+    /**
+     * The LEGACY per-repo config filename still honoured on READ for backward
+     * compatibility: `.{paramCase(base)}.json` ⇒ `.dorfl.json` (the original
+     * dotfile form). Reads prefer {@link repoConfigFilename} and fall back to this;
+     * writes/`setup` use {@link repoConfigFilename}.
+     */
+    readonly repoConfigFilenameLegacy: string;
     /** The workspaces-dir name (a dotfile dir): `.{paramCase(base)}` ⇒ `.dorfl`. */
     readonly workdirName: string;
     /** The per-job record filename: `.{paramCase(base)}-job.json` ⇒ `.dorfl-job.json`. */