@event4u/agent-config 16.3.0 → 16.5.0

package/dist/agent-src/commands/commit.md

@@ -57,7 +57,13 @@ If there are no uncommitted changes (staged or unstaged), report "Nothing to com
 
 ### 2. Determine the ticket number
 
-- Extract the ticket ID from the current branch name (e.g. `feat/DEV-1234/...` → `DEV-1234`).
+- Read the ticket from the current branch name:
+  `agent-config git:convention ticket --keys "<the ticket_keys line of the approved convention card>"`
+  (no card → no `--keys`). The first line is `ticket <ID>` or `ticket none`
+  (`feat/DEV-1234/...`, `fix/DEV-1234-quantity` → `DEV-1234`; `fix/CVE-2026-12345-patch` → none).
+  A candidate marked `unknown-key` → ask the user whether it is a ticket; a yes
+  adds its key to the card's `ticket_keys`. A `proposal` line → offer it for the
+  card, never write it unasked.
 - If no ticket ID is found in the branch name, ask the user:
   ```
   > No Jira ticket found in branch name. Do you want to include one?
@@ -65,8 +71,9 @@ If there are no uncommitted changes (staged or unstaged), report "Nothing to com
   > 1. Yes — I'll provide the ticket number
   > 2. No — skip ticket number
   ```
-- If the user provides a ticket number, use it as the scope in all commit messages.
-- If skipped, omit the scope entirely — write `chore: ...` not `chore(): ...`.
+- Place the ticket (given or read) in every message per the convention in force —
+  [`commit-subject`](../../../skills/git-workflow/references/commit-subject.md) § Placing the ticket;
+  skipped → omit it, never `chore(): …`.
 
 ### 3. Analyze the changes
 
@@ -95,6 +102,43 @@ once the user resolves it (move to a store, or add an audited
 `# secret-allow` / `.secret-allow` entry for a confirmed false positive). Never
 silently commit a secret; never silently strip one.
 
+### 3c. Establish the convention — once per repository
+
+Before any subject is generated, run
+`agent-config git:convention show --key commit_format`. It prints
+`no convention established — run git:convention measure` only when there is
+no declaration, no approved card and no commitlint config; otherwise skip this step.
+
+1. Run `agent-config git:convention measure`. Its `verdict` line is the input to
+   the one question below; the thresholds behind it are the `measure` rows of
+   [`commit-subject`](../../../skills/git-workflow/references/commit-subject.md) § The grammar.
+2. Ask **once**, as numbered options, naming the family, its share, the capped
+   total and the author count from the verb's output:
+   - `verdict established: <family>` → the established family (recommended) vs
+     Conventional Commits;
+   - `verdict below the bar` → the two strongest families (each with its share)
+     vs Conventional Commits, quoting the verb's reasons.
+3. Run `agent-config git:convention measure --family <answer>` (Conventional
+   Commits is `--family conventional`) and write its `card` block to
+   `agents/memory/curated/conventions/approved/commit-subject.md` — **also when
+   the answer is Conventional Commits**, so this question is never asked again in
+   this repository. The card is the one file this command writes. Stage it
+   explicitly with `git add -- agents/memory/curated/conventions/approved/commit-subject.md`
+   and commit it in the first commit of this run — the commit it was approved
+   for — so a worktree or a fresh clone reads the same answer instead of asking
+   again; name it in the report.
+4. When the same output carries a `team file` block, show it: it is the
+   ready-to-commit `.git-convention.yml` (`commit_format`, `branch_pattern`,
+   never `update_strategy`). Ask once whether to create it. Only on the user's
+   explicit yes this turn run `agent-config git:convention init --yes` with the
+   shown values (`--commit-format`, `--branch-pattern`); it creates the file once,
+   refuses when one exists and never commits it — name it in the report. On no,
+   print the content for a human to create and commit. Never write the file by
+   hand, and never change an existing one.
+
+Then generate every subject under the answer: `git:convention subject` reads the
+card the moment it exists.
+
 ### 4. Plan the commits
 
 For each logical group, determine the commit message following the commit conventions rule
@@ -107,40 +151,42 @@ Rules for splitting:
 - **Style-only changes** (formatter / auto-refactor output — ECS, Prettier, Ruff) may get their own `style:` or `chore:` commit
   if they are large and mixed with logic changes.
 
-### 5. Present the commit plan (verbosity-gated)
-
-Read `verbosity.preview_artifacts` and `verbosity.routine_confirmations`
-from `.agent-settings.yml`. Both default to `false`.
+### 5. Present the commit plan
 
-**Terse path** — `preview_artifacts: false` AND `routine_confirmations: false`:
+**Terse path** — the default; there is no setting that turns it off:
 
-1. Validate every generated commit message against the
-   conventional-commits regex
-   `^(feat|fix|chore|docs|refactor|test|perf|style|build|ci|revert)(\([^)]+\))?!?: .+`.
+1. Pipe every generated subject, one per line, through
+   `agent-config git:convention subject` — it resolves the convention in force
+   and validates against it. Act on the exit code: `0` valid · `1` the output
+   lists each failure and its rule → treat as invalid. A `note:` line naming a
+   `commit-msg` hook or a commitlint config means that validator also runs at
+   commit and may be stricter; it never changes the exit.
 2. **All messages valid** → skip the preview block and the confirmation
    prompt. Print one line summarising the plan and proceed to step 6:
 
    ```
-   → 3 commits planned: feat, test, chore (scope: DEV-1234)
+   → 3 commits planned: feat, test, chore (ticket: DEV-1234)
    ```
 
 3. **Any message invalid** → `preview-on-error` safety net fires:
-   force the full preview block below + the numbered confirm prompt,
-   regardless of the two flags. The user must approve before step 6.
+   force the full preview block below + the numbered confirm prompt.
+   The user must approve before step 6.
 4. **Hard-Floor diff** (bulk deletion ≥5 unrelated files, infra changes
    touching Terraform / Pulumi / k8s / Ansible / cloud-config) →
-   ALWAYS preview + confirm regardless of flags, per
+   ALWAYS preview + confirm, per
    [`non-destructive-by-default`](../rules/non-destructive-by-default.md).
 
-**Preview path** — `preview_artifacts: true` OR `routine_confirmations: true`
-(or `preview-on-error` triggered):
+**Preview path** — `preview-on-error` or a Hard-Floor diff triggered it, or the
+user asked for the preview (override below):
 
 Show the proposed commits as a numbered list, including which files go into each:
 
 ```
 Proposed commits:
 
-(Laravel-project example)
+(Laravel-project example, `git.commit_format: ticket-scope`; under
+`ticket-conventional` the first subject reads
+`DEV-1234 feat(working-time): add absence type filter to working time report`)
 1. feat(DEV-1234): add absence type filter to working time report
    → app/Services/WorkingTimeService.php
    → app/Http/Controllers/WorkingTimeController.php
@@ -163,8 +209,8 @@ Then ask:
 Wait for the user's response before doing anything.
 
 **Override:** the user may force the preview at any time with
-*"show me the commit plan first"* / *"preview commits"* — treat as a
-one-shot `preview_artifacts: true` for this invocation.
+*"show me the commit plan first"* / *"preview commits"* — take the preview
+path for this invocation.
 
 ### 6. Commit
 
@@ -175,26 +221,19 @@ For each planned commit in order:
 1. Stage only the files for that commit: `git add {files...}`
 2. Commit: `git commit -m "{message}"`
 
-### 7. Report (verbosity-gated)
-
-Read `verbosity.post_action_reports` from `.agent-settings.yml` (default
-`minimal`).
-
-- `off` → emit nothing.
-- `minimal` (default) → one line:
+### 7. Report
 
-  ```
-  → 3 commits created
-  ```
+One line:
 
-- `full` → multi-line summary: number of commits + commit messages
-  (one per line).
+```
+→ 3 commits created
+```
 
 ## Rules
 
 - **Preview path: never commit before the user confirms the plan — once, for the whole plan.** On the terse path (`preview_artifacts: false` AND `routine_confirmations: false`) the `/commit` invocation itself is the confirmation (`commit-policy` exception 3); proceed without a prompt.
 - **Never push** — pushing is left to the user.
-- **Never modify files** — only stage and commit existing changes.
+- **Never modify files** — only stage and commit existing changes. The one exception is the convention card step 3c writes after the user's answer, committed with the first commit of the run.
 - **Do NOT add untracked files** unless they are clearly part of the change (check with `git status`).
 - **Follow commit conventions** as defined in `.augment/rules/commit-conventions.md`.
 

package/dist/agent-src/commands/condense.md

@@ -89,15 +89,9 @@ Must show ✅ (`dist/agent-src/` in sync with source).
 Must show **zero 🔴 errors**. Warnings (🟡) are acceptable.
 If any 🔴 errors remain: go back and fix those files before finishing.
 
-## Step 5: Summary (verbosity-gated)
+## Step 5: Summary
 
-Read `verbosity.post_action_reports` from `.agent-settings.yml` (default
-`minimal`).
-
-- `off` → emit nothing on success; surface errors only.
-- `minimal` (default) → one line: `→ N files synced`.
-- `full` → multi-line table with per-category stats (files synced,
-  stale files reaped).
+One line on success: `→ N files synced`. Errors are always surfaced.
 
 ## Iron Laws — preserved by construction
 

package/dist/agent-src/commands/council/debate.md

@@ -67,20 +67,24 @@ this automatically when invoked via `debate`). The estimate covers
 projection. Surface the projection to the user with a clear note that
 progressive disclosure may stop the debate early.
 
-### 4. Spend bound (ask when a billable member has no ceiling)
+### 4. Spend projection (information, never a prompt)
 
-Per [`ai-council` skill § Procedure 3](../../skills/ai-council/SKILL.md)
-and ADR-230, surface the projected total spend in every case, and ask
-only when a billable member is in the fan-out AND both
-`cost_budget.max_total_usd` and `daily_limit_usd` are `0`.
+Per [`ai-council` skill § Procedure 3](../../skills/ai-council/SKILL.md),
+ADR-230 and ADR-279, surface the projected total spend in every case and
+**do not ask** because no cap is set. A cap nobody configured is not a
+bound, and its absence is not a reason to ask.
 
 A debate multiplies the per-round cost by `N`, so quote the worst case,
 not one round — that is what a ceiling has to cover. The between-rounds
 confirmation gate is unaffected: it is a separate, per-round control and
 it still fires, which is where a debate that turns out expensive gets
-stopped.
+stopped. `debate.max_cost_usd` likewise still refuses above whatever
+figure someone set; it ships at `0`, i.e. no refusal cap.
 
-Numbered options, when the ask applies:
+The round shape is still the user's choice, and it is not a spend
+question — it decides whether the between-round confirmation fires,
+which this change does not touch. Offer it regardless of whether a cap
+is set:
 
 > The debate is projected to cost **$X.XXXX** ($Y.YYYY × N rounds, worst case).
 >

package/dist/agent-src/commands/council/default.md

@@ -151,22 +151,23 @@ Construct each member from the resolved mode:
 - `manual` → `ManualClient` from `scripts.ai_council.clients`
   (`billable=False`, no API key, no SDK call).
 
-### 3. Spend bound — ASK when a billable member has no ceiling
+### 3. Spend estimate — information, never a prompt
 
-Council calls to billable members spend money, so a bound is mandatory.
-Per ADR-230 the bound is a **ceiling**, not a per-invocation approval —
-the same three cases the `ai-council` skill resolves in its Procedure § 3:
+Per ADR-230 the bound is a **ceiling**, not a per-invocation approval,
+and per ADR-279 a ceiling applies only where someone set one. The three
+cases the `ai-council` skill resolves in its Procedure § 3 now agree on
+the ask and differ only in what a cap does once it exists:
 
 | Situation | Behaviour |
 |---|---|
 | No billable member (all `mode: cli`, subscription auth) | No gate. Estimate is information; go to Step 4. Spend is $0. |
 | Billable member **with** `cost_budget.max_total_usd` or `daily_limit_usd` non-zero | No per-run ask. The ceiling is the authorization the user already gave; `on_overrun` still pauses per member on breach. |
-| Billable member with **both** caps `0` | **Ask.** Nothing bounds the spend, so the user must. |
+| Billable member with **both** caps `0` — the shipped default | No ask. Render the estimate and go to Step 4; no cap exists, so nothing can breach. |
 
-`personal.autonomy` neither creates nor lifts that bound — autonomy is
-not a ceiling. Consumers who want a per-invocation gate set a small
-`cost_budget.max_total_usd`; every call then breaches and `on_overrun`
-asks per member.
+`personal.autonomy` neither creates nor lifts a bound — autonomy is
+not a ceiling, and neither is its absence. Consumers who want a
+per-invocation gate set a small `cost_budget.max_total_usd`; every call
+then breaches and `on_overrun` asks per member.
 
 Run the CLI in **estimate** mode first — it bundles the artefact, runs
 redaction, and prints the per-member preview without spending:

package/dist/agent-src/commands/council.md

@@ -34,7 +34,7 @@ sub-command swaps the mode-specific addendum.
 
 1. Resolve the target + capture the original ask.
 2. Check the council is configured + price table fresh.
-3. Spend bound (ask only when a billable member has no ceiling — ADR-230).
+3. Spend estimate — rendered as information, never a prompt (ADR-230, ADR-279).
 4. Run the CLI.
 5. Render the report (5 / 5a / 5b — render → critical lens → user options).
 6. Hard floor — text only.

package/dist/agent-src/commands/design.md

@@ -32,7 +32,7 @@ adds a router rather than a 295th entry to it.
 | Verb | Routes to | What it does |
 |---|---|---|
 | `audit` | `agent-config ui:audit` | Inventory the tree into `agents/runtime/state/ui-audit.json`. Class A. |
-| `render` | `agent-config ui:render` | Capture desktop / 375 / 320 into `agents/runtime/state/render/`. Class A. |
+| `render` | `agent-config ui:render` | Capture desktop / 375 / 320 into `agents/runtime/state/render/`; `--profile asset` renders one SVG per asset class on a light and a dark background instead. Class A. |
 | `review` | [`design-review`](../../../skills/design-review/SKILL.md) | Two-pass review — judgement before detector, or the `DEGRADED: single-context` banner. |
 | `polish` | [`fe-design`](../../../skills/fe-design/SKILL.md) | Spacing, rhythm, alignment. |
 | `quieter` | `fe-design` | Spacing, weight, contrast within the palette. |

package/dist/agent-src/commands/estimate-ticket.md

@@ -28,7 +28,7 @@ packs:
 Accept the same four input paths as [`/refine-ticket`](refine-ticket.md):
 
 1. **Explicit key** — `/estimate-ticket PROJ-123`
-2. **Branch detection** — no arg → `git branch --show-current` + regex `[A-Z]+-[0-9]+`
+2. **Branch detection** — no arg → `agent-config git:convention ticket` on the current branch ([`commit-subject`](../../../skills/git-workflow/references/commit-subject.md) § Reading the ticket)
 3. **Pasted text** — markdown block under the command
 4. **URL** — `/estimate-ticket https://…/browse/PROJ-123`
 

package/dist/agent-src/commands/feature/explore.md

@@ -38,8 +38,8 @@ Before entering brainstorm mode, check whether the input looks like an
 **existing ticket** rather than a fresh idea. If any of the following
 match, surface the hint below and let the user pick:
 
-- A Jira/Linear URL is present (`https://.../browse/[A-Z]+-[0-9]+`)
-- The current branch name contains a ticket key (`[A-Z]+-[0-9]+`)
+- A Jira/Linear URL is present (`https://.../browse/<ticket key>`)
+- The current branch name contains a ticket key (`agent-config git:convention ticket` prints one)
 - The pasted text contains structured AC bullets (`- [ ]`, "Acceptance Criteria", "AC:")
 
 Prompt:
@@ -56,7 +56,7 @@ continue with Step 2.
 ### 2. Gather external context
 
 **Auto-detect ticket from branch:**
-Run `git branch --show-current` and extract ticket IDs (pattern: `[A-Z]+-[0-9]+`).
+Read the ticket ID from the current branch with `agent-config git:convention ticket` ([`commit-subject`](../../../../skills/git-workflow/references/commit-subject.md) § Reading the ticket).
 
 If a ticket ID is found:
 ```

package/dist/agent-src/commands/feature/plan.md

@@ -53,7 +53,7 @@ Then, once that is answered:
 ### 2. Gather external context
 
 **Auto-detect ticket from branch:**
-Run `git branch --show-current` and extract ticket IDs (pattern: `[A-Z]+-[0-9]+`).
+Read the ticket ID from the current branch with `agent-config git:convention ticket` ([`commit-subject`](../../../../skills/git-workflow/references/commit-subject.md) § Reading the ticket).
 
 If a ticket ID is found:
 ```

package/dist/agent-src/commands/fix/ci.md

@@ -96,8 +96,21 @@ branch** — that is what makes the deliverable remote. Then:
 1. Commit the fix (chunked, the agent picks the split per
    [`commit-policy`](../../../rules/commit-policy.md) — never ask how).
 2. Update the branch against its PR base first:
-   `./scripts-run src/scripts/sync_pr_branch`, then regenerate any derived files
-   the merge touched (`task sync && task generate-tools`). A PR left behind its
+   `agent-config git:convention sync --base origin/<base>`, `<base>` being the
+   `baseRefName` of the branch's `OPEN` pull request (`gh pr view --json
+   state,baseRefName`; a closed or merged one does not count) — otherwise, and
+   without `--base`, the target is the default branch, wrong for any other base — then regenerate any derived files
+   the merge touched (`task sync && task generate-tools`). Under
+   `git.update_strategy: rebase` the script refuses a behind branch (exit 3); rebase on the user's request
+   instead ([`branch-update`](../../../../skills/git-workflow/references/branch-update.md)),
+   never merge the base in. An exit 3 whose line reads `TARGET_POLICY_STALE`
+   is not this branch's update: the branch is current with the pull request's
+   non-default target, and that target is itself behind the default branch its
+   convergence policy requires, so a rebase cannot clear it — report it as the target's update and leave the branch. On exit 4 the strategy could not be read — a
+   settings file that does not parse, a value outside the schema, or a value
+   only a user-global file sets; the line names the reason code and the file.
+   Nothing was merged: stop, report that line, and do not push until the file
+   is fixed. A PR left behind its
    base accumulates conflicts for the moment someone wants to merge it, and a
    push against a moved base is rejected — both cost a round trip that this one
    call prevents.
@@ -107,7 +120,8 @@ branch** — that is what makes the deliverable remote. Then:
    settle the check set on the new head. Report the *remote* verdict, never the
    local one.
 
-Bounded by N=3 per failing target ([`autonomous-execution`](../../../rules/autonomous-execution.md)).
+Bounded by the `execution.fix_loop_max` budget (default 10) and its ladder,
+per failing target ([`autonomous-execution`](../../../rules/autonomous-execution.md)).
 
 ### Rules
 

package/dist/agent-src/commands/fix/commit-messages.md

@@ -62,8 +62,15 @@ Stop and report — do not proceed to step 2 — when any holds:
 Run `## Procedure: Establish the house convention` from
 [`conventional-commits-writing`](../../../skills/conventional-commits-writing/SKILL.md)
 verbatim: tier-1 sources first (opened and read, never taken from a grep hit),
-then the capped-weighted consensus pass with bots, merges, reverts and release
-automation excluded.
+then the capped-weighted consensus pass — `agent-config git:convention measure` — with bots, merges, reverts and release
+automation excluded. When that tier-1 search found no configured source, a
+declared `git.commit_format: ticket-conventional` (the skill's tier 1b; `ticket-scope`
+is the template default and declares nothing) is the target: report it as
+`Declared : git.commit_format: …`, skip step 3's style question, and keep the
+other authorisations. A configured source always outranks it — including step
+3's tier-1 veto.
+
+Ticket reading, placement and precedence: [`commit-subject`](../../../../skills/git-workflow/references/commit-subject.md).
 
 Report what it found, in one block, before offering anything:
 
@@ -190,7 +197,7 @@ Then, in one block, state:
   for a branch a teammate already has;
 - whether the range crosses the **default branch** — rewriting merged history
   is a different order of disruption and gets its own sentence;
-- the backup ref you are about to write.
+- the recovery ref you are about to write.
 
 **Ask for the rewrite and, when the range is already pushed, the force-push in
 the same block.** [`git-history-discipline`](../../../rules/git-history-discipline.md)
@@ -207,10 +214,19 @@ Wait. Do not run anything in the turn you ask.
 
 ### 7. Rewrite
 
-**7a. Backup, and capture what the verification will compare against.**
+**7a. Pin the published ref, keep the old head, and capture what the
+verification will compare against.** When the range is already pushed, first
+run the `resolve` block of
+[`branch-update.md` § The rebase sequence](../../../../skills/git-workflow/references/branch-update.md#the-rebase-sequence)
+to set `REMOTE` and `RB` — never `@{u}`, which is the base for a branch pushed
+without `-u`. An unresolved target means no rewrite.
 
 ```bash
-git tag "backup/pre-message-fix-$(date +%Y%m%d-%H%M%S)"
+PUBLISHED=$(git ls-remote "$REMOTE" "refs/heads/$RB") \
+  || { echo "STOP: could not read $REMOTE/$RB — nothing was rewritten" >&2; exit 1; }   # pushed range only
+EXPECTED=$(cut -f1 <<<"$PUBLISHED")
+SAVE="refs/agent-config/rewrites/$(date -u +%Y%m%dT%H%M%SZ)-msgfix/before"
+git update-ref "$SAVE" HEAD
 git rev-list --count HEAD > /tmp/precount.txt
 git log ${BASE:+$BASE..}HEAD --pretty=format:'%aN%x09%aE%x09%ad%x09%s' > /tmp/preplan.txt
 ```
@@ -229,17 +245,21 @@ bracketed form:
 ```bash
 git filter-repo --force --refs "${BASE:+$BASE..}HEAD" \
   --commit-callback '
-    import re
+    import json, re, subprocess
     ME = {b"me@example.com"}                  # the step-5 address set, bare, no <>
-    PAT = re.compile(rb"^\[?([A-Z][A-Z0-9]+-[0-9]+)\]?[: ]\s*(.+)$")
     if len(commit.parents) > 1:
         return
     if commit.author_email not in ME:
         return
     subject, sep, body = commit.message.partition(b"\n")
-    m = PAT.match(subject)
-    if m:
-        commit.message = b"[" + m.group(1) + b"] " + m.group(2) + sep + body
+    out = subprocess.run(["agent-config", "git:convention", "ticket", subject.decode(), "--json"],
+                         capture_output=True, text=True, check=True).stdout
+    ticket = json.loads(out)["ticket"]
+    if ticket is None:
+        return
+    lead = re.compile(rb"^\[?" + re.escape(ticket.encode()) + rb"\]?[: ]\s*")
+    if lead.match(subject):
+        commit.message = b"[" + ticket.encode() + b"] " + lead.sub(b"", subject, count=1) + sep + body
   '
 ```
 
@@ -254,10 +274,12 @@ rewriting nothing:
   cross-wire precisely because they need opposite forms.
 - **Merges are skipped in the callback too**, or the rewrite touches commits the
   step-6 table did not list.
-- **`PAT` and the replacement are the step-3 pattern**, substituted for real.
-  A callback that references a helper nothing defines is not a callback that
-  failed loudly — Python evaluates the name only if control reaches it, so a
-  wrong author filter hides the missing helper completely.
+- **The ticket comes from `agent-config git:convention ticket`**, never a regex
+  literal, so the rewrite reads tickets exactly as `/commit` does — the verb must
+  be on `PATH`, and `check=True` makes a missing one fail loudly. A callback that
+  references a helper nothing defines is not a callback that failed loudly —
+  Python evaluates the name only if control reaches it, so a wrong author filter
+  hides the missing helper completely.
 
 `--refs` implies partial mode, which is what keeps the `origin` remote that
 plain `filter-repo` strips as a safety measure; `--partial` is not needed
@@ -286,7 +308,7 @@ not exit that state.
 
 ```bash
 git rev-list --count HEAD                                  # equals /tmp/precount.txt
-git diff <backup-tag> HEAD --stat                          # MUST be empty
+git diff "$SAVE" HEAD --stat                             # MUST be empty
 git log ${BASE:+$BASE..}HEAD --pretty=format:'%aN%x09%aE%x09%ad%x09%s' > /tmp/postplan.txt
 diff /tmp/preplan.txt /tmp/postplan.txt
 ```
@@ -304,21 +326,24 @@ The authorisation was taken in step 6, together with the rewrite's. Push in this
 turn:
 
 ```bash
-git push --force-with-lease origin <branch>
-git log --oneline -3 origin/<branch>
+git push --force-with-lease="refs/heads/$RB:$EXPECTED" "$REMOTE" "HEAD:refs/heads/$RB"
+[ "$(git ls-remote "$REMOTE" "refs/heads/$RB" | cut -f1)" = "$(git rev-parse HEAD)" ]
 ```
 
-`--force-with-lease`, never bare `--force`. Leave the backup tag in place. Tell
-the user its name, and that recovery is `git reset --hard <backup-tag>` — plus a
-force-push, since the rewrite was already pushed.
+The lease carries the SHA pinned in 7a, never a bare `--force-with-lease`, and
+never `--force`; a rejected lease is a stop — refetch and report. Leave the
+recovery ref in place: it lives outside `refs/tags/`, so `git push --tags`
+cannot publish it. Tell the user its name, that recovery is
+`git reset --keep <ref>` — plus a leased force-push, since the rewrite was
+already pushed — and that `git update-ref -d <ref>` removes it.
 
 ### 9. Report
 
 - Convention chosen, and how it was established (measured / user-supplied / tier-1).
 - Range, author scope, commits rewritten vs unchanged.
 - The `diff /tmp/preplan.txt /tmp/postplan.txt` result and the
-  `git diff <backup-tag> HEAD --stat` result, both quoted.
-- The backup tag and the one-line recovery command.
+  `git diff <recovery-ref> HEAD --stat` result, both quoted.
+- The recovery ref and the one-line recovery command.
 - Whether it was pushed, and to where.
 
 ## Do NOT
@@ -329,7 +354,7 @@ force-push, since the rewrite was already pushed.
   instruction — and never by offering it as a menu option they did not raise.
 - Do NOT compare `commit.author_email` against a bracketed address, or pass a
   bare address to `--author`.
-- Do NOT treat an empty `git diff <backup> HEAD` as proof the rewrite happened.
+- Do NOT treat an empty `git diff <recovery-ref> HEAD` as proof the rewrite happened.
 - Do NOT use `git filter-branch`, bare `git push --force`, or `--no-verify`.
 - Do NOT rewrite into a style the repo's own validator rejects.
 - Do NOT let a chosen style carry an attribution trailer, a subject emoji, or

package/dist/agent-src/commands/fix/pr-comments.md

@@ -183,13 +183,10 @@ already live.
   `"The fallback covers legacy data where getTime() returns a string."`
 - Never start multiple replies with "Fixed". Mix it up: "Done", "Good catch", "Yep", etc.
 
-### Bot icon prefix
+### No bot icon prefix
 
-Read `personal.pr_comment_bot_icon` from `.agent-settings.yml`. If `true` (default),
-prefix every reply with `🤖 ` so reviewers can see at a glance that the reply was
-bot-authored.
-
-Example: `🤖 Good catch, fixed.`
+Never prefix a reply with `🤖 ` — it is on the universal blacklist of
+[`no-decorative-emojis-in-git-surfaces`](../../../rules/no-decorative-emojis-in-git-surfaces.md).
 
 If `false` or `.agent-settings.yml` doesn't exist, do NOT add the prefix.
 

package/dist/agent-src/commands/implement-ticket.md

@@ -29,8 +29,8 @@ packs:
 Accept one of five input paths:
 
 1. **Explicit key** — `/implement-ticket PROJ-123`
-2. **Branch detection** — no arg → `git branch --show-current` + regex
-   `[A-Z]+-[0-9]+`
+2. **Branch detection** — no arg → `agent-config git:convention ticket` on the
+   current branch ([`commit-subject`](../../../skills/git-workflow/references/commit-subject.md) § Reading the ticket)
 3. **Pasted text** — markdown block under the command
 4. **URL** — `/implement-ticket https://…/browse/PROJ-123`
 5. **Local ticket bundle** — a path to a bundle ticket file,
@@ -131,7 +131,7 @@ On exit `1`, look at the first line after `[halt] outcome=… step=…`:
   options verbatim, wait for the user, write their answer back onto the
   matching state slice, then re-run the engine. Never guess.
 
-A **cross-source discrepancy** discovered while planning or applying — ticket text contradicting an attached mockup, a spec silent on a clearly-needed behavior, or a spec-vs-codebase conflict (per [`cross-source-consistency`](../rules/cross-source-consistency.md), gated by `consistency.cross_source`) — is a blocking user question, not a silent resolution: surface it as the `questions[0]` halt and wait, never expand scope on a plausible inference.
+A **cross-source discrepancy** discovered while planning or applying — ticket text contradicting an attached mockup, a spec silent on a clearly-needed behavior, or a spec-vs-codebase conflict (per [`cross-source-consistency`](../rules/cross-source-consistency.md)) — is a blocking user question, not a silent resolution: surface it as the `questions[0]` halt and wait, never expand scope on a plausible inference.
 
 ### 4. Directive mapping
 

package/dist/agent-src/commands/memory/add.md

@@ -121,22 +121,10 @@ link resolves. Broken link → block and ask the user to fix.
 - Duplicate of an existing entry (step 2) — update instead.
 - Missing `source:` — an entry without evidence cannot be reviewed.
 
-## Output format (verbosity-gated)
-
-Read `verbosity.post_action_reports` from `.agent-settings.yml` (default
-`minimal`).
-
-- `off` → emit nothing on success; surface gate failures only.
-- `minimal` (default) → one line:
-  `✅  Added <type>/<id> (gate: PASS)`.
-- `full` → multi-line block:
-
-  ```
-  ✅  Added <type>/<id> (confidence: <high|medium|low>)
-     Path: agents/memory/<type>.yml (or agents/memory/<type>/<hash>.yml)
-     Gate: scripts/check_memory.ts → PASS
-     Next: commit and link from the relevant skill/command.
-  ```
+## Output format
+
+One line on success: `✅  Added <type>/<id> (gate: PASS)`. Gate failures are
+always surfaced.
 
 ## See also
 

package/dist/agent-src/commands/memory/load.md

@@ -134,15 +134,15 @@ After step 4, count unreviewed intake entries for the same type:
   node -e "const d = []; process.stdin.on('data', c => d.push(c)); process.stdin.on('end', () => console.log(JSON.parse(d.join('')).length))"
 ```
 
-Read `memory.review_threshold` from `.agent-settings.yml` (default 10).
-If the count is **0** or **≤ threshold**, skip this step silently. If
-**> threshold**, surface a numbered preview of the top-3 highest-
+The threshold is a fixed **10** (the `memory.review_threshold` key was retired
+on 2026-10-09 with that default as the behavior). If the count is **≤ 10**,
+skip this step silently. If **> 10**, surface a numbered preview of the top-3 highest-
 confidence intake signals (see
 [`memory-consolidation`](../../skills/memory-consolidation/SKILL.md)
 § Phase 3 for the consolidation contract):
 
 ```
-> ⚠️  {N} unreviewed intake signals for `{type}` (threshold {T}).
+> ⚠️  {N} unreviewed intake signals for `{type}` (threshold 10).
 >     Top 3 by confidence:
 >
 >     1. [conf=high] {sig-id} — {one-line observation}
@@ -156,8 +156,7 @@ confidence intake signals (see
 ```
 
 Default action is **skip** — the load completes regardless. This is a
-nudge, not a gate. If `memory.review_threshold` is `0`, skip this
-step entirely (feature off). Never auto-promote.
+nudge, not a gate. Never auto-promote.
 
 ## When to reject
 

package/dist/agent-src/commands/memory/promote.md

@@ -205,23 +205,10 @@ git push -u origin memory/promote-<curated-id>
 # Then route to /create-pr with the memory-promote template hint.
 ```
 
-### 7. Report (verbosity-gated)
+### 7. Report
 
-Read `verbosity.post_action_reports` from `.agent-settings.yml` (default
-`minimal`).
-
-- `off` → emit nothing on success; surface errors only.
-- `minimal` (default) → one line:
-  `→ Promoted <sig-id> → <curated-id> (PR: <url or branch>)`.
-- `full` → multi-line block:
-
-  ```
-  > ✅ Promotion drafted.
-  > - Signal:   <sig-id>
-  > - Curated:  <curated-id> in agents/memory/<type>.yml
-  > - PR:       <url or branch name>
-  > - Next:     review + merge
-  ```
+One line on success: `→ Promoted <sig-id> → <curated-id> (PR: <url or branch>)`.
+Errors are always surfaced.
 
 ## Safety