toga-ai 1.0.292 → 1.0.294

package/knowledge/2.0/apps/_underscore/INDEX.md

@@ -10,7 +10,7 @@
 | [Carrier Shipping Labels (UPS/FedEx) & NetSuite Item Fulfillment](features/carrier-shipping-labels.md) | Backend mechanics behind TOGa Supply's Fulfill & Ship: buying a carrier label (UPS/FedEx), persisting it, and creating the NetSuite Item Fulfillment with tracki | _underscore/Model/Client/ItemFulfillment.php, _underscore/Model/Client/TrackingNumber.php, _underscore/Model/Client/ItemFulfillments/TrackingNumber.php, _underscore/Component/Library/LabelPdf/LabelPdf.php, _underscore/Component/Library/Carriers/ShipmentRequest/ShipmentRequest.php, _underscore/Component/Library/Carriers/Ups/Ups.php, _underscore/Component/Library/Carriers/Fedex/Fedex.php, _underscore/Trait/Netsuite/ItemFulfillment.php, _underscore/Trait/Netsuite/SalesOrder.php, _underscore/Component/Library/NetSuite/NetSuite.php, _underscore/Model/Client/TrackingNumber.php, _underscore/Model/Client/ShippingMethod.php, _underscore/Model.php, _underscore/Cloud.php |
 | [_Component_*/_Model_* project-namespace registration (autoloader) & backslash-qualify traps](features/component-model-namespace-registration.md) | Every **project-local** `_Component_*` and `_Model_*` class in a 2.0 app **must declare the project namespace** at the top of the file: ```php namespace <NAMESP | _underscore/Loader.php, worker2/_.php, api2/_.php, worker2/Component/Forecast/Db/Db.php, worker2/Component/Forecast/SaleImport/SaleImport.php, api2/Component/Api/Netsuite/Netsuite.php |
 | [Client Email Template Sending](features/email-template-sending.md) | `_Model_Client_EmailTemplate` sends a stored, client-defined email template by UUID. | _underscore/Model/Client/EmailTemplate.php, _underscore/Model/Client/EmailTemplateOutgoingEmailAddress.php, _underscore/Email.php |
-| [Error Reporting — Issue/Event Aggregation (exceptionHandler)](features/error-reporting-issue-event.md) | `_underscore`'s global exception handler persists every uncaught exception into a two-table **Issue / Event** model in the **shared Core Logs DB** (`_underscore | _underscore/Error.php, _underscore/Model/Core/Logs/Issue.php, _underscore/Model/Core/Logs/Event.php, dbchanges2/Logs/2026-07-06 - Issue and Event tables.sql |
+| [Error Reporting — Issue/Event Aggregation (agreed POST-to-receiver design)](features/error-reporting-issue-event.md) | Platform-wide error-reporting infrastructure for TOGA 2.0, built around a two-table **Issue / Event** aggregation model in the shared **Core Logs DB**. | _underscore/Error.php, _underscore/Model/Core/Logs/Issue.php, _underscore/Model/Core/Logs/Event.php, dbchanges2/Logs/2026-07-06 - Issue and Event tables.sql |
 | [Record-Changed Event Publishing (_Event::publish to SQS)](features/event-publish-sqs.md) | `_Event::publish()` (in `_underscore/Event.php`) is the PHP side of the real-time event pipeline. | _underscore/Event.php |
 | [Forecast.Sales NetSuite import engine (real-time webhook)](features/forecast-sale-import.md) | Real-time importer that takes a NetSuite **sale** record and writes its lines into `Forecast.Sales` (the Forecast2 revenue table). | _underscore/Component/Forecast/SaleImport/SaleImport.php, _underscore/Component/Forecast/Db/Db.php, _underscore/Component/Api/Netsuite/Netsuite.php, worker2/Worker/Netsuite/Invoice.php, worker2/Worker/Netsuite/CashSale.php, worker2/Worker/Netsuite/CreditMemo.php, worker2/Worker/Netsuite/CashRefund.php, worker2/Worker/Netsuite/JournalEntry.php, worker2/Worker/Netsuite/Opportunity.php, worker2/Worker/Netsuite/SalesOrder.php, dbchanges2/Forecast/2026-06-26a - Add journalEntry to Sales transaction type enum.sql, test/@dave/test_invoice_lifecycle.php, test/@dave/test_je_lifecycle.php, test/@dave/test_creditmemo_lifecycle.php, test/@dave/test_cashsale_lifecycle.php, test/@dave/test_cashrefund_lifecycle.php, test/@dave/test_fetchrecord_routes.php, test/@dave/verify_je_classification.php, test/@dave/probe_je_accounts.php, test/@dave/probe_je_shape.php, test/@dave/fixer.php, test/@dave/Junk Drawer/NetSuite/api-message-queue/ue_api_msg_queue_enqueue.js, test/@dave/Junk Drawer/NetSuite/api-message-queue/dev_ue_api_msg_queue_enqueue.js |
 | [Item-Fulfillment Stage Lifecycle (picked/packed/shipped) & Order Status](features/item-fulfillment-stage-lifecycle-and-order-status.md) | Every ItemFulfillment (IF) now carries an explicit **stage** — picked → packed → shipped — resolved through `ItemFulfillmentStages → ItemFulfillmentStatuses` (m | _underscore/Model/Client/SalesOrder.php, _underscore/Model/Quad/SalesOrder.php, _underscore/Model/Compass/SalesOrder.php, _underscore/Model/Compass/SalesOrderStatus.php, _underscore/Model/Client/SalesOrderItem.php, _underscore/Model/Client/Item.php, _underscore/Model/Client/PurchaseOrderItem.php, library/app/api/toga2.php, dbchanges2/Client/2026-06-30a - BackfillNullStageItemFulfillmentsToShipped.sql, dbchanges2/Client/2026-06-30b - SalesOrderStatusesPickedPacked.sql, dbchanges2/Client/2026-06-30c - ItemFulfillmentStageIdNotNull.sql, dbchanges2/Client_CompassCanada/2026-06-30a - ItemFulfillmentLifecycleAndShippedBackfill.sql |

package/knowledge/2.0/apps/_underscore/features/error-reporting-issue-event.md

@@ -1,12 +1,12 @@
 ---
-title: Error Reporting — Issue/Event Aggregation (exceptionHandler)
+title: Error Reporting — Issue/Event Aggregation (agreed POST-to-receiver design)
 framework: "2.0"
 repo: _underscore
 project: _Underscore
 client: shared
 type: feature
 status: active
-updated: 2026-07-06
+updated: 2026-07-08
 owners: ["dfranks"]
 files:
   - _underscore/Error.php
@@ -21,39 +21,51 @@ related:
 
 ## Summary
 
-`_underscore`'s global exception handler persists every uncaught exception into a
-two-table **Issue / Event** model in the **shared Core Logs DB** (`_underscore::DB_LOGS`,
-models under `Model/Core/Logs/`) — **not** the per-client Logs DB. An **Issue** is the
-deduplicated record for a distinct error (keyed by a hash of the backtrace) carrying an
-aggregate `occurrences` counter; an **Event** is one row per individual occurrence with
-its own stack trace and context. This is platform-wide error-reporting infrastructure,
-not client-specific.
-
-## Key files / entry points
-
-- **`_underscore/Error.php`** — `exceptionHandler()` (registered via
-  `set_exception_handler`). Computes `$issueHash = md5(serialize($backtrace))`, then, only
-  when the Core-Logs register is present (`isset(\_Database::$_registers[_underscore::DB_LOGS])`),
-  upserts an `_Model_Core_Logs_Issue` and inserts an `_Model_Core_Logs_Event`, committing
-  the `DB_LOGS` transaction.
+Platform-wide error-reporting infrastructure for TOGA 2.0, built around a two-table
+**Issue / Event** aggregation model in the shared **Core Logs DB**. An **Issue** is the
+deduplicated record for a distinct error (keyed by a hash of the stack trace) carrying an
+aggregate `occurrences` counter and an escalatable `urgency`; an **Event** is one row per
+individual occurrence with its own trace and context.
+
+**The agreed architecture (see below) decouples *reporting* from *persistence*:**
+application error handlers **POST** error payloads to a centralized `/errors` receiver
+endpoint; a **worker2 cron** consumes them and does all the hashing, upserting, aggregation,
+escalation, and ClickUp sync into the Core Logs DB. Handlers do **not** write Issue/Event
+rows to the database directly. This is the canonical target design for the whole
+error-monitoring epic (TRUE-781xx) — the handler ticket, the dashboard ticket, and the
+escalation-cron ticket must all conform to it.
+
+## Agreed error-monitoring architecture
+
+Source: the **"2026-05-21 - Errors, Monitoring and Alerts"** meeting design (approved;
+cited via Talos DevCore meeting notes). Pipeline:
+
+1. **Report (application side).** An application's error/exception handler serializes the
+   error (message, stack trace, context) and **POSTs it to a centralized `/errors` receiver
+   endpoint** (the meeting referenced `webhook.hub.com/error`). The handler's only job is to
+   transmit — it performs **no direct database persistence**.
+2. **Ingest (worker2 cron).** A worker2 cron consumes the received error payloads and:
+   - builds `issueHash` from the stack trace to identify the distinct error,
+   - **upserts an Issue** and **inserts an Event** into the **Core** Logs DB,
+   - aggregates occurrence counts within a time window,
+   - auto-escalates / de-escalates the Issue `urgency` based on occurrence frequency,
+   - syncs the Issue to ClickUp.
+3. **Scope.** API 2.0 handlers first; 1.0 is deferred.
+
+The critical rule: **handlers POST; the cron persists (to Core).** Any approach where the
+handler writes Issue/Event rows inline to a database contradicts this design.
+
+## Data model (Core Logs DB)
+
 - **`_underscore/Model/Core/Logs/Issue.php`** — `const DATABASE = _underscore::DB_LOGS;
   const TABLE = 'Issues';`. Fields: `id, uuid, dtCreated, dtLastOccurred, urgency, subject,
-  description, clickupIdentifier, hash, errorMessage, occurrences, trace`.
+  description, clickupIdentifier, hash, errorMessage, occurrences, trace`. One row per
+  distinct error (dedup key = `hash`); `occurrences` is the rolling count, `dtLastOccurred`
+  the most-recent hit, `urgency` a list field, `clickupIdentifier` links to an escalation
+  ticket. There is **no `type` column**.
 - **`_underscore/Model/Core/Logs/Event.php`** — `const DATABASE = _underscore::DB_LOGS;
   const TABLE = 'Events';`. Fields: `id, uuid, issueId (FK → Issue), errorMessage, trace,
-  context, dtCreated`.
-
-## How it works
-
-1. On an uncaught exception, hash the backtrace to identify the distinct error.
-2. Load the existing `Issue` by `hash`. On a miss, create it with `errorMessage`, `trace`,
-   `urgency = 'LOW'`, and `occurrences = 0`.
-3. **Increment `occurrences`** (`($issue->occurrences ?? 0) + 1`) and set
-   `dtLastOccurred`, then save — so the counter advances on every occurrence, hit or new.
-4. Insert one `Event` for this occurrence: `issueId`, `errorMessage`, per-occurrence
-   `trace`, and `context` (`print_r($GLOBALS, true)`).
-5. Commit the `DB_LOGS` transaction; surface `Error {issueId}, Event {eventId}` in the
-   debug body.
+  context, dtCreated`. One row per occurrence.
 
 The `Issues`/`Events` tables live in the shared **Core Logs** DB, provisioned from
 `dbchanges2/Logs/` (the `Logs/` folder targets the framework-level, non-tenant `Logs` DB
@@ -61,35 +73,55 @@ with unqualified table names — see the dbchanges2 architecture folder→DB map
 with per-client API/error logging in `Logs_<Tenant>` via `Model/Client/Logs/*`
 (`DB_CLIENT_LOGS`, `dbchanges2/Logs_Client/`).
 
-## Data model
+## Current state of `_underscore/Error.php` (important — reads differently than you'd expect)
+
+`_underscore/Error.php` registers `exceptionHandler()` via `set_exception_handler`, but in
+**`_production` it does NOT persist any Issue/Event rows.** It builds a debug HTML body,
+writes it to an S3 error-details file, and (when a Logs register is present) records a
+single `_Model_Client_Logs_Error` / `_Model_Core_Logs_Error` row — the older flat error log.
+There is no Issue/Event aggregation, no `issueHash` upsert, and no ClickUp escalation in the
+handler on `_production`.
 
-- **Issue** = one row per distinct error (dedup key = `hash`); `occurrences` is the rolling
-  count, `dtLastOccurred` the most-recent hit, `urgency` a list field, `clickupIdentifier`
-  links to an escalation ticket. There is **no `type` column** — it was dropped.
-- **Event** = one row per occurrence, FK `issueId` → Issue, carrying the occurrence's own
-  `trace` and `context`.
+**An inline-DB-persist approach exists on an in-flight branch, but it conflicts with the
+agreed design and must not be treated as the model to follow:** that approach has the
+handler compute `$issueHash = md5(serialize($backtrace))` and directly upsert
+`_Model_Client_Logs_Issue` + insert `_Model_Client_Logs_Event`, committing a transaction —
+i.e. handler-side direct persistence, and to the **Client** Logs DB rather than **Core**.
+That contradicts the approved architecture on two counts: (a) handlers should POST to the
+`/errors` receiver, not persist; and (b) aggregation belongs in the Core Logs DB, driven by
+the worker2 cron. New work (TRUE-78178 handlers) should implement the POST-to-receiver path,
+not extend the inline-persist branch.
 
 ## Gotchas / known issues
 
-- **`occurrences` must be incremented, not just seeded.** It was previously set to `0` only
-  at creation and never advanced, so the aggregate counter never moved. Fixed 2026-07-06 to
+- **Do not assume error persistence "already works."** On `_production` the handler writes
+  only an S3 debug body and a flat `*_Logs_Error` row — no Issue/Event aggregation exists in
+  production yet. The Issue/Event model is the *target*, delivered by the POST→cron pipeline.
+- **`occurrences` must be incremented, not just seeded** — a naive upsert that sets
+  `occurrences = 0` only at creation never advances the aggregate counter. The cron must
   increment on every occurrence.
-- **`Event.trace` must be set per occurrence.** The schema has a per-Event `trace` column
-  that was never populated; now recorded on every Event.
-- **Persistence is conditional on the Core-Logs register.** If
-  `\_Database::$_registers[_underscore::DB_LOGS]` isn't set, the whole Issue/Event block is
-  skipped silently — no error row is written.
+- **`Event.trace` must be populated per occurrence** — the per-Event `trace` column is easy
+  to leave empty; record it on every Event.
+- **Persistence must be conditional on the Core-Logs register.** If the Core Logs register
+  (`\_Database::$_registers[_underscore::DB_LOGS]`) isn't set, an Issue/Event write must be
+  skipped rather than fatal — but this belongs in the cron, not the handler.
+- **Client vs Core Logs DB mix-up.** The Issue/Event tables belong in the **Core** Logs DB
+  (`DB_LOGS`, `Model/Core/Logs/*`). Writing them to a per-client Logs DB
+  (`DB_CLIENT_LOGS`, `_Model_Client_Logs_*`) is the wrong target and does not match the
+  agreed design.
 - **Shared-schema migration collision.** Because `Issues`/`Events` live in the *shared* Core
-  Logs DB, any two dbchanges2 `Logs/` migrations that both `CREATE TABLE Issues`/`Events`
-  will collide — the second fails with "table already exists". Two separate error-reporting
-  workstreams introduced these same tables (one adding the escalation cron + an
-  `IssueEmailAddresses` table, one adding this error-class persistence). Only **one**
-  migration may create the shared tables; reconcile overlapping `Logs/` create-scripts at
-  merge so the tables are created exactly once and later migrations only `ALTER`.
+  Logs DB, two dbchanges2 `Logs/` migrations that both `CREATE TABLE Issues`/`Events` will
+  collide ("table already exists"). Only **one** migration may create the shared tables;
+  later migrations only `ALTER`.
 
 ## Change history
 
-- 2026-07-06 — Moved Issue/Event tables and exceptionHandler persistence from the per-client
-  Logs DB to the shared Core Logs DB and dropped the `type` column; fixed `occurrences` to
-  increment each occurrence and set `Event.trace` per occurrence; removed dead commented-out
-  per-client-logs persistence block. (dfranks)
+- 2026-07-08 — Corrected KB drift: documented the approved 2026-05-21 error-monitoring
+  architecture (handlers POST to a centralized `/errors` receiver; a worker2 cron builds
+  issueHash, upserts Issues + inserts Events into the Core Logs DB, aggregates/escalates,
+  syncs ClickUp — handlers do not persist). Clarified that `_production` Error.php performs
+  no Issue/Event persistence (only an S3 debug body + flat `*_Logs_Error` row), and that the
+  inline-DB-persist approach (handler-side upsert to the *Client* Logs DB) conflicts with the
+  agreed design and is not the pattern to follow. (dfranks)
+- 2026-07-06 — Prior doc described the exceptionHandler as directly persisting Issue/Event
+  rows to the Core Logs DB with dedup; superseded by the 2026-07-08 correction above. (dfranks)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toga-ai",
-  "version": "1.0.292",
+  "version": "1.0.294",
   "description": "TOGA Technology Team Claude Knowledge System — shared AI coding harness with skills, knowledge base CLI, and project installer for Claude Code.",
   "keywords": [
     "claude",

package/skills/work-ticket/SKILL.md

@@ -1,16 +1,18 @@
 ---
 name: work-ticket
-description: Work an APPROVED ClickUp ticket plan end-to-end. Invoke as `/work-ticket <TICKET-ID>` (e.g. `/work-ticket TRUE-79868`) AFTER `/plan-ticket` has pushed an approved plan to the ticket's Pseudocode field. Loads the plan from the ticket's Pseudocode field, primes framework context via /kickoff (self-answered), implements the plan phase-by-phase with TOGA reviewers, then per repo creates a bare ticket-ID branch, commits, pushes, opens a PR, and posts the PR links as a comment on the ticket. Stops after PRs are open for your review — never changes ClickUp ticket status. Trigger on "/work-ticket", "work the ticket", "execute the plan for <ticket>", "build and PR <ticket>", "ship <ticket>".
+description: Work an APPROVED ClickUp ticket plan end-to-end. Invoke as `/work-ticket <TICKET-ID>` (e.g. `/work-ticket TRUE-79868`) AFTER `/plan-ticket` has pushed an approved plan to the ticket's Pseudocode field. Loads the plan from the ticket's Pseudocode field, primes framework context via /kickoff (self-answered), per repo creates and checks out a bare ticket-ID branch from the fresh remote default BEFORE any edits, implements the plan phase-by-phase with TOGA reviewers, then commits, pushes, opens a PR, and posts the PR links as a comment on the ticket. Stops after PRs are open for your review — never changes ClickUp ticket status. Trigger on "/work-ticket", "work the ticket", "execute the plan for <ticket>", "build and PR <ticket>", "ship <ticket>".
 ---
 
-# work-ticket — approved plan → code → branch → commit → PR → ClickUp GitHub tab
+# work-ticket — approved plan → branch → code → commit → PR → ClickUp GitHub tab
 
 The downstream companion to **`/plan-ticket`**. Given a ticket whose plan has already been
 approved and pushed to its **📝 Pseudocode** field, this skill executes that plan: it primes
-context, writes the code, then for **each repo the plan touches** creates a branch named the
-**bare ticket id**, commits, pushes, opens a PR, and posts the PR links as a ticket comment.
+context, then for **each repo the plan touches** creates and checks out a branch named the
+**bare ticket id** (cut from the freshly-fetched remote default) **BEFORE writing any code**,
+writes the code on that branch, commits, pushes, opens a PR, and posts the PR links as a
+ticket comment.
 ClickUp's native GitHub integration *may* surface those PRs in the ticket's **GitHub tab** when
-the repo is connected in ClickUp's GitHub settings (see Step 5b — not guaranteed), because the
+the repo is connected in ClickUp's GitHub settings (see Step 6b — not guaranteed), because the
 ticket id is in the
 branch name (and PR title/body).
 
@@ -62,14 +64,52 @@ Pass them as the trailing argument so kickoff goes straight to preflight + primi
 /kickoff <framework> <layer>, repos: <repos>, client: <client> — execute <TICKET> <title>
 ```
 
-Carry the `context-primer` briefing (framework rules, gotchas, client variations) into Step 3 —
+Carry the `context-primer` briefing (framework rules, gotchas, client variations) into Step 4 —
 it directly informs how each phase is implemented. Only stop to ask the developer if a kickoff
 gate answer is genuinely ambiguous after reading the plan header.
 
-## Step 3 — Execute the plan, phase by phase
+## Step 3 — Per repo: create & checkout the ticket branch BEFORE any edits
+
+**Branch FIRST, edit SECOND — never write a single line while sitting on `_main`/`_production`
+or on another ticket's branch.** Two reasons this ordering is mandatory:
+
+1. **Safety** — if work-in-progress gets committed (by you, a hook, or the developer), it lands
+   on the ticket branch, never on a default branch that deploys to prod.
+2. **Fresh base** — edits are made against the CURRENT remote default, not a stale local
+   checkout. (Real incident: a local `_production` was 12 commits behind and the target file had
+   changed upstream — editing before branching would have based the PR on stale code and
+   silently reverted the upstream changes.)
+
+For **each repo in the plan's `Repos:` header**, run inside that repo's path:
+
+```bash
+# 0. Working tree must be clean before starting — surface any stray edits to the developer
+git -C "<repo-path>" status --porcelain
+# 1. Resolve the repo's REAL default branch (e.g. _production for app repos, _main for dbchanges2)
+DEFAULT=$(gh repo view <owner/repo> --json defaultBranchRef -q .defaultBranchRef.name)
+# 2. Fetch so the base is current
+git -C "<repo-path>" fetch origin --quiet
+# 3. Reuse an existing TRUE-XXXX branch if present; otherwise cut a fresh one from origin/<default>
+git -C "<repo-path>" rev-parse --verify TRUE-XXXX 2>/dev/null \
+  && git -C "<repo-path>" checkout TRUE-XXXX \
+  || git -C "<repo-path>" checkout -b TRUE-XXXX "origin/$DEFAULT"
+```
+
+- Branch name = **bare ticket id** (team convention; what ClickUp's GitHub integration links on).
+- If `git status` shows uncommitted changes from a prior task, **stop and ask the developer**
+  before touching that repo — do not stash someone's work silently.
+- If reusing an existing `TRUE-XXXX` branch, still fetch and consider rebasing onto
+  `origin/<default>` so the PR diff stays current.
+- **Never branch off / commit to `_main`/`_production` directly**, and **never force-push**
+  (per `git-workflow.md`).
+
+Only after every in-scope repo is sitting on its ticket branch do you start writing code.
+
+## Step 4 — Execute the plan, phase by phase
 
 Implement the plan against the **real repo paths** (resolve each from the `repo-path-<repo>`
-memory kickoff established; never guess paths). For non-trivial work drive it as implement →
+memory kickoff established; never guess paths) — each repo already checked out on its ticket
+branch from Step 3. For non-trivial work drive it as implement →
 verify with subagents so the conversation stays the conductor:
 
 1. For each **phase** in the plan, an implementer subagent writes that phase's code at the
@@ -94,34 +134,13 @@ verify with subagents so the conversation stays the conductor:
 
 Do **not** push anything to a remote or open a PR until the code is implemented and clean.
 
-## Step 4 — Per repo: branch (bare ticket id), commit, push
+## Step 5 — Per repo: commit & push
 
 For **each repo in the plan's `Repos:` header** that has changes, run inside that repo's path:
 
-1. **Branch — bare ticket id, based on the CURRENT remote default.** This matches the team
-   convention (existing branches are `TRUE-79142`, `TRUE-77219`) and is exactly what ClickUp's
-   GitHub integration auto-links on. **The branch MUST be cut from freshly-fetched
-   `origin/<default>` — never from whatever local branch the repo happens to be sitting on.** A
-   working checkout is frequently parked on a *different, unmerged ticket's branch* (or a stale
-   local default); branching off that silently bases your PR on someone else's unmerged work and
-   produces a wrong, conflict-prone diff. So always **fetch first, then branch off the remote
-   default**, carrying your uncommitted Step 3 changes onto the new branch:
-   ```bash
-   # Resolve the repo's REAL default branch (e.g. _production for app repos, _main for dbchanges2)
-   DEFAULT=$(gh repo view <owner/repo> --json defaultBranchRef -q .defaultBranchRef.name)
-   git -C "<repo-path>" fetch origin --quiet
-   # Reuse an existing TRUE-XXXX branch if present; otherwise cut a fresh one from origin/<default>.
-   git -C "<repo-path>" rev-parse --verify TRUE-XXXX 2>/dev/null \
-     && git -C "<repo-path>" checkout TRUE-XXXX \
-     || git -C "<repo-path>" checkout -b TRUE-XXXX "origin/$DEFAULT"
-   ```
-   `git checkout -b … origin/$DEFAULT` keeps your uncommitted working-tree edits and re-bases them
-   onto the latest remote default in one step. **First confirm `git status` shows only the files
-   your plan changed** (no stray edits from a prior ticket) before branching. If the checkout is
-   refused because a file you edited also changed on the default, `git stash` → `checkout -b … origin/$DEFAULT`
-   → `git stash pop` and resolve. **Never branch off / commit to `_main`/`_production` directly**,
-   and **never force-push** (per `git-workflow.md`). If already on the `TRUE-XXXX` branch, still
-   `git fetch` and consider rebasing onto `origin/<default>` so the PR diff stays current.
+1. **Verify the branch.** Confirm `git branch --show-current` is the `TRUE-XXXX` branch from
+   Step 3 — if the repo somehow ended up back on a default branch, go redo Step 3 for it before
+   committing anything.
 2. **Commit.** Stage only the files the plan changed. Message format `type: short description`
    (`feat`/`fix`/`refactor`/`docs`/`test`/`chore`, lowercase, present tense, ≤72 chars). Add a
    body paragraph for substantial changes. **Pre-commit check:** `php -l` passes on changed PHP,
@@ -130,7 +149,7 @@ For **each repo in the plan's `Repos:` header** that has changes, run inside tha
 
 Repeat for every in-scope repo — one branch per repo, all named the same bare ticket id.
 
-## Step 5 — Open a PR per repo (auto-links to the ClickUp GitHub tab)
+## Step 6 — Open a PR per repo (auto-links to the ClickUp GitHub tab)
 
 For each pushed repo, open a PR with `gh` from that repo's path:
 
@@ -158,7 +177,7 @@ gh pr create --repo <owner/repo> --base <DEFAULT-BRANCH> --head <TICKET> \
 - End the PR body with the standard footer:
   `🤖 Generated with [Claude Code](https://claude.com/claude-code)`.
 
-### Step 5b — Post the PR links as a ClickUp comment (the RELIABLE link — do NOT skip)
+### Step 6b — Post the PR links as a ClickUp comment (the RELIABLE link — do NOT skip)
 
 **The native GitHub↔ClickUp tab is NOT reliable in this workspace.** It only populates if each
 repo is connected under ClickUp → Settings → Integrations → GitHub (a one-time workspace OAuth
@@ -181,12 +200,12 @@ fetch("https://api.clickup.com/api/v2/task/<TICKET>/comment?custom_task_ids=true
 (A comment does NOT populate the GitHub *tab* — it lands in the ticket's activity/comments —
 but it is the dependable way for the developer to reach the PRs from the ticket.)
 
-## Step 6 — Report & stop (do NOT touch ClickUp status)
+## Step 7 — Report & stop (do NOT touch ClickUp status)
 
 Summarize for the developer:
 - Ticket title and the repos that got changes.
 - For each repo: the branch name (`<TICKET>`) and the **PR url** `gh` returned.
-- Confirm the Step 5b comment was posted (the reliable link). State plainly that the GitHub
+- Confirm the Step 6b comment was posted (the reliable link). State plainly that the GitHub
   **tab** populates only if the repos are connected in ClickUp's GitHub integration settings —
   do not claim it will appear automatically.
 - **Remind the developer the next step is theirs:** review/approve the PR(s), then **manually
@@ -207,7 +226,7 @@ Offer `/capture` if a durable, KB-worthy finding emerged while implementing.
 - **Linking is NOT automatic.** The native GitHub tab requires a per-repo connection in ClickUp's
   GitHub integration settings (workspace OAuth, not doable from `gh`). The branch name + bare-id
   PR title + `CU-<internalId>` in the body are necessary but **not sufficient** — if the repo
-  isn't connected, the tab stays empty. Step 5b's comment is the reliable link; always post it.
+  isn't connected, the tab stays empty. Step 6b's comment is the reliable link; always post it.
 - **Autonomy boundary:** autonomous through PR creation; stops there. Moving the ClickUp ticket
   is always a manual developer action.
 - Run AFTER `/plan-ticket` has produced and the developer has approved a plan. This skill does