@outerlayer/cli 0.22.1 → 0.23.0

package/dist/{work-claim-cmd-4PLDTEZR.js → work-claim-cmd-FPJXQAXP.js}

@@ -1,26 +1,26 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
 import { RUNNER_PROTOCOL } from './chunk-TPKYTORP.js';
-import { resolveCredentials, WorkCommandError, parsePositiveInt, postJson, environmentFacts, findLiveItemForIssue } from './chunk-BET347JZ.js';
-export { WorkCommandError } from './chunk-BET347JZ.js';
-import './chunk-QOALB6ZD.js';
-import './chunk-JRCSET55.js';
-import './chunk-G3IJ3N6F.js';
-import './chunk-EAQSOE62.js';
-import './chunk-F35VMF5M.js';
+import { resolveCredentials, WorkCommandError, parsePositiveInt, postJson, environmentFacts, findLiveItemForIssue } from './chunk-C64D7HR3.js';
+export { WorkCommandError } from './chunk-C64D7HR3.js';
+import './chunk-ZLZ3XVPI.js';
+import './chunk-GXV73IIS.js';
+import './chunk-BUP5N3X6.js';
+import './chunk-XSPA5ODY.js';
+import './chunk-GOSFARMS.js';
 import { defaultRunnerConfigPath } from './chunk-V5CG75NX.js';
 import './chunk-UXYLWVTQ.js';
 import './chunk-7RQ73DLO.js';
-import { defaultFetch } from './chunk-QF7WZUU6.js';
-import './chunk-NTRCK4NH.js';
+import { defaultFetch } from './chunk-QS43O4DR.js';
 import './chunk-BJ3KTMDH.js';
-import './chunk-AEKSX4EY.js';
-import './chunk-EABW6AJQ.js';
+import './chunk-CBCKD6DO.js';
 import './chunk-ANPNT6PM.js';
+import './chunk-EABW6AJQ.js';
 import './chunk-WZBHBH3J.js';
 import './chunk-CRB3POP4.js';
-import './chunk-7VUK5RFS.js';
+import './chunk-QZBXLLTV.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
+import './chunk-RA3O54FC.js';
 import { ensureHostKey } from './chunk-OW52QLK3.js';
 import './chunk-IHNQWF6F.js';
 import './chunk-URWYRAIC.js';
@@ -116,7 +116,7 @@ async function runWorkRelease(opts) {
       { sessionId, ended: true },
       fetchImpl
     );
-    const { markWorkLeaseRenewed } = await import('./hook-fast-O3UUN6SO.js');
+    const { markWorkLeaseRenewed } = await import('./hook-fast-27SHD72I.js');
     markWorkLeaseRenewed(sessionId, opts.home ?? homeFromEnv(env));
     const output2 = opts.json ? JSON.stringify(data2) : `released session ${sessionId}'s lease on #${itemId}, if it held one`;
     if (!opts.quiet) process.stdout.write(output2 + "\n");

package/dist/{work-cmd-KWHAYUYB.js → work-cmd-FMPDXPU6.js}

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-export { WorkCommandError, environmentFacts, findLiveItemForIssue, getJson, parsePositiveInt, patchJson, postJson, resolveCredentials, runWorkBuild, runWorkLinkSession, runWorkList, runWorkRemove, runWorkStatus } from './chunk-BET347JZ.js';
-import './chunk-QOALB6ZD.js';
-import './chunk-JRCSET55.js';
-import './chunk-G3IJ3N6F.js';
-import './chunk-EAQSOE62.js';
-import './chunk-F35VMF5M.js';
-import './chunk-QF7WZUU6.js';
-import './chunk-NTRCK4NH.js';
+export { WorkCommandError, environmentFacts, findLiveItemForIssue, getJson, parsePositiveInt, patchJson, postJson, resolveCredentials, runWorkBuild, runWorkLinkSession, runWorkList, runWorkRemove, runWorkStatus } from './chunk-C64D7HR3.js';
+import './chunk-ZLZ3XVPI.js';
+import './chunk-GXV73IIS.js';
+import './chunk-BUP5N3X6.js';
+import './chunk-XSPA5ODY.js';
+import './chunk-GOSFARMS.js';
+import './chunk-QS43O4DR.js';
 import './chunk-BJ3KTMDH.js';
-import './chunk-AEKSX4EY.js';
-import './chunk-EABW6AJQ.js';
+import './chunk-CBCKD6DO.js';
 import './chunk-ANPNT6PM.js';
+import './chunk-EABW6AJQ.js';
 import './chunk-WZBHBH3J.js';
 import './chunk-CRB3POP4.js';
-import './chunk-7VUK5RFS.js';
+import './chunk-QZBXLLTV.js';
 import './chunk-VNVZDWO3.js';
+import './chunk-RA3O54FC.js';
 import './chunk-OW52QLK3.js';
 import './chunk-IHNQWF6F.js';
 import './chunk-URWYRAIC.js';

package/dist/{work-comment-cmd-4CUI7ZDE.js → work-comment-cmd-ZVUE2IUN.js}

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { resolveCredentials, postJson, getJson } from './chunk-BET347JZ.js';
-import { detectActiveSession } from './chunk-QOALB6ZD.js';
-import './chunk-JRCSET55.js';
-import { sanitizeTerminal } from './chunk-G3IJ3N6F.js';
-import './chunk-EAQSOE62.js';
-import './chunk-F35VMF5M.js';
-import { defaultFetch } from './chunk-QF7WZUU6.js';
-import './chunk-NTRCK4NH.js';
+import { resolveCredentials, postJson, getJson } from './chunk-C64D7HR3.js';
+import { detectActiveSession } from './chunk-ZLZ3XVPI.js';
+import './chunk-GXV73IIS.js';
+import { sanitizeTerminal } from './chunk-BUP5N3X6.js';
+import './chunk-XSPA5ODY.js';
+import './chunk-GOSFARMS.js';
+import { defaultFetch } from './chunk-QS43O4DR.js';
 import './chunk-BJ3KTMDH.js';
-import { resolveRepoIdentity } from './chunk-AEKSX4EY.js';
-import './chunk-EABW6AJQ.js';
+import { resolveRepoIdentity } from './chunk-CBCKD6DO.js';
 import { C } from './chunk-ANPNT6PM.js';
+import './chunk-EABW6AJQ.js';
 import { parseTrackerNumber, trackerNumberError } from './chunk-WZBHBH3J.js';
 import './chunk-CRB3POP4.js';
-import './chunk-7VUK5RFS.js';
+import './chunk-QZBXLLTV.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
+import './chunk-RA3O54FC.js';
 import './chunk-OW52QLK3.js';
 import './chunk-IHNQWF6F.js';
 import './chunk-URWYRAIC.js';

package/dist/{work-logs-cmd-AF253WLM.js → work-logs-cmd-CQH2SYT4.js}

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { resolveCredentials, getJson } from './chunk-BET347JZ.js';
-import './chunk-QOALB6ZD.js';
-import './chunk-JRCSET55.js';
-import './chunk-G3IJ3N6F.js';
-import './chunk-EAQSOE62.js';
-import './chunk-F35VMF5M.js';
-import { defaultFetch } from './chunk-QF7WZUU6.js';
-import './chunk-NTRCK4NH.js';
+import { resolveCredentials, getJson } from './chunk-C64D7HR3.js';
+import './chunk-ZLZ3XVPI.js';
+import './chunk-GXV73IIS.js';
+import './chunk-BUP5N3X6.js';
+import './chunk-XSPA5ODY.js';
+import './chunk-GOSFARMS.js';
+import { defaultFetch } from './chunk-QS43O4DR.js';
 import './chunk-BJ3KTMDH.js';
-import './chunk-AEKSX4EY.js';
-import './chunk-EABW6AJQ.js';
+import './chunk-CBCKD6DO.js';
 import './chunk-ANPNT6PM.js';
+import './chunk-EABW6AJQ.js';
 import { parseTrackerNumber, trackerNumberError } from './chunk-WZBHBH3J.js';
 import './chunk-CRB3POP4.js';
-import './chunk-7VUK5RFS.js';
+import './chunk-QZBXLLTV.js';
 import './chunk-VNVZDWO3.js';
+import './chunk-RA3O54FC.js';
 import './chunk-OW52QLK3.js';
 import './chunk-IHNQWF6F.js';
 import './chunk-URWYRAIC.js';

package/dist/{work-open-pr-cmd-JETE6HRL.js → work-open-pr-cmd-YY2OGJOI.js}

@@ -1,23 +1,23 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { itemLabel, runWorkPr, WorkPrCommandError } from './chunk-3V5C64Y5.js';
-import { resolveCredentials } from './chunk-BET347JZ.js';
-import './chunk-QOALB6ZD.js';
-import './chunk-JRCSET55.js';
-import './chunk-G3IJ3N6F.js';
-import './chunk-EAQSOE62.js';
-import './chunk-F35VMF5M.js';
-import { defaultFetch } from './chunk-QF7WZUU6.js';
-import './chunk-NTRCK4NH.js';
+import { itemLabel, runWorkPr, WorkPrCommandError } from './chunk-6AOZD3LY.js';
+import { resolveCredentials } from './chunk-C64D7HR3.js';
+import './chunk-ZLZ3XVPI.js';
+import './chunk-GXV73IIS.js';
+import './chunk-BUP5N3X6.js';
+import './chunk-XSPA5ODY.js';
+import './chunk-GOSFARMS.js';
+import { defaultFetch } from './chunk-QS43O4DR.js';
 import './chunk-BJ3KTMDH.js';
-import './chunk-AEKSX4EY.js';
-import './chunk-EABW6AJQ.js';
+import './chunk-CBCKD6DO.js';
 import { C } from './chunk-ANPNT6PM.js';
+import './chunk-EABW6AJQ.js';
 import { parseWorkItemEnv } from './chunk-T2Q7ISPE.js';
 import './chunk-WZBHBH3J.js';
 import './chunk-CRB3POP4.js';
-import './chunk-7VUK5RFS.js';
+import './chunk-QZBXLLTV.js';
 import { homeFromEnv } from './chunk-VNVZDWO3.js';
+import './chunk-RA3O54FC.js';
 import './chunk-OW52QLK3.js';
 import './chunk-IHNQWF6F.js';
 import './chunk-URWYRAIC.js';

package/dist/{work-pr-cmd-V5G4CPMG.js → work-pr-cmd-EHFTEVJO.js}

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-export { WorkPrCommandError, itemLabel, runWorkPr } from './chunk-3V5C64Y5.js';
-import './chunk-QOALB6ZD.js';
-import './chunk-JRCSET55.js';
-import './chunk-G3IJ3N6F.js';
-import './chunk-EAQSOE62.js';
-import './chunk-F35VMF5M.js';
-import './chunk-QF7WZUU6.js';
-import './chunk-NTRCK4NH.js';
+export { WorkPrCommandError, itemLabel, runWorkPr } from './chunk-6AOZD3LY.js';
+import './chunk-ZLZ3XVPI.js';
+import './chunk-GXV73IIS.js';
+import './chunk-BUP5N3X6.js';
+import './chunk-XSPA5ODY.js';
+import './chunk-GOSFARMS.js';
+import './chunk-QS43O4DR.js';
 import './chunk-BJ3KTMDH.js';
-import './chunk-AEKSX4EY.js';
-import './chunk-EABW6AJQ.js';
+import './chunk-CBCKD6DO.js';
 import './chunk-ANPNT6PM.js';
+import './chunk-EABW6AJQ.js';
 import './chunk-T2Q7ISPE.js';
 import './chunk-WZBHBH3J.js';
 import './chunk-CRB3POP4.js';
-import './chunk-7VUK5RFS.js';
+import './chunk-QZBXLLTV.js';
 import './chunk-VNVZDWO3.js';
+import './chunk-RA3O54FC.js';
 import './chunk-OW52QLK3.js';
 import './chunk-IHNQWF6F.js';
 import './chunk-URWYRAIC.js';

package/dist/{work-stop-cmd-FIEKUDGE.js → work-stop-cmd-LGWSBSBT.js}

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { resolveCredentials, postJson, WorkCommandError } from './chunk-BET347JZ.js';
-import './chunk-QOALB6ZD.js';
-import './chunk-JRCSET55.js';
-import './chunk-G3IJ3N6F.js';
-import './chunk-EAQSOE62.js';
-import './chunk-F35VMF5M.js';
-import { defaultFetch } from './chunk-QF7WZUU6.js';
-import './chunk-NTRCK4NH.js';
+import { resolveCredentials, postJson, WorkCommandError } from './chunk-C64D7HR3.js';
+import './chunk-ZLZ3XVPI.js';
+import './chunk-GXV73IIS.js';
+import './chunk-BUP5N3X6.js';
+import './chunk-XSPA5ODY.js';
+import './chunk-GOSFARMS.js';
+import { defaultFetch } from './chunk-QS43O4DR.js';
 import './chunk-BJ3KTMDH.js';
-import './chunk-AEKSX4EY.js';
-import './chunk-EABW6AJQ.js';
+import './chunk-CBCKD6DO.js';
 import './chunk-ANPNT6PM.js';
+import './chunk-EABW6AJQ.js';
 import { parseTrackerNumber, trackerNumberError } from './chunk-WZBHBH3J.js';
 import './chunk-CRB3POP4.js';
-import './chunk-7VUK5RFS.js';
+import './chunk-QZBXLLTV.js';
 import './chunk-VNVZDWO3.js';
+import './chunk-RA3O54FC.js';
 import './chunk-OW52QLK3.js';
 import './chunk-IHNQWF6F.js';
 import './chunk-URWYRAIC.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outerlayer/cli",
-  "version": "0.22.1",
+  "version": "0.23.0",
   "description": "OuterLayer CLI — commands: init, claude, connect, doctor, login, logout, sync, daemon (alias: watch), emit, work, spec, runner, hooks, mcp, import, context. Capture and sync coding-agent sessions, and record proof of factory work.",
   "license": "Apache-2.0",
   "author": "Magu Studios, Inc.",

package/skill-pack/maintained/outerlayer-amend/SKILL.md

@@ -3,9 +3,10 @@ name: outerlayer-amend
 description: >
   Answer the review threads waiting on an agent on an open pull request: read each
   thread a person handed to an agent, fix what it says on the pull request's branch,
-  reply on the thread with a replacement artifact or a sentence, and push. Use when a
-  work item has threads waiting on an agent, or when asked to "answer the review" or
-  "fix what the reviewer failed". Invoke with /outerlayer-amend.
+  reply on the thread with a replacement artifact or a sentence, and push. Also resolve a
+  merge conflict with the base branch. Use when a work item has threads waiting on an
+  agent or a conflicting pull request, or when asked to "answer the review" or "fix what
+  the reviewer failed". Invoke with /outerlayer-amend.
 ---
 
 Run the CLI as `outerlayer`. If that command is not on PATH, run `npx -y @outerlayer/cli` with the same arguments. Every `outerlayer ...` command below follows this rule.
@@ -13,11 +14,10 @@ Run the CLI as `outerlayer`. If that command is not on PATH, run `npx -y @outerl
 Answer every thread waiting on an agent on one work item's pull request, then
 stop. A work item has one general thread and one thread per acceptance
 criterion. A person's fail on the general thread leaves it waiting on an agent.
-A note a reviewer sent with Request changes (a sent note) leaves its criterion
-thread waiting on an agent. A plain comment from a person does not hand a
-thread to an agent. The person's newest comment says what they want. This
-skill never records a verdict. Only a person passes or fails a thread. A
-session can only reply.
+A note a reviewer sent with Request changes (a sent note) does the same to its
+criterion thread. A plain comment from a person does not hand a thread to an
+agent. The person's newest comment says what they want. Only a person passes
+or fails a thread. A session can only reply.
 
 A session never records a pass or fail on an artifact.
 
@@ -26,129 +26,130 @@ request's branch first if the working tree is not already on it.
 
 ## Arguments
 
-- `--unattended`: no person is watching. Never ask a question. Anything that
-  needs a person becomes a hand-off (step 6), never a stop that leaves a thread
-  silently waiting on an agent.
+- `--unattended`: no person is watching. Never ask a question. A need for a
+  person becomes a hand-off (step 7), never a silent stop.
 
 ## Builds and local sessions
 
 A session a runner started for the item is a build. `OUTERLAYER_JOB_DIR` is
-set in a build and nowhere else. The GitHub token a runner gives a build can
-read the issue and the pull request but cannot comment on either. In the
-runner's own build environments, git pushes go through the runner, not
-straight to the git host. A local session uses the person's own git remote and
-`gh` login.
+set in a build and nowhere else. A build's GitHub token cannot comment on the
+issue or the pull request, and its git pushes go through the runner. A local
+session uses the person's own git remote and `gh` login.
 
 ## Several repositories
 
-A build can hold several repositories. `OUTERLAYER_REPOSITORIES` lists them,
-each with its `path`, `branch` and whether it is `primary`. The item can have a
-pull request in more than one of them. Make each fix in the checkout of the
-repository whose pull request the thread is about, and commit and push in each
-checkout you change. A push goes only to that checkout's own branch.
+`OUTERLAYER_REPOSITORIES` lists the repositories of a build, each with its
+`path`, `branch` and whether it is `primary`. The item can have a pull request
+in more than one. Make each fix in the checkout of the repository whose pull
+request the thread is about. Commit and push in each checkout you change, to
+its own branch only.
 
 ## Steps
 
-1. **Read the threads.**
+1. **Resolve a merge conflict.** Run
+   `outerlayer work status --item "$OUTERLAYER_WORK" --json`. For each
+   `pullRequests` entry, compare `conflict.headSha` with `git rev-parse HEAD`
+   in that repository's checkout. Skip an entry whose `conflict` is `null` or
+   differs: a push has moved the head. Do this before any thread, and go on
+   even when none waits.
+   For a matching entry, merge the base branch into the pull request's branch.
+   Never rebase and never force-push. Follow
+   `.outerlayer/skills/outerlayer-cli/references/merge-base-branch.md`. Run the
+   pre-push gate in the foreground. Name the base sha in the merge commit.
+   Push, then answer the threads.
+   **Hand off a conflict you cannot resolve.** If the resolution needs a
+   product decision, or the gate stays red after one fix, abort the merge.
+   Push nothing. Post on the general thread with `--ready`. Name the
+   conflicting files, the base commits behind them and the decision needed.
+   Tell the person to fail the general thread with their answer.
+2. **Read the threads.**
    `outerlayer work threads --item "$OUTERLAYER_WORK" --json` prints
    `{ "general": <thread>, "criteria": [<thread>, ...] }`. Each thread carries
    `criterion` (null for the general thread), `waitingOn` (`agent`, `person` or
    null), `verdict`, `proof` and `comments`. Each comment carries `author`
    (`kind` is `person` or `agent`), `body`, `action` and `artifact`. Keep the
-   threads whose `waitingOn` is `agent`. One send of notes starts one run, so
-   expect several criterion threads and the general thread together. If none is
-   waiting, say so and stop: there is nothing to answer. Then read
-   `outerlayer work status --item "$OUTERLAYER_WORK" --json` for the pull
-   request in `pullRequests` (`repository`, `prNumber`).
-2. **Re-orient.** Read the issue the item names from the status JSON's
-   `issue`, OuterLayer's copy of it, which needs no tracker credential:
-   `issue.body` is its description in Markdown. Read the pull request,
-   including its evidence comment, through the git host. The
-   issue body is the spec. Find each thread's criterion there. Read every
-   person's comment since the last agent comment on the thread. Read them
-   literally: they are the reviewer's instruction.
-3. **Decide each thread.** Reply on every criterion thread waiting on an
+   threads whose `waitingOn` is `agent`: one send of notes can leave several.
+   If none is waiting and step 1 resolved no conflict, say so and stop: there
+   is nothing to answer. Take the pull request (`repository`, `prNumber`) from
+   the `pullRequests` of the status JSON you read in step 1.
+3. **Re-orient.** The status JSON's `issue.body` is OuterLayer's copy of the
+   issue. It is the spec: find each thread's criterion there. Read the pull
+   request, with its evidence comment, through the git host. Read every person's comment since the last agent
+   comment on the thread. Read them literally.
+4. **Decide each thread.** Reply on every criterion thread waiting on an
    agent, with `--criterion`, so each note gets its answer under it. Read each
    note and pick one:
    - **Answer it.** A question gets an answer. Reply with the answer and
      change nothing. Say which file or test you looked at.
-   - **Fix it.** A requested change gets a fix. The comment names something the
-     change got wrong or did not show. Change the code, tests, docs or evidence
-     so the criterion is met as written, and attach new proof when the
+   - **Fix it.** A requested change gets a fix. Change the code, tests, docs or
+     evidence so the criterion is met as written, and attach new proof when the
      criterion declares one.
-   - **The spec is wrong.** The comment shows the criterion cannot be met as
-     written, for example because it names a path a repository rule forbids. A
-     session never rewrites a criterion on its own. Hand it off (step 6), naming
-     the exact wording change the owner should make.
+   - **The spec is wrong.** The criterion cannot be met as written, for
+     example because it names a path a repository rule forbids. A session never
+     rewrites a criterion. Hand it off (step 7), naming the wording change the
+     owner should make.
    - **Cannot tell.** The comment is ambiguous. Hand it off with `--ready`:
-     quote it and ask one question back.
-4. **Fix, prove, reply.** An answer needs no commit: reply on its criterion
+     quote it and ask one question.
+5. **Fix, prove, reply.** An answer needs no commit: reply on its criterion
    thread with the answer and `--ready`. For each thread you fix:
-   - Make the change on the pull request's branch. Keep it to what the comment
-     asks. Do not refactor around it.
-   - Run the tests that cover the criterion, then the repository's full
-     pre-push checks through a normal `git push`. Never bypass a hook.
-   - A runner accepts a build's push only to the pull request's branch. If it
-     refuses one, read the reason git prints, fix it and push again.
-   - In a local session over SSH, the git host can drop the connection during
-     a long gate. Push again with
+   - Change only what the comment asks, on the pull request's branch.
+   - Run the tests that cover the criterion, then the repository's pre-push
+     checks through a normal `git push`. Never bypass a hook.
+   - If the runner refuses a push, read the reason git prints, fix it and push
+     again.
+   - Over SSH, a long gate can drop the connection. Push again with
      `GIT_SSH_COMMAND="ssh -o ServerAliveInterval=20 -o ServerAliveCountMax=60"`.
-   - **When the thread asks for new proof** (a criterion thread whose proof the
-     person failed), capture it after the fixed state exists, in the form the
-     criterion declares (`proof: screenshot` and so on) or the form of the
-     current proof. Emit it bound to that criterion, without `--replaces`.
-     Attaching it on the thread supersedes the old proof.
+   - **When the thread asks for new proof** (a person failed its proof),
+     capture it after the fixed state exists, in the form the criterion
+     declares or the form of the current proof. Emit it bound to that
+     criterion, without `--replaces`:
      `outerlayer emit artifact <file> --caption "<what it shows>" --for <criterion>`.
-     Note the id it prints. Run `outerlayer sync` so the artifact reaches the
-     server. The attach looks it up there and refuses an artifact it cannot
-     find. Then reply:
+     Note the id it prints. Run `outerlayer sync`, so the attach can find the
+     artifact. Then reply, which supersedes the old proof:
      `outerlayer work comment --item "$OUTERLAYER_WORK" --criterion <criterion> --body "<what changed>" --artifact <uuid> --attach`.
-     A replacement whose bytes match the current proof is flagged `unchanged`
-     and keeps the turn where the person's comment left it, so the thread
-     still waits on you.
+     A replacement whose bytes match the current proof is flagged `unchanged`,
+     so the thread still waits on you.
    - **Otherwise** (the general thread, or a fix that needs no new proof),
      reply with a sentence naming what changed and the commit:
      `outerlayer work comment --item "$OUTERLAYER_WORK" [--criterion <criterion>] --body "<what changed>" --ready`.
      Omit `--criterion` on the general thread.
-5. **Watch CI.** Skip this step when you pushed nothing. Run
+6. **Watch CI.** Skip this step when you pushed nothing. Run
    `gh pr checks <prNumber> --repo <repository> --watch` on each pull request
    you pushed. Leave out any check that waits on results recorded after the
-   session ends. After a push, "no checks reported" is not green: query
-   again.
+   session ends. "No checks reported" is not green: query again.
    - For a failed check, read `gh run view <run-id> --log-failed`, fix it, push
      again.
    - If it also fails on the base branch, or failed outside the code,
      change nothing.
    - Stop after two fixes for one check.
-6. **Hand off what you cannot fix.** Reply on the thread with `--ready` and a
-   body of one sentence of fact, then the decision a person must make. For a
-   spec problem, quote the criterion and give the replacement wording.
-   `--ready` hands the thread back to a person.
-7. **Check nothing is left waiting.** Read the threads again. No thread you
-   started with may still be waiting on an agent. If one is, the reply did not
-   land or was flagged `unchanged`. Find out why and fix it, or report it.
-8. **Report.** Write one line per thread, naming the criterion (or the general
+7. **Hand off what you cannot fix.** Reply on the thread with `--ready`: one
+   sentence of fact, then the decision a person must make. For a spec problem,
+   quote the criterion and give the replacement wording. `--ready` hands the
+   thread back to a person.
+8. **Check nothing is left waiting.** Read the threads again. None you started
+   with may still wait on an agent. If one does, the reply did not land or was
+   flagged `unchanged`. Fix that, or report it.
+9. **Report.** Write one line per thread, naming the criterion (or the general
    thread) and saying fixed (with the replacement) or handed off (with the
-   reason). Add a CI line when you pushed: green, or each red check and
-   why. Plain language. No session labels, no raw command output. Post the
+   reason). Add one line for a merge conflict: merged, with the base sha, or
+   handed off, with the reason. Add a CI line when you pushed: green, or each
+   red check and why. Use plain language. Post the
    lines once on the general thread, in a build and in a local session alike:
    `outerlayer work comment --item "$OUTERLAYER_WORK" --body "<the lines>"`.
    A plain comment from an agent leaves the general thread waiting on a person.
-   A local session also posts the lines once as a pull request comment. A build
-   does not try: its token cannot comment. End the session with the same lines.
+   A local session also posts them on the pull request. A build does not:
+   its token cannot comment. End with the same lines.
 
 ## Rules
 
 - **Answer only threads waiting on an agent.** A thread waiting on a person, or
   on no one, is not yours to reply on.
 - **One thread, one proof.** Never attach an artifact that does not prove that
-  thread's criterion. The attach refuses an artifact bound to a different
-  criterion.
+  thread's criterion.
 - **A person decides.** Never pass `--pass` or `--fail`, never mark a check as
   a person, and never edit the issue's criteria.
 - **Stay on the branch.** Push to the pull request's own branch. Never open a
   second pull request in a repository that has one, and never force-push over
   someone else's commits.
 - **Write for a reader who was not here.** Every comment, commit and reply
-  follows the repository's writing rule: outcome first, short sentences, plain
-  words.
+  follows the repository's writing rule: outcome first, short plain sentences.

package/skill-pack/maintained/outerlayer-build/SKILL.md

@@ -89,7 +89,9 @@ Given a request instead of a work item, stop and say:
 Optional flag: `--unattended` means no person is present and nothing wakes
 the session after a turn ends. Spawn every agent in the foreground and wait
 for it in the same turn. Run the gate in the foreground with the maximum
-timeout. End the turn only at the final report.
+timeout. A command that outlives that timeout continues in the background:
+wait for it in the foreground before you use its result. End the turn only at
+the final report.
 
 ## State rules
 
@@ -305,7 +307,7 @@ Run them in order.
 
 5. **Pull request.** Run `outerlayer emit step "Pull request" --item "$OUTERLAYER_WORK"`,
    then apply the team's changes for this phase. Read [references/release.md](references/release.md)
-   on entry and run it. A release agent rebases, gates and pushes. Open the
+   on entry and run it. A release agent merges the base branch in, gates and pushes. Open the
    pull request as release.md says: a runner build with `outerlayer work open-pr`,
    which links it, and a local session with `gh pr create` and then
    `outerlayer work pr <number>`. When the build recorded criteria, from the issue or drafted, a fresh agent judges them with

package/skill-pack/maintained/outerlayer-build/references/agent-briefs.md

@@ -45,6 +45,13 @@ Run every long command, such as the full gate, the mutation tool or the
 integration suite, in the foreground with the maximum timeout. Never
 background one, and never end a turn waiting on a notification.
 
+A command that runs past the maximum timeout moves to the background and
+continues. It has not finished. Wait for it in the foreground before you use
+or report its result. For a command named `run-checks`, wait with
+`while pgrep -f '[r]un-checks' >/dev/null; do sleep 15; done`. Keep the
+brackets around the first letter of the name. Without them, `pgrep` on Linux
+finds the waiting shell, and the loop does not stop.
+
 Every agent in a run shares one memory cap. Run only the test files for the
 code you change or check, one at a time. Run a whole package's suite, a
 coverage run, a repository-wide typecheck or the full gate only where this
@@ -86,7 +93,13 @@ drives the real chain, from input through storage to read-back, with nothing
 mocked at the store boundary, plus one test per criterion written from the
 criterion's own words. Read every failure. Each test must fail because the
 behavior is absent, not because of a typo or a missing import. Then implement
-until green. When the build drafted the criteria from the issue's
+until green.
+
+A test proves a criterion only when it runs the code that produces the outcome
+its Then clause states. A test that checks that the inputs to that code are
+unchanged is a regression guard, not a proof. When the seam the issue names
+cannot run that code, add a second citing test at a seam that can. Say so in
+your report. When the build drafted the criteria from the issue's
 description, they are requirements in the same way, and tests cite their
 ids. When no criteria were recorded, write tests from the description in the
 same order.
@@ -181,9 +194,9 @@ The shared rules apply. Your inputs are the state file path, the branch and
 the instructions-file pointer. You run no write command against the tracker
 or the git host beyond the push.
 
-Fetch the base branch, then rebase the branch onto it. Merge instead once the
-branch is pushed and someone else may hold it. Resolve every conflict on the
-branch, never in a web editor.
+Bring the base branch into the branch as
+`.outerlayer/skills/outerlayer-cli/references/merge-base-branch.md` says.
+Resolve every conflict on the branch, never in a web editor.
 
 A migration this branch adds whose version is at or below the newest one on
 the base branch is renamed to the current UTC time, with every reference to

package/skill-pack/maintained/outerlayer-build/references/criteria-judge.md

@@ -58,6 +58,16 @@ It is not satisfied when the test only cites the id, asserts something weaker
 than the stated outcome, mocks away the very behavior the criterion is about,
 or has no assertion bearing on the outcome, even when it cites the id.
 
+A test asserts something weaker when it checks a stand-in for the outcome. For
+example, it checks the arguments a program starts with, but the outcome is what
+that program does. Or it checks that a value is unchanged from before, but the
+Then clause states the value. A test proves an outcome only when it runs the
+code that produces that outcome.
+
+Your verdict follows your reason. When your reason says that part of the Then
+clause is inherited, assumed, implied or not asserted, the verdict is
+`not-satisfied`.
+
 When unsure, record `not-satisfied` and state the doubt in the reason. A silent
 pass is worse than a wrong-looking fail a person can overrule.
 

package/skill-pack/maintained/outerlayer-build/references/release.md

@@ -9,10 +9,13 @@ file, not from the transcript.
 
 The orchestrator does not sync, run the gate, push or watch CI itself. Spawn
 one release agent in a fresh context on the "sync and push" brief, with the
-state file path, the branch and the instructions-file pointer. A check that
-fails there has the standing of a red gate and returns to the review phase's
-remaining budget. If its report names files the sync moved that the review had
-already cleared, run one check round on the rebased diff before going on.
+state file path, the branch and the instructions-file pointer. The agent
+brings the base branch in as
+`.outerlayer/skills/outerlayer-cli/references/merge-base-branch.md` says. A
+check that fails there has the standing of a red gate and returns to the
+review phase's remaining budget. If its report names files the sync moved that
+the review had already cleared, run one check round on the merged diff before
+going on.
 
 ## Open the pull request