greprag 5.78.1 → 5.78.6

package/README.md

@@ -1,6 +1,7 @@
 # GrepRAG
 
-Agent memory as a service. Episodic project memory for Claude Code, Codex, and OpenCode — captures supported agent turns, compacts into hourly/daily/weekly summaries, and exposes two access patterns: lexical search by topic (`greprag memory search "<query>"`) or a session recap (`greprag memory recap`). The memory product line is marketed as **Odyssey**. Also handles cross-project async messaging via inbox.
+Private agent memory service for existing GrepRAG tenants. New accounts are
+closed; the npm client remains available so current users can install updates.
 
 ## Quick Start
 
@@ -8,7 +9,8 @@ Agent memory as a service. Episodic project memory for Claude Code, Codex, and O
 npm i -g greprag
 ```
 
-Then either run `/greprag` inside a supported agent, or run `greprag init` in a terminal. Bare `greprag init` detects Claude Code, Codex, and OpenCode; if more than one is present in a non-interactive shell, it prints the explicit command to use.
+An existing API key is required. Then either run `/greprag` inside a supported
+agent, or run `greprag init --api-key <existing-key>` in a terminal.
 
 ### Claude Code
 
@@ -23,13 +25,9 @@ greprag init --claude
 Run `/greprag` in Codex after install, or:
 
 ```bash
-greprag init --codex --tenant-id <your-handle>
+greprag init --codex --api-key <existing-key>
 ```
 
-Example: `greprag init --codex --tenant-id tanya`.
-The handle becomes your public GrepRAG address, such as
-`tanya@greprag.com`.
-
 Codex requires one extra trust step: after init/update, open Codex Desktop
 Settings -> Settings -> Hooks, trust the 6 GrepRAG hooks, then start a fresh
 session.
@@ -67,7 +65,7 @@ greprag status --all-platforms
 | `greprag status --all-platforms` | Check auth, hooks/plugins, skills, and project anchor |
 | `greprag init` | Detect/ask which agent to configure |
 | `greprag init --claude` | Configure Claude Code hooks + skill |
-| `greprag init --codex --tenant-id <handle>` | Configure Codex hooks + skill |
+| `greprag init --codex --api-key <key>` | Configure Codex hooks + skill |
 | `greprag codex doctor` | Diagnose Codex hooks, session id, and trust path |
 | `greprag init --opencode` | Configure OpenCode plugin |
 | `greprag init --global` | Global anchor for ephemeral sessions |
@@ -84,7 +82,7 @@ greprag status --all-platforms
 
 - Node.js 18+
 - Claude Code, Codex, or OpenCode
-- A GrepRAG handle or API key. `--tenant-id <handle>` provisions the key.
+- An API key for an existing GrepRAG tenant.
 
 ## How it works
 

package/dist/codex-chip-hooks.js

@@ -65,8 +65,8 @@ function context(input) {
         `Branch: ${chip.worktree.branch}`,
         `Parent session: ${chip.parent.sessionId || 'not recorded'}`,
         `Finish by committing the durable result, then send the parent the commit artifact, checks, caveats, Cleanup line, and Archive: yes|no in the actual native task message. After delivery, Archive: yes means archive this child task yourself. The optional host command is ${cli} codex chip report ${chip.id}.`,
-        // adr: adr/codex-landing-doctrine.md — one delivery owner, including FIX missions.
-        'Landing: the parent is the delivery owner for merge, post-merge branch/manifest bookkeeping, and any profile-declared push/deploy/release; the child owns routine archival of its own task after the terminal message is delivered. Do not edit the parent checkout or independently cross delivery boundaries. A mission whose first line begins `FIX:` (emitted by `greprag fix spawn`) is writable in its isolated checkout/worktree and hands its verified commit/result to that owner without a human approval gate. If no live parent exists and the chip carries the full-goal mission, it becomes delivery owner. `greprag fix spawn` only prints the mission; visible Codex task dispatch creates the isolated checkout/worktree.',
+        // adr: adr/codex-landing-doctrine.md — parent mission owner, including FIX missions.
+        'Landing: the parent mission owner integrates the result, handles post-merge branch/manifest bookkeeping, and follows any profile-declared push/deploy/release; the child owns routine archival of its own task after the terminal message is delivered. Do not edit the parent checkout or independently cross delivery boundaries. A mission whose first line begins `FIX:` (emitted by `greprag fix spawn`) is writable in its isolated checkout/worktree and hands its verified commit/result to that parent without a human approval gate. If no live parent exists and the chip carries the full-goal mission, it follows the repo profile as mission owner. `greprag fix spawn` only prints the mission; visible Codex task dispatch creates the isolated checkout/worktree.',
     ];
     if ((0, model_1.chipMissionKind)(chip) === 'fix') {
         lines.push('Harness: Codex. Mission: visible native FIX chip with ordinary writable authority, not a same-session helper.', 'Scope: repair GrepRAG-owned harness surfaces in this checkout: load entries, skill templates, docs, hook context, CLI messages, and tests. Codex owns native task creation, worktrees, permissions, Git, and task lifecycle.', 'Own diagnosis, implementation, tests, commit, and parent report. Inspect Codex behavior only far enough to correct GrepRAG guidance or report a precise external blocker.', 'FIX peer handoff: if a peer offers to coordinate, integrate, rework, or take over a harness repair, hand off branch/commit, dirty files, checks, blockers, and caveats. Do not defend patch ownership; peers may take ownership within their assigned GrepRAG harness scope.', 'Visible delegation route: load `codex-chip-spawn` and create the child with `codex_app__create_thread` using the current project worktree target; load `chip-leader` for multi-chip seams. Same-session helper tools never satisfy a visible-chip requirement.');

package/dist/commands/codex-chip/prompt.js

@@ -40,5 +40,5 @@ Report when done:
 ${reportInstruction}
 - Include a \`Cleanup:\` line naming the task, worktree, and branch actions. When done use \`Cleanup: child archives own task; Codex may prune managed worktree; parent may delete branch after merge\`; when anything must remain open use \`Cleanup: keep task/worktree/branch because ...\`.
 - Put the archive decision in the actual message sent to the LEAD: \`Archive: yes\` or \`Archive: no — <reason>\`. After that message is delivered, \`Archive: yes\` means call \`set_thread_archived\` for your own task; \`Archive: no\` means leave it open. Never make the parent perform routine child-task archival.
-- Landing: do not independently merge, push, deploy, or manually delete the worktree — the parent is the delivery owner and integrates the result, follows the repo profile, and deletes the branch after merge. If this task begins \`FIX:\` (a fix-spawn mission), hand the verified commit/result to that owner without a human approval gate. If no live parent exists and this task carries the full-goal mission, become delivery owner. \`greprag fix spawn\` only prints the mission; visible Codex task dispatch creates the isolated checkout/worktree.`;
+- Landing: do not independently merge, push, deploy, or manually delete the worktree — the parent mission owner integrates the result, follows the repo profile, and deletes the branch after merge. If this task begins \`FIX:\` (a fix-spawn mission), hand the verified commit/result to that parent without a human approval gate. If no live parent exists and this task carries the full-goal mission, follow the repo profile as mission owner. \`greprag fix spawn\` only prints the mission; visible Codex task dispatch creates the isolated checkout/worktree.`;
 }

package/dist/commands/codex-doctor.js

@@ -96,7 +96,7 @@ async function doctorCodex(args, deps) {
     const hooks = readCodexHooks();
     const startup = (0, codex_startup_1.codexStartupInfo)();
     console.log('Codex doctor\n');
-    console.log(`  API key:          ${cfg.apiKey ? 'configured' : 'missing (run greprag init --codex --tenant-id <handle>)'}`);
+    console.log(`  API key:          ${cfg.apiKey ? 'configured' : 'missing (existing tenants: run greprag init --codex --api-key <key>)'}`);
     console.log(`  Current thread:   ${codexSession ? `${codexSession}${session8 ? ` (${session8})` : ''}` : 'not found (run Codex once or pass --session)'}`);
     console.log(`  Hooks file:       ${fs.existsSync(hooksPath) ? hooksPath : 'missing'}`);
     console.log('  Hook trust:       Codex Desktop Settings -> Settings -> Hooks, then trust the GrepRAG hooks');

package/dist/commands/codex-startup.js

@@ -86,7 +86,7 @@ function codexStartupInfo() {
 }
 function installCodexStartup() {
     console.error('Codex startup watcher install is retired.');
-    console.error('Run `greprag init --codex --tenant-id <handle>` and trust the Codex hooks.');
+    console.error('Run `greprag init --codex --api-key <existing-key>` and trust the Codex hooks.');
     console.error('Inbox rows surface through SessionStart drain and UserPromptSubmit codex-notify.');
     process.exit(1);
 }

package/dist/commands/codex.js

@@ -467,7 +467,7 @@ remove only cleans up stale login files.`;
 function printCodexWatcherRetired() {
     console.error('Codex live watcher is retired.');
     console.error('Codex inbox rows surface through SessionStart drain and UserPromptSubmit codex-notify.');
-    console.error('Run `greprag init --codex --tenant-id <handle>` and trust the Codex hooks.');
+    console.error('Run `greprag init --codex --api-key <existing-key>` and trust the Codex hooks.');
 }
 async function runCodex(args) {
     const sub = args[0];

package/dist/commands/collision-check.js

@@ -125,10 +125,10 @@ function buildCollisionDirective(peers, myShort, alias) {
         + `Coordinate BEFORE touching shared files: (1) message each peer now with a contextual heads-up — `
         + `Codex peers: use \`codex_app.list_threads\` to find the task and its repo/workspace, then \`codex_app.send_message_to_thread\` to send the heads-up; `
         + `GrepRAG watcher/cross-harness peers: \`greprag send "…what you're about to touch…" --to ${handle}@greprag.com/<their-8hex> --from-session ${myShort}\` `
-        + `(YOU compose and send it — this is a notice, not an auto-send; watcher rows are not the Codex peer source of truth); `
+        + `(YOU compose and send it — this is a notice, not an auto-send; recipients reply only for a concrete conflict, silence is approval, and you never poll or wait; watcher rows are not the Codex peer source of truth); `
         + `(2) do your code work in a worktree on its own branch (\`git worktree add .claude/worktrees/<slug> -b <branch>\`); `
-        + `(3) at completion resolve \`.greprag/delivery.json\`, include every ready peer commit/result, and let one delivery owner `
-        + `integrate and finish the declared push/deploy/release path. Never edit the shared default checkout concurrently.`);
+        + `(3) at completion resolve \`.greprag/delivery.json\`, send one fire-and-forget delivery notice, then continue immediately without polling, waiting, status reads, or follow-ups; `
+        + `sweep every ready same-repo commit, ignore all uncommitted and untracked work, resolve conflicts directly, and finish the declared push/deploy/release path. Never edit the shared default checkout concurrently.`);
 }
 /** Reduce the watcher list to OTHER live sessions that are NOT in my repo
  *  (cross-repo). Excludes self, same-repo collisions (those get the LOUD

package/dist/commands/delivery-reminder.js

@@ -12,15 +12,15 @@ exports.buildDeliveryAnnounce = buildDeliveryAnnounce;
 // adr: adr/delivery-announce-pilot.md
 function coordinationLine(platform) {
     if (platform === 'codex') {
-        return 'Codex: at the merge/deploy gate, call codex_app.list_threads unfiltered, filter to peers in the same repo, and inspect their current summaries/status. Use codex_app.send_message_to_thread only for visible evidence of an unlanded ready commit, overlapping integration, or a concrete blocker. Peers with nothing actionable stay silent; do not solicit or send negative acknowledgements or routine completion follow-ups. Delivery owner: rename this task `DEPLOY: <existing title>` for operator visibility only; transfer the prefix on handoff; remove it before reporting delivery complete or abandoned.';
+        return 'Codex: send one fire-and-forget delivery notice to same-repo peers with codex_app.send_message_to_thread, then continue immediately. Recipients reply only for a concrete conflict; silence is approval. Never poll, call wait_threads, re-read peers, ask for status, or send delivery follow-ups.';
     }
     if (platform === 'claude-code') {
-        return 'Claude Code: at the merge/deploy gate, inspect peers in the same repo and send one concise delivery notice only for visible evidence of an unlanded ready commit, overlapping integration, or a concrete blocker. Peers with nothing actionable stay silent; do not solicit or send negative acknowledgements or routine completion follow-ups.';
+        return 'Claude Code: send one fire-and-forget delivery notice to same-repo peers, then continue immediately. Recipients reply only for a concrete conflict; silence is approval. Never poll, wait, ask for status, or send delivery follow-ups.';
     }
     if (platform === 'opencode') {
-        return 'OpenCode: at the merge/deploy gate, use the GrepRAG project/session registry and send one concise notice only for visible evidence of an unlanded ready commit, overlapping integration, or a concrete blocker. Peers with nothing actionable stay silent; do not solicit or send negative acknowledgements or routine completion follow-ups.';
+        return 'OpenCode: send one fire-and-forget delivery notice to same-repo peers through the GrepRAG registry, then continue immediately. Recipients reply only for a concrete conflict; silence is approval. Never poll, wait, ask for status, or send delivery follow-ups.';
     }
-    return 'At the merge/deploy gate, inspect peers in the same repo and send one concise notice only for visible evidence of an unlanded ready commit, overlapping integration, or a concrete blocker. Peers with nothing actionable stay silent; do not solicit or send negative acknowledgements or routine completion follow-ups.';
+    return 'Send one fire-and-forget delivery notice to same-repo peers, then continue immediately. Recipients reply only for a concrete conflict; silence is approval. Never poll, wait, ask for status, or send delivery follow-ups.';
 }
 function buildDeliveryAnnounce(env) {
     if (!env.deliveryRepo)
@@ -29,8 +29,9 @@ function buildDeliveryAnnounce(env) {
     return [
         `[DELIVERY — ${project}]`,
         'Commit useful, passing work.',
+        'Only committed Git state participates in delivery. Ignore all uncommitted and untracked work in every checkout.',
         coordinationLine(env.platform),
-        'Include visible ready peer commits and clear known blockers, then merge to the default branch and deploy immediately. Silence means nothing actionable and does not block delivery.',
+        'Sweep every ready same-repo commit into the integration train, resolve conflicts directly, merge to the default branch, and deploy immediately.',
         'Use this repo\'s delivery profile and verify production.',
     ].join('\n');
 }

package/dist/commands/fix.js

@@ -623,7 +623,7 @@ async function runFix(args) {
             // THE friction reflex (grepragOS, 2026-07-12): one unit of friction ⇒
             // one fix-chip mission now. The mission detects Git capability and tells
             // native dispatch to use a worktree or serialized project-local mode;
-            // the chip fixes, verifies, commits useful work, then hands to the delivery owner. Replaces queue-first
+            // the chip fixes, verifies, commits useful work, then hands to the mission owner. Replaces queue-first
             // `fix log` as doctrine.
             return (0, mechanic_spawn_1.fixSpawn)(rest);
         }

package/dist/commands/init.js

@@ -1,7 +1,7 @@
 "use strict";
 /** greprag init — configure agent clients for GrepRAG memory.
  *
- * 1. Obtain API key (provided or provisioned)
+ * 1. Obtain an existing API key (provided or already cached)
  * 2. Validate key against health endpoint
  * 3. Update the target platform's native hooks/plugin/config */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
@@ -162,42 +162,24 @@ function describeTarget(target) {
 function explicitInitHint() {
     return [
         'Run one of:',
-        '  greprag init --codex --tenant-id <your-handle>',
-        '  greprag init --claude --tenant-id <your-handle>',
-        '  greprag init --opencode --tenant-id <your-handle>',
-        '  greprag init --grok --tenant-id <your-handle>',
+        '  greprag init --codex --api-key <existing-key>',
+        '  greprag init --claude --api-key <existing-key>',
+        '  greprag init --opencode --api-key <existing-key>',
+        '  greprag init --grok --api-key <existing-key>',
     ].join('\n');
 }
-function normalizeHandle(raw) {
-    return raw.trim().toLowerCase().replace(/@greprag\.com$/i, '');
-}
-function validateHandle(handle) {
-    return /^[a-z0-9-]{3,32}$/.test(handle);
-}
-async function promptForHandle() {
-    const handle = normalizeHandle(await prompt('  Choose your public GrepRAG handle, e.g. tanya -> tanya@greprag.com: '));
-    if (!validateHandle(handle)) {
-        console.error('  Error: public handle must be 3-32 chars: lowercase letters, numbers, and hyphens.');
-        process.exit(1);
-    }
-    const answer = (await prompt(`  This will create/use public handle ${handle}@greprag.com. Continue? (Y/n): `)).trim().toLowerCase();
-    if (answer && answer !== 'y' && answer !== 'yes') {
-        console.error('  Setup cancelled before provisioning a public handle.');
-        process.exit(1);
-    }
-    return handle;
-}
-async function resolveProvisionHandle(opts) {
+// Existing tenants keep working; init no longer creates public accounts.
+// adr: adr/private-service.md
+function failMissingApiKey(opts) {
     if (opts.tenantId) {
-        const handle = normalizeHandle(opts.tenantId);
-        if (!validateHandle(handle)) {
-            console.error('  Error: --tenant-id must be 3-32 chars: lowercase letters, numbers, and hyphens.');
-            process.exit(1);
-        }
-        console.log(`  Public handle: ${handle}@greprag.com`);
-        return handle;
+        console.error('  Error: --tenant-id no longer provisions a GrepRAG account.');
+    }
+    else {
+        console.error('  Error: no existing GrepRAG API key was found.');
     }
-    return promptForHandle();
+    console.error('  GrepRAG is a private service and is not accepting new accounts.');
+    console.error('  Existing users can pass --api-key <existing-key>.');
+    process.exit(1);
 }
 async function chooseInitTarget() {
     const detections = detectAgentTargets();
@@ -250,8 +232,7 @@ async function runInit(opts) {
     // global anchor, skill, chip-spawn doc, CLAUDE.md patch), THEN bulk-register
     // every other git repo. Pure superset of `greprag init`.
     //
-    // Reuse the existing GREPRAG_API_KEY from settings if one is already there,
-    // so re-runs don't churn the tenant's key via the provision path.
+    // Reuse the existing GREPRAG_API_KEY from settings if one is already there.
     if (opts.all) {
         let apiKey = opts.apiKey || readSharedApiKey();
         await runInit({ ...opts, all: false, apiKey });
@@ -290,15 +271,7 @@ async function runInit(opts) {
     // Step 1: Get API key
     let apiKey = opts.apiKey || readSharedApiKey();
     if (!apiKey) {
-        const tenantId = await resolveProvisionHandle(opts);
-        console.log(`  Provisioning API key for public handle ${tenantId}@greprag.com...`);
-        const result = await provision(tenantId);
-        if (!result.ok) {
-            console.error(`  Error: ${result.error}`);
-            process.exit(1);
-        }
-        apiKey = result.apiKey;
-        console.log(`  API key created: ${apiKey.slice(0, 17)}...`);
+        failMissingApiKey(opts);
     }
     // Step 2: Validate key
     console.log('  Validating API key...');
@@ -415,18 +388,10 @@ async function runInit(opts) {
  *  repo gets the same project_id from both inits (idempotent). */
 async function runOpenCodeInit(opts) {
     console.log('\n  greprag init — Setting up agent memory for OpenCode\n');
-    // Step 1: Get API key (same provision path as Claude Code init)
+    // Step 1: Get an existing API key.
     let apiKey = opts.apiKey || readSharedApiKey();
     if (!apiKey) {
-        const tenantId = await resolveProvisionHandle(opts);
-        console.log(`  Provisioning API key for public handle ${tenantId}@greprag.com...`);
-        const result = await provision(tenantId);
-        if (!result.ok) {
-            console.error(`  Error: ${result.error}`);
-            process.exit(1);
-        }
-        apiKey = result.apiKey;
-        console.log(`  API key created: ${apiKey.slice(0, 17)}...`);
+        failMissingApiKey(opts);
     }
     // Step 2: Validate key
     console.log('  Validating API key...');
@@ -581,21 +546,13 @@ async function runOpenCodeInit(opts) {
 async function runCodexInit(opts) {
     console.log('\n  greprag init — Setting up agent memory for Codex\n');
     if (opts.installWatcher) {
-        console.error('  Error: Codex startup watcher install is retired. Run: greprag init --codex --tenant-id <handle>');
+        console.error('  Error: Codex startup watcher install is retired. Run: greprag init --codex --api-key <existing-key>');
         console.error('  Codex inbox rows surface through SessionStart drain and UserPromptSubmit codex-notify.');
         process.exit(1);
     }
     let apiKey = opts.apiKey || readSharedApiKey();
     if (!apiKey) {
-        const tenantId = await resolveProvisionHandle(opts);
-        console.log(`  Provisioning API key for public handle ${tenantId}@greprag.com...`);
-        const result = await provision(tenantId);
-        if (!result.ok) {
-            console.error(`  Error: ${result.error}`);
-            process.exit(1);
-        }
-        apiKey = result.apiKey;
-        console.log(`  API key created: ${apiKey.slice(0, 17)}...`);
+        failMissingApiKey(opts);
     }
     console.log('  Validating API key...');
     const valid = await validateKey(apiKey);
@@ -739,15 +696,7 @@ async function runGrokInit(opts) {
     console.log('\n  greprag init — Setting up agent memory for Grok Build\n');
     let apiKey = opts.apiKey || readSharedApiKey();
     if (!apiKey) {
-        const tenantId = await resolveProvisionHandle(opts);
-        console.log(`  Provisioning API key for public handle ${tenantId}@greprag.com...`);
-        const result = await provision(tenantId);
-        if (!result.ok) {
-            console.error(`  Error: ${result.error}`);
-            process.exit(1);
-        }
-        apiKey = result.apiKey;
-        console.log(`  API key created: ${apiKey.slice(0, 17)}...`);
+        failMissingApiKey(opts);
     }
     console.log('  Validating API key...');
     const valid = await validateKey(apiKey);
@@ -1027,19 +976,6 @@ function writeProjectPath(projectName, repoPath) {
         fs.mkdirSync(dir, { recursive: true });
     fs.writeFileSync(file, JSON.stringify(registry, null, 2) + '\n');
 }
-// -- Provisioning -----------------------------------------------------------
-async function provision(tenantId) {
-    const res = await fetch(`${API_URL}/v1/keys/provision`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ tenantId }),
-    });
-    const body = await res.json();
-    if (!res.ok) {
-        return { ok: false, error: body.error || `HTTP ${res.status}` };
-    }
-    return { ok: true, apiKey: body.apiKey };
-}
 // -- Validation -------------------------------------------------------------
 async function validateKey(apiKey) {
     try {
@@ -1774,26 +1710,12 @@ function applySettings(settings, apiKey) {
     else {
         changes.push('PreToolUse crush-wrap hook already configured (skipped)');
     }
-    // Coordinate-GATE — cross-session coordination reflex (TIER 2). PreToolUse
-    // matcher `Bash`: on a risky shared-state action (git merge/push/deploy) the
-    // hook does a FRESH inbox-watchers read and, if another live session is working
-    // in THIS repo, injects coordination context before the irreversible action.
-    // Non-risky Bash calls classify locally and cost no
-    // network. Pairs with the SessionStart collision-check (TIER 1 roster).
-    // docs/collision-schematic.md
-    const coordinateGateHook = {
-        matcher: 'Bash',
-        hooks: [{ type: 'command', command: 'greprag-hook coordinate-gate', timeout: 5000 }],
-    };
-    if (!hasGrepragHookWithMatcher(settings.hooks.PreToolUse, 'coordinate-gate', 'Bash')) {
-        if (!settings.hooks.PreToolUse)
-            settings.hooks.PreToolUse = [];
-        settings.hooks.PreToolUse.push(coordinateGateHook);
-        changes.push('Added PreToolUse hook (coordinate-gate, matcher=Bash)');
-    }
-    else {
-        changes.push('PreToolUse coordinate-gate hook already configured (skipped)');
-    }
+    // Delivery coordination is fire-and-forget. Remove the retired PreToolUse
+    // polling gate from existing Claude installs; the old subcommand is also a
+    // no-op so updated binaries stop polling before the next init.
+    const removedCoordinateGate = removeGrepragHook(settings.hooks, 'PreToolUse', 'coordinate-gate');
+    if (removedCoordinateGate)
+        changes.push('Removed retired PreToolUse coordinate-gate hook');
     // Governed compact (Chip D) — two local-only hooks, no API calls.
     // PreCompact: render the transcript main chain to pixel-font PNG pages
     // (lossless archive, CCR-indexed) BEFORE compaction summarizes it away.
@@ -1964,7 +1886,7 @@ const GREPRAG_CLI_BODY = `## greprag CLI (cross-project memory + async messaging
 - \`email send --to <real-addr> --from <handle>@greprag.com --subject "s" (--body "t" | --body-file <f|->)\` — sends a **REAL outbound SMTP email** from your greprag address to any recipient (\`--attach\`/\`--cc\`/\`--bcc\`/\`--html-file\` available). \`email pending\` · \`email pull\` = drain inbound. **Use this — not \`send\` — when the user says "email X".** The \`send\`-vs-\`email send\` collision is the trap: only \`email send\` is actual email.
 - \`memory search "q"\` · \`memory recap\` (alias \`briefing\`) — search a topic/bug · session catch-up digest; narrative-pyramid tiers \`turns\`·\`hourly\`·\`daily\`·\`weekly\`·\`ships\` (commits/PRs/deploys), each \`--last N\` · \`--from/--to ISO\` · \`--project\`
 - \`corpus upload <file|url> --raw|--enriched [--index]\` · \`corpus search "q" --all\` — ingest + search arbitrary text (books, codebases, refs); \`--raw\` lexical, \`--enriched\` adds LLM vocab bridge; \`--index\` = a multi-doc "index, no bundle" source (llms.txt/sitemap) → one library store, members refreshed cheap-signal-only (ETag→lastmod→content-length, no full-read floor)
-- \`fix spawn "<one unit of friction>"\` · \`fix search|repair\` — THE friction reflex: one visible fix-chip mission per unit; it detects Git before dispatch (worktree for Git, serialized project-local for non-Git/no-commit); the chip fixes, verifies, commits useful work, and hands it to the mission delivery owner (\`fix log\` = audit notes only) · search/repair the fix queue
+- \`fix spawn "<one unit of friction>"\` · \`fix search|repair\` — THE friction reflex: one visible fix-chip mission per unit; it detects Git before dispatch (worktree for Git, serialized project-local for non-Git/no-commit); the chip fixes, verifies, commits useful work, and hands it to the mission owner (\`fix log\` = audit notes only) · search/repair the fix queue
 - \`status\` · \`doctor\` — install/auth/hooks state · repair orphan project_id + identity drift
 Hard rule: AI never auto-acts on a brief — summarize + confirm.`;
 /** The previous SHIPPED default (v5.39.x and earlier, pre-markers, unmarked).
@@ -1977,7 +1899,7 @@ const GREPRAG_CLI_BODY_V1 = `## greprag CLI (cross-project memory + async messag
 - \`send "md" --to <handle>@greprag.com[/<8hex>]\` — message a session (\`/<8hex>\`) or cold-open a front desk (bare handle); Discord DM: \`--to discord:<snowflake>\`
 - \`memory search "q"\` · \`memory recap\` (alias \`briefing\`) — search a topic/bug · session catch-up digest; narrative-pyramid tiers \`turns\`·\`hourly\`·\`daily\`·\`ships\` (commits/PRs/deploys), each \`--last N\` · \`--from/--to ISO\` · \`--project\`
 - \`corpus upload <file|url> --raw|--enriched\` · \`corpus search "q" --all\` — ingest + search arbitrary text (books, codebases, refs); \`--raw\` lexical, \`--enriched\` adds LLM vocab bridge
-- \`fix spawn "<unit>"\`|\`fix search\` — emit one visible fix-chip mission per friction unit; native dispatch creates the isolated checkout/worktree; the chip fixes, verifies, commits useful work, and hands it to the mission delivery owner
+- \`fix spawn "<unit>"\`|\`fix search\` — emit one visible fix-chip mission per friction unit; native dispatch creates the isolated checkout/worktree; the chip fixes, verifies, commits useful work, and hands it to the mission owner
 - \`status\` · \`doctor\` — install/auth/hooks state · repair orphan project_id + identity drift
 Hard rule: AI never auto-acts on a brief — summarize + confirm.`;
 /** The managed-section registry for ~/.claude/CLAUDE.md. Add a spec here to put

package/dist/commands/mechanic-spawn.js

@@ -19,8 +19,8 @@ exports.mechanicSpawn = mechanicSpawn;
  *
  * The chip's contract is simple: identify the exact friction, make the
  * smallest durable root-cause fix, explain the friction and fix in human
- * terms, then hand its commit/result to the mission's delivery owner. A full-goal
- * chip with no live parent becomes that owner and follows the repo profile.
+ * terms, then hand its commit/result to the mission owner. A full-goal
+ * chip with no live parent follows the repo profile as mission owner.
  *
  * This command does NOT create the child task or its workspace. The caller
  * owns dispatch through a visible native chip/task mechanism. Git projects
@@ -116,7 +116,7 @@ function buildFixMission(friction, scope, parentSession, type = inferFixType(fri
                 '3. Confirm you are not in the caller/parent checkout. If you are, STOP and report `CHIP DISPATCH BLOCKED: workspaceMode=worktree was not honored`.',
             ],
             work: 'Work as an ordinary unrestricted read/write session in the dispatch-provided isolated worktree.',
-            completion: 'Use focused tests or checks that prove the fix and commit useful work. If a live parent owns delivery, report the commit and checks so it can integrate and clean up. If no live parent exists and this is the full-goal mission, resolve `.greprag/delivery.json` and become the delivery owner. Gate only effects outside ordinary repo delivery.',
+            completion: 'Use focused tests or checks that prove the fix and commit useful work. If a live parent owns the mission, report the commit and checks so it can integrate and clean up. If no live parent exists and this is the full-goal mission, resolve `.greprag/delivery.json` and follow the repo profile as mission owner. Gate only effects outside ordinary repo delivery.',
         }
         : {
             selected: 'Workspace mode: local -> no usable Git HEAD detected; native dispatch targets the current project directory directly.',
@@ -125,14 +125,14 @@ function buildFixMission(friction, scope, parentSession, type = inferFixType(fri
                 '3. Confirm the caller yielded file writes while this FIX chip runs. If concurrent writes are still possible, STOP and report `CHIP DISPATCH BLOCKED: workspaceMode=local requires serialized writes`.',
             ],
             work: 'Work as an ordinary unrestricted read/write session in the dispatch-provided local project directory; the caller must not write there concurrently.',
-            completion: 'Use focused tests or checks that prove the fix and report the exact files and checks to the live parent/delivery owner. With no Git boundary there is nothing to merge or push; preserve recovery material until the owner confirms the handoff.',
+            completion: 'Use focused tests or checks that prove the fix and report the exact files and checks to the live parent/mission owner. With no Git boundary there is nothing to merge or push; preserve recovery material until the owner confirms the handoff.',
         };
     return [
         `FIX: [${type}] ${summary}`,
         '',
         '**Basic instruction**',
         'You are a visible FIX chip for exactly one friction unit. Do not absorb adjacent friction; name it in your report so the caller can spawn it separately.',
-        'Route by durable repair surface, not symptom. Identify the exact friction, fix it, explain the friction in human terms, explain what you changed and why it solves the friction, then hand the verified result to the mission delivery owner without creating a second approval gate.',
+        'Route by durable repair surface, not symptom. Identify the exact friction, fix it, explain the friction in human terms, explain what you changed and why it solves the friction, then hand the verified result to the mission owner without creating a second approval gate.',
         '',
         '**Type router**',
         `Selected type: ${type} -> ${FIX_TYPE_ROUTES[type]}.`,
@@ -164,7 +164,7 @@ function buildFixMission(friction, scope, parentSession, type = inferFixType(fri
         '- Fix made: <files/behavior changed>',
         '- Why it works: <why this prevents the class of friction>',
         '- Checks: <commands run and result>',
-        '- Delivery owner: <live parent task, or self when this is the full-goal mission>',
+        '- Mission owner: <live parent task, or self when this is the full-goal mission>',
         '- Next boundary: <integrate/cleanup/profile delivery, or none for local mode>',
         '',
         `Harness scope: ${scope}.`,
@@ -202,7 +202,7 @@ async function fixSpawn(args, opts = {}) {
         parentSession: parentSession || null,
         mission,
         dispatch: workspaceMode === 'worktree'
-            ? 'Create a visible native chip/task using the harness worktree path, then send this mission as its first turn. The chip fixes, verifies, commits, and hands the result to the mission delivery owner.'
+            ? 'Create a visible native chip/task using the harness worktree path, then send this mission as its first turn. The chip fixes, verifies, commits, and hands the result to the mission owner.'
             : 'No usable Git HEAD was detected. Create a visible native chip/task using the harness project-local path; do not attempt a worktree or initialize Git. Yield caller file writes until the chip reports back. The chip fixes, verifies, and hands the result to the mission owner.',
     };
     console.log(JSON.stringify(handoff, null, 2));

package/dist/commands/mechanic.js

@@ -546,7 +546,7 @@ USAGE
   greprag mechanic spawn "<friction>"           DEPRECATED alias of "greprag fix spawn" (the
                                                 friction reflex — one visible fix-chip mission
                                                 per unit; native dispatch creates the isolated
-                                                checkout/worktree; chip hands off to the delivery owner).
+                                                checkout/worktree; chip hands off to the mission owner).
     [--parent-session <native-id>]                Caller creates the native child task.
   greprag mechanic off [--note "<t>"]          PANIC SWITCH — suspend ALL repairs. Local file
                                                (~/.greprag/state/mechanic-off.json), no

package/dist/commands/opencode-chip-mission.js

@@ -69,7 +69,7 @@ function buildMission(input) {
             '**Repair contract**',
             'Work as an ordinary unrestricted read/write session in the isolated checkout.',
             'Find and repair the reusable root mechanism; own discovery, repair, tests, verification, and commit.',
-            'Finish it through the Delivery System: confer with live peers first (`greprag inbox watchers`), resolve `.greprag/delivery.json`, include every ready peer commit/result, and let one delivery owner integrate, verify, push, deploy, or release exactly as the profile declares. If a live parent already owns delivery, report your commit and checks for integration; if no parent is available and this is the full-goal mission, become the delivery owner. Gate only effects outside ordinary repo delivery.',
+            'Finish it through the Delivery System: resolve `.greprag/delivery.json`, send one fire-and-forget notice, then continue immediately without polling, waiting, status reads, or follow-ups. Sweep every ready same-repo commit, ignore all uncommitted and untracked work, resolve conflicts directly, and integrate, verify, push, deploy, or release exactly as the profile declares. Recipients reply only for a concrete conflict; silence is approval. Gate only effects outside ordinary repo delivery.',
             'Report DONE or BLOCKED natively to the parent task; do not use a mandatory GrepRAG completion ceremony.',
             '',
             '**Friction / mission**',

package/dist/commands/os-primer-reminder.js

@@ -27,7 +27,7 @@ function buildOsPrimer(env) {
         '• Doctrine vs state: methods ship in the CLI (`greprag load`); live state lives in the repo. A skill that depends on repo state carries a "STATE — read these first" block naming exact paths.',
         '• Discoverability: every durable artifact must be findable next session — docs auto-register, skills auto-mirror, decisions get a dated ADR/decision-log entry, everything else gets its path named in the owning skill/doc. If nothing points at it, you didn\'t finish.',
         '• Pull before derive: `greprag memory search` / `corpus search` / `load` BEFORE asking the operator or re-deriving what the project already knows. Friction or an env/toolchain/worktree/secret bootstrap roadblock → search Memory for the exact error/friction + repo/tool before inventing a workaround. Clear overcome → apply it and continue. Named person/org/project/repo/customer/handle or unexplained proper noun → search Memory before guessing, unless fully defined in-turn.',
-        `• Unresolved friction ⇒ fix: only when Memory has no answer, the remembered overcome fails, or the same friction repeats. Then type by durable repair surface (\`harness|doctrine|injection|env|code\`) ⇒ \`greprag fix spawn --type <type> "<unit>"\`. It PRINTS a fix-chip mission — YOU then create the visible child task with that mission as its first message (how: \`greprag load ${spawnEntry}\`, or your harness's native task tool). Repo write = isolated worktree; data-only row/diagnosis = no repo write. One unresolved unit per chip; the chip fixes, verifies, commits useful work, and hands it to the mission delivery owner.`,
+        `• Unresolved friction ⇒ fix: only when Memory has no answer, the remembered overcome fails, or the same friction repeats. Then type by durable repair surface (\`harness|doctrine|injection|env|code\`) ⇒ \`greprag fix spawn --type <type> "<unit>"\`. It PRINTS a fix-chip mission — YOU then create the visible child task with that mission as its first message (how: \`greprag load ${spawnEntry}\`, or your harness's native task tool). Repo write = isolated worktree; data-only row/diagnosis = no repo write. One unresolved unit per chip; the chip fixes, verifies, commits useful work, and hands it to the mission owner.`,
         '• Teach the system, not the chat: explained twice by the operator ⇒ it belongs in a skill / load entry / STATE block / ADR, not the conversation.',
     ].join('\n');
 }

package/dist/commands/reminder-registry.js

@@ -20,7 +20,6 @@ const assistant_reminder_1 = require("./assistant-reminder");
 const memory_reflex_1 = require("./memory-reflex");
 const arm_reminder_1 = require("./arm-reminder");
 const friction_reminder_1 = require("./friction-reminder");
-const collision_reminder_1 = require("./collision-reminder");
 const version_reminder_1 = require("./version-reminder");
 const enrichment_health_reminder_1 = require("./enrichment-health-reminder");
 const skill_gain_reminder_1 = require("./skill-gain-reminder");
@@ -56,7 +55,6 @@ exports.REGISTRY = [
     memory_reflex_1.memoryPrimerModule,
     arm_reminder_1.watcherArmModule,
     friction_reminder_1.mechanicFrictionModule,
-    collision_reminder_1.collisionMatchModule, // source: 'command' — evaluated at PreToolUse, not UserPromptSubmit
 ];
 /** Derive a harness's registry by EXCLUSION, never by include-list. A module with no
  *  `harnesses` declaration ships to every harness; a declared list scopes it. This is

package/dist/delivery-config.js

@@ -91,8 +91,8 @@ function parseProfile(root, raw) {
         errors.push('git.defaultBranch is invalid');
     if (!remote || !/^[A-Za-z0-9._-]+$/.test(remote))
         errors.push('git.remote is invalid');
-    if (strategy !== 'merge' && strategy !== 'rebase' && strategy !== 'ff-only') {
-        errors.push('git.integrationStrategy must be merge, rebase, or ff-only');
+    if (strategy !== 'merge' && strategy !== 'rebase' && strategy !== 'ff-only' && strategy !== 'pr') {
+        errors.push('git.integrationStrategy must be merge, rebase, ff-only, or pr');
     }
     if (typeof pushDeploys !== 'boolean')
         errors.push('git.pushDeploys must be boolean');

package/dist/hook.js

@@ -112,10 +112,6 @@ const archive_1 = require("./commands/archive");
 // repo (cloud watcher registry) and inject a coordinate-now directive. All real
 // logic lives in ./commands/collision-check. docs/schematic-triggers.md
 const collision_check_1 = require("./commands/collision-check");
-// Coordinate-GATE (PreToolUse) — on risky shared-state actions, Claude/OpenCode
-// consult the watcher registry and inject advisory context. Codex no longer
-// uses this gate.
-const coordinate_gate_1 = require("./commands/coordinate-gate");
 // (The asyncRewake idle-wake poll was REVERTED 2026-06-23 — falsified: a detached
 // process's exit-2 has no harness event to attach to in true deep idle, so it never
 // woke an idle session. Only a live Monitor task delivers to idle. adr: adr/monitor-
@@ -2165,68 +2161,6 @@ function stateUpdate(input) {
     }
     catch { /* state update is best-effort — never block the turn */ }
 }
-/** PreToolUse coordinate-GATE. On a risky shared-state action (git merge / push /
- *  deploy), Claude/OpenCode do a FRESH inbox-watchers read and inject the roster;
- *  Codex denies until committed, artifact-bound native task conferral evidence
- *  exists. The network read fires ONLY for non-Codex risky commands — a non-risky
- *  Bash call is classified locally and exits silent. NO dedup for non-Codex: a
- *  fresh read every fire (a stale roster at merge is the exact failure it
- *  prevents). Reads only the watcher registry (no inbox content) — no eavesdrop
- *  surface. Watcher misses fail quiet. docs/collision-schematic.md */
-async function coordinateGate(input) {
-    const cwd = input.cwd || process.cwd();
-    const cfg = (0, hook_runtime_1.getHookConfig)(cwd);
-    if (!cfg.enabled || !cfg.apiKey)
-        return; // unconfigured → silent
-    const short = (0, session_id_1.truncateSessionId)(input.session_id);
-    if (!short)
-        return; // no session id → silent
-    // Local + cheap: classify BEFORE any network so non-risky calls cost nothing.
-    const toolInput = (input.tool_input || {});
-    const trigger = (0, coordinate_gate_1.triggerFromPreToolUse)(input.tool_name || '', toolInput);
-    if (!trigger)
-        return; // not a risky action → silent
-    let anchor;
-    try {
-        anchor = (0, project_anchor_1.readAnchor)(cwd);
-    }
-    catch {
-        return;
-    }
-    if (!anchor.projectId)
-        return; // unanchored → nothing to match
-    // I/O stays in the hook: fresh peer read off the hot path → env.collisionPeers.
-    const peers = await (0, coordinate_gate_1.resolveCollisionPeers)({
-        short,
-        projectId: anchor.projectId,
-        projectName: anchor.projectName,
-        apiUrl: cfg.apiUrl,
-        apiKey: cfg.apiKey,
-        alias: (0, session_id_1.readIdentityAlias)(),
-    });
-    if (peers.length === 0)
-        return; // no live peer in this repo → proceed
-    // Route through the registry: build the command-read env, run the command-source
-    // modules (the collision Match). The standalone gate is now a registry citizen.
-    const env = {
-        short, turnCount: 0, stress: 0, armed: false, sessionUnread: 0,
-        alias: (0, session_id_1.readIdentityAlias)(),
-        toolCommand: typeof toolInput.command === 'string' ? toolInput.command : '',
-        collisionPeers: peers,
-    };
-    const fired = (0, reminder_registry_1.collectReminders)(env, (0, app_settings_1.filterEnabledInterrupts)((0, reminder_registry_1.commandModules)()));
-    if (!fired.length)
-        return;
-    // Effect: inject as additionalContext — advisory heads-up, NO permission pause.
-    // `ask` was too intrusive (prompted on every git op while peers were live); inject
-    // keeps the agent aware without a manual-allow.
-    process.stdout.write(JSON.stringify({
-        hookSpecificOutput: {
-            hookEventName: input.hook_event_name || 'PreToolUse',
-            additionalContext: fired.map(f => f.line).join('\n\n'),
-        },
-    }) + '\n');
-}
 /** Detached background child: refetch the matchset + rewrite the cache. */
 async function guardRefresh(input) {
     const cwd = input.cwd || process.cwd();
@@ -2386,10 +2320,9 @@ async function main() {
         await drain(input);
     }
     else if (subcommand === 'coordinate-gate') {
-        // Claude/OpenCode PreToolUse[Bash] — fresh watcher read + context injection
-        // when a risky shared-state action has a live same-repo peer.
-        // docs/collision-schematic.md
-        await coordinateGate(input);
+        // Retired delivery polling gate. Kept as a no-op so old installed hook
+        // configs stop polling immediately and remain compatible until init cleanup.
+        return;
     }
     else if (subcommand === 'codex-coordinate-gate') {
         // Retired Codex PreToolUse coordination gate. Kept as a no-op so older