@edgehero/pi-dispatch-receiver 2.0.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgehero/pi-dispatch-receiver",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "type": "module",
   "description": "The pi-dispatch trigger edge: verifies GitHub, GitLab, Forgejo and Azure DevOps webhooks, or polls GitHub with no public URL, and queues one pi coding agent job per event (per replica, if set) for the worker.",
   "keywords": [
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@octokit/webhooks": "14.2.0",
-    "@edgehero/pi-dispatch": "^2.0.0",
+    "@edgehero/pi-dispatch": "^3.0.0",
     "bullmq": "5.80.4",
     "ioredis": "5.11.1"
   }

package/src/boot-retry.mjs

@@ -41,11 +41,14 @@
  *    deadline and was skipped -- a forge that came back at t=50 was missed, and "retries for the
  *    whole window" was false in the letter. The clamp is also what makes an uncancellable injected
  *    `sleep` safe: every sleep awaited here runs to completion, always followed by one more attempt.
- *  - Log lines carry `err?.message` only, never a value -- the `receiver_start_failed` posture.
+ *  - Log lines carry `err?.message` only, never a value -- the `receiver_start_failed` posture. A GitHub
+ *    answer adds its status and request id (`githubFailureFields`, issue #530), never a header beyond that.
  *
  * Total wall clock: the helper settles within `windowMs + attemptTimeoutMs`.
  */
 
+import { githubFailureFields } from "@edgehero/pi-dispatch/octokit-log";
+
 // The first gap is what `RestartSec=5` gave, now in-process: a blip recovers exactly as fast as the
 // supervisor loop it replaces. It doubles to a cap borrowed from the worker's AUTH_RETRY_COOLDOWN_MS
 // rationale (worker/src/start.mjs): short enough to pick the forge up within one gap of it coming
@@ -127,13 +130,13 @@ export async function retryIdentity(
 			if (err?.piDispatchConfig === true) throw err;
 			const remainingMs = deadline - now();
 			if (remainingMs <= 0) {
-				log({ event: "identity_retry_exhausted", forge, attempts: attempt, windowMs, reason: err?.message });
+				log({ event: "identity_retry_exhausted", forge, attempts: attempt, windowMs, reason: err?.message, ...githubFailureFields(err) });
 				throw err;
 			}
 			// Clamped, so the last gap ends exactly at the deadline and the final attempt runs at the
 			// window's edge -- see the header for the measured 35s-of-60s failure the clamp removes.
 			const gapMs = Math.min(delay, remainingMs);
-			log({ event: "identity_retry", forge, attempt, reason: err?.message, delayMs: gapMs });
+			log({ event: "identity_retry", forge, attempt, reason: err?.message, ...githubFailureFields(err), delayMs: gapMs });
 			await sleep(gapMs);
 			delay = Math.min(delay * 2, delayCapMs);
 		}

package/src/config.mjs

@@ -318,9 +318,9 @@ function loadTriggers(env, readFile, fileExists) {
 		}
 		const group = groups[run.kind];
 		if (on.type === "label") {
-			group.label.push({ index, predicate: { any: on.any, all: on.all, none: on.none }, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas, repository: run.repository });
+			group.label.push({ index, predicate: { any: on.any, all: on.all, none: on.none }, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, provider: run.provider, model: run.model, maxTurns: run.maxTurns, models: run.models, maxCostUsd: run.maxCostUsd, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas, repository: run.repository });
 		} else if (on.type === "comment") {
-			group.comment = { index, phrase: on.phrase, defaultFlow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas, repository: run.repository }; // parseTriggers guarantees at most one per forge
+			group.comment = { index, phrase: on.phrase, defaultFlow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, provider: run.provider, model: run.model, maxTurns: run.maxTurns, models: run.models, maxCostUsd: run.maxCostUsd, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas, repository: run.repository }; // parseTriggers guarantees at most one per forge
 		} else if (on.type === "pull_request") {
 			// The close-only split (issue #231): a close rule routes through the close gate (the CLOSER's
 			// resolved authority) and every other PR rule through the author gate, so they live in separate
@@ -329,17 +329,17 @@ function loadTriggers(env, readFile, fileExists) {
 			// split reads the SHARED close-word table, never a re-typed word.
 			const closeWord = PR_CLOSE_ACTIONS[run.kind];
 			if (closeWord !== undefined && on.action.includes(closeWord)) {
-				group.prClose.push({ index, actions: new Set(on.action), number: on.number, once: on.once, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas });
+				group.prClose.push({ index, actions: new Set(on.action), number: on.number, once: on.once, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, provider: run.provider, model: run.model, maxTurns: run.maxTurns, models: run.models, maxCostUsd: run.maxCostUsd, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas });
 			} else {
 				// `reviewStates` is null rather than an empty Set when unnarrowed: the filter tests it for
 				// presence, and an empty Set would read as "no verdict matches" and silently refuse everything.
-				group.pullRequest.push({ index, actions: new Set(on.action), reviewStates: on.reviewState ? new Set(on.reviewState) : null, predicate: { any: on.any, all: on.all, none: on.none }, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas });
+				group.pullRequest.push({ index, actions: new Set(on.action), reviewStates: on.reviewState ? new Set(on.reviewState) : null, predicate: { any: on.any, all: on.all, none: on.none }, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, provider: run.provider, model: run.model, maxTurns: run.maxTurns, models: run.models, maxCostUsd: run.maxCostUsd, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas });
 			}
 		} else if (on.type === "issue") {
 			// The close-trigger kind (issue #231). No predicate and no reviewStates by construction (the
 			// loader refused both), and `number`/`once` ride conditionally-present exactly as the loader
 			// normalized them -- the filter's close route reads them, nothing else does.
-			group.issue.push({ index, actions: new Set(on.action), number: on.number, once: on.once, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas });
+			group.issue.push({ index, actions: new Set(on.action), number: on.number, once: on.once, flow: run.flow, command: run.command, packages: run.packages, image: run.image, backend: run.backend, excludeTools: run.excludeTools, provider: run.provider, model: run.model, maxTurns: run.maxTurns, models: run.models, maxCostUsd: run.maxCostUsd, skillsDir: run.skillsDir, instructions: run.instructions, resume: run.resume, secrets: run.secrets, secretsProfile: run.secretsProfile, waitFor: run.waitFor, replicas: run.replicas });
 		}
 	}
 

package/src/filter-azure.mjs

@@ -117,6 +117,16 @@ export function filterAzure(subset, triggers, knownFlows, selfId, authorized, de
 		...(resolved.backend !== undefined ? { backend: resolved.backend } : {}),
 		// #291. A separate spread, filter.mjs's backend rule: a dropped exclusion runs the job WITH the tool.
 		...(resolved.excludeTools !== undefined ? { excludeTools: resolved.excludeTools } : {}),
+		// #502. One spread PER FIELD, the excludeTools rule above: folded into one conditional, a trigger
+		// that named only a model would have its provider's absence decide whether the model survives,
+		// and a dropped model runs the job on the deployment default while the file reads as chosen.
+		...(resolved.provider !== undefined ? { provider: resolved.provider } : {}),
+		...(resolved.model !== undefined ? { model: resolved.model } : {}),
+		...(resolved.maxTurns !== undefined ? { maxTurns: resolved.maxTurns } : {}),
+		...(resolved.models !== undefined ? { models: resolved.models } : {}),
+		// #501. Its own spread, the rule above: a dropped cap runs the job under the deployment's cap, or none,
+		// while the file reads as narrowed.
+		...(resolved.maxCostUsd !== undefined ? { maxCostUsd: resolved.maxCostUsd } : {}),
 		// The trigger's injected skills dir (REQ-PER-TRIGGER-SKILLS), at JOB level beside image/packages and
 		// NEVER inside `trigger`. That placement is sharpest here of all: `trigger` is carried into
 		// /job/event.json, and a worker-host path in an agent-readable file is the leak prepare-local's
@@ -194,6 +204,7 @@ function matchLabelRules(subset, triggers, labels, action) {
 		repository: rule.repository,
 		packages: rule.packages,
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -238,6 +249,7 @@ function routeComment(subset, triggers, knownFlows, targetType) {
 		repository: triggers.comment.repository,
 		packages: triggers.comment.packages,
 		image: triggers.comment.image, backend: triggers.comment.backend, excludeTools: triggers.comment.excludeTools,
+		provider: triggers.comment.provider, model: triggers.comment.model, maxTurns: triggers.comment.maxTurns, models: triggers.comment.models, maxCostUsd: triggers.comment.maxCostUsd,
 		skillsDir: triggers.comment.skillsDir,
 		secrets: triggers.comment.secrets,
 		secretsProfile: triggers.comment.secretsProfile,
@@ -271,6 +283,7 @@ function routePullRequest(subset, triggers, action) {
 			repository: rule.repository,
 			packages: rule.packages,
 			image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+			provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 			skillsDir: rule.skillsDir,
 			secrets: rule.secrets,
 			secretsProfile: rule.secretsProfile,

package/src/filter-forgejo.mjs

@@ -131,6 +131,16 @@ export function filterForgejo(eventName, subset, triggers, knownFlows, selfId, a
 		...(resolved.backend !== undefined ? { backend: resolved.backend } : {}),
 		// #291. A separate spread, filter.mjs's backend rule: a dropped exclusion runs the job WITH the tool.
 		...(resolved.excludeTools !== undefined ? { excludeTools: resolved.excludeTools } : {}),
+		// #502. One spread PER FIELD, the excludeTools rule above: folded into one conditional, a trigger
+		// that named only a model would have its provider's absence decide whether the model survives,
+		// and a dropped model runs the job on the deployment default while the file reads as chosen.
+		...(resolved.provider !== undefined ? { provider: resolved.provider } : {}),
+		...(resolved.model !== undefined ? { model: resolved.model } : {}),
+		...(resolved.maxTurns !== undefined ? { maxTurns: resolved.maxTurns } : {}),
+		...(resolved.models !== undefined ? { models: resolved.models } : {}),
+		// #501. Its own spread, the rule above: a dropped cap runs the job under the deployment's cap, or none,
+		// while the file reads as narrowed.
+		...(resolved.maxCostUsd !== undefined ? { maxCostUsd: resolved.maxCostUsd } : {}),
 		// The trigger's injected skills dir (REQ-PER-TRIGGER-SKILLS), at JOB level beside image/packages and
 		// NEVER inside `trigger`. That placement is sharpest here of all: `trigger` is carried into
 		// /job/event.json, and a worker-host path in an agent-readable file is the leak prepare-local's
@@ -174,6 +184,7 @@ function routeIssueLabel(subset, triggers) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages, // the MATCHED rule's fields -- rules in one file may differ on them
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -223,6 +234,7 @@ function routeComment(subset, triggers, knownFlows) {
 		...(command !== undefined ? { command } : { flow }),
 		packages: triggers.comment.packages,
 		image: triggers.comment.image, backend: triggers.comment.backend, excludeTools: triggers.comment.excludeTools,
+		provider: triggers.comment.provider, model: triggers.comment.model, maxTurns: triggers.comment.maxTurns, models: triggers.comment.models, maxCostUsd: triggers.comment.maxCostUsd,
 		skillsDir: triggers.comment.skillsDir,
 		secrets: triggers.comment.secrets,
 		secretsProfile: triggers.comment.secretsProfile,
@@ -254,6 +266,7 @@ function routePullRequest(subset, triggers, action) {
 			...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 			packages: rule.packages,
 			image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+			provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 			skillsDir: rule.skillsDir,
 			secrets: rule.secrets,
 			secretsProfile: rule.secretsProfile,
@@ -309,6 +322,7 @@ function routeIssueClose(subset, triggers, authorized) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages, // the MATCHED rule's fields -- rules in one file may differ on them
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -345,6 +359,7 @@ function routePullRequestClose(subset, triggers, authorized) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages,
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,

package/src/filter-gitlab.mjs

@@ -134,6 +134,16 @@ export function filterGitLab(subset, triggers, knownFlows, selfId, authorized, d
 		...(resolved.backend !== undefined ? { backend: resolved.backend } : {}),
 		// #291. A separate spread, filter.mjs's backend rule: a dropped exclusion runs the job WITH the tool.
 		...(resolved.excludeTools !== undefined ? { excludeTools: resolved.excludeTools } : {}),
+		// #502. One spread PER FIELD, the excludeTools rule above: folded into one conditional, a trigger
+		// that named only a model would have its provider's absence decide whether the model survives,
+		// and a dropped model runs the job on the deployment default while the file reads as chosen.
+		...(resolved.provider !== undefined ? { provider: resolved.provider } : {}),
+		...(resolved.model !== undefined ? { model: resolved.model } : {}),
+		...(resolved.maxTurns !== undefined ? { maxTurns: resolved.maxTurns } : {}),
+		...(resolved.models !== undefined ? { models: resolved.models } : {}),
+		// #501. Its own spread, the rule above: a dropped cap runs the job under the deployment's cap, or none,
+		// while the file reads as narrowed.
+		...(resolved.maxCostUsd !== undefined ? { maxCostUsd: resolved.maxCostUsd } : {}),
 		// The trigger's injected skills dir (REQ-PER-TRIGGER-SKILLS), at JOB level beside image/packages and
 		// NEVER inside `trigger`. That placement is sharpest here of all: `trigger` is carried into
 		// /job/event.json, and a worker-host path in an agent-readable file is the leak prepare-local's
@@ -184,6 +194,7 @@ function routeLabel(subset, triggers, targetType) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages,
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -248,6 +259,7 @@ function mrResult(subset, rule, matched) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages,
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -294,6 +306,7 @@ function routeIssueClose(subset, triggers, authorized) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages, // the MATCHED rule's fields -- rules in one file may differ on them
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -328,6 +341,7 @@ function routeMergeRequestClose(subset, triggers, authorized) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages,
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -380,6 +394,7 @@ function routeNote(subset, triggers, knownFlows) {
 		...(command !== undefined ? { command } : { flow }),
 		packages: triggers.comment.packages,
 		image: triggers.comment.image, backend: triggers.comment.backend, excludeTools: triggers.comment.excludeTools,
+		provider: triggers.comment.provider, model: triggers.comment.model, maxTurns: triggers.comment.maxTurns, models: triggers.comment.models, maxCostUsd: triggers.comment.maxCostUsd,
 		skillsDir: triggers.comment.skillsDir,
 		secrets: triggers.comment.secrets,
 		secretsProfile: triggers.comment.secretsProfile,

package/src/filter.mjs

@@ -121,7 +121,8 @@ export function filter(eventName, subset, cfg, selfId, deliveryId, closerAuthori
 	if (!resolved.enqueue) return resolved; // carries the drop reason
 
 	// (3) Build the job from the INT-WEBHOOK-PAYLOAD-SUBSET fields only. No sender.login (not in the
-	// subset), no provider/model/maxTurns (the worker fills defaults), no field outside the subset --
+	// subset), provider/model/maxTurns only when the matched rule named them (absent, the worker fills the
+	// deployment default, #502), no field outside the subset --
 	// with two trigger-context additions (issue #49): `matched` is harness-computed, the filter's own
 	// decision record naming the triggers.json entry that fired (not payload data at all); `comment`,
 	// present only on the comment route, carries the invoking comment's body/author_association, both
@@ -156,6 +157,16 @@ export function filter(eventName, subset, cfg, selfId, deliveryId, closerAuthori
 		// dropped exclusion runs the job WITH the tool, the destructive absence the loader's own sweep
 		// refuses a misspelling for, arriving through the plumbing instead of the spelling.
 		...(resolved.excludeTools !== undefined ? { excludeTools: resolved.excludeTools } : {}),
+		// #502. One spread PER FIELD, the excludeTools rule above: folded into one conditional, a trigger
+		// that named only a model would have its provider's absence decide whether the model survives,
+		// and a dropped model runs the job on the deployment default while the file reads as chosen.
+		...(resolved.provider !== undefined ? { provider: resolved.provider } : {}),
+		...(resolved.model !== undefined ? { model: resolved.model } : {}),
+		...(resolved.maxTurns !== undefined ? { maxTurns: resolved.maxTurns } : {}),
+		...(resolved.models !== undefined ? { models: resolved.models } : {}),
+		// #501. Its own spread, the rule above: a dropped cap runs the job under the deployment's cap, or none,
+		// while the file reads as narrowed.
+		...(resolved.maxCostUsd !== undefined ? { maxCostUsd: resolved.maxCostUsd } : {}),
 		// The trigger's injected skills dir (REQ-PER-TRIGGER-SKILLS), at JOB level beside image/packages and
 		// NEVER inside `trigger`. That placement is sharpest here of all: `trigger` is carried into
 		// /job/event.json, and a worker-host path in an agent-readable file is the leak prepare-local's
@@ -211,6 +222,7 @@ function routeIssueLabel(subset, triggers) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages, // the MATCHED rule's fields -- rules in one file may differ on them
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,
@@ -271,6 +283,7 @@ function routeComment(subset, triggers, knownFlows) {
 		// <flow>` override changes WHICH flow runs, never which triggers.json entry authorized it.
 		packages: triggers.comment.packages,
 		image: triggers.comment.image, backend: triggers.comment.backend, excludeTools: triggers.comment.excludeTools,
+		provider: triggers.comment.provider, model: triggers.comment.model, maxTurns: triggers.comment.maxTurns, models: triggers.comment.models, maxCostUsd: triggers.comment.maxCostUsd,
 		skillsDir: triggers.comment.skillsDir,
 		secrets: triggers.comment.secrets,
 		secretsProfile: triggers.comment.secretsProfile,
@@ -369,6 +382,7 @@ function routePullRequest(subset, triggers, action) {
 			...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 			packages: rule.packages, // the MATCHED rule's fields -- rules in one file may differ on them
 			image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+			provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 			skillsDir: rule.skillsDir,
 			secrets: rule.secrets,
 			secretsProfile: rule.secretsProfile,
@@ -485,6 +499,7 @@ function routeClose(rules, number, closerAuthorized, matchedFor, targetFor) {
 		...(rule.command !== undefined ? { command: rule.command } : { flow: rule.flow }),
 		packages: rule.packages, // the MATCHED rule's fields -- rules in one file may differ on them
 		image: rule.image, backend: rule.backend, excludeTools: rule.excludeTools,
+		provider: rule.provider, model: rule.model, maxTurns: rule.maxTurns, models: rule.models, maxCostUsd: rule.maxCostUsd,
 		skillsDir: rule.skillsDir,
 		secrets: rule.secrets,
 		secretsProfile: rule.secretsProfile,

package/src/poller.mjs

@@ -203,7 +203,8 @@ export async function startPoller(env = process.env, deps = {}) {
 	// `auth ??= await ...` assigns only when the mint RESOLVES, so a retried getAuth re-invokes
 	// makeAuth. Caching the PROMISE instead would memoize the first failure and turn the retry loop
 	// into a rethrow spinner -- pinned by the poller's retry test.
-	const getAuth = async () => (auth ??= await makeAuth(cfg.github));
+	// Issue #530: the GitHub client's own warnings go through this JSON log, never Octokit's plain console lines.
+	const getAuth = async () => (auth ??= await makeAuth(cfg.github, { log: (event, fields) => out({ event, ...fields }) }));
 	const selfId = await retryIdentity(
 		() => (selfIdFn ? selfIdFn(cfg.github) : getAuth().then((a) => a.selfId)),
 		{ forge: "github", windowMs: cfg.identityRetryWindowMs, log: out, now, sleep: sleepFn },

package/src/start.mjs

@@ -49,6 +49,7 @@ import { makeQueue } from "@edgehero/pi-dispatch/queue";
 import { makeForgeRouter } from "./route.mjs";
 import { judgeValkeyAtStart, parseConnection, valkeyClientContext } from "@edgehero/pi-dispatch/connection";
 import { WATCH_DEBOUNCE_MS, changedWhileArming, makeWatchCloser, readBeforeArming } from "@edgehero/pi-dispatch/watch-closer";
+import { githubFailureFields } from "@edgehero/pi-dispatch/octokit-log";
 import { retryIdentity } from "./boot-retry.mjs";
 
 /**
@@ -145,7 +146,8 @@ export async function startReceiver(
 		// one credential decision -- an arm that resolved its identity is exactly the arm that can answer
 		// a permission question. This is also why the github handler's missing-resolver 503 is unreachable
 		// in a wired receiver: a boot that fails here mounts no `/` at all.
-		const auth = await retryIdentity(() => makeAuth(cfg.github), { forge: "github", ...retryOpts });
+		// Issue #530: the GitHub client's own warnings go through this JSON log, never Octokit's plain console lines.
+		const auth = await retryIdentity(() => makeAuth(cfg.github, { log: (event, fields) => log({ event, ...fields }) }), { forge: "github", ...retryOpts });
 		selfId = auth.selfId;
 		log({ event: "self_identity", id: selfId, source: cfg.github.source });
 		// The lookup token asks the mint to narrow to metadata:read -- the App path honors it GitHub-side,
@@ -372,7 +374,7 @@ if (isEntryModule(import.meta.url)) {
 	// An unhandled rejection is printed as its message alone (PR #475's review), never Node's print of the whole reason.
 	installRejectionPrinter();
 	startReceiver(process.env).catch((err) => {
-		process.stderr.write(`${JSON.stringify({ event: "receiver_start_failed", reason: err?.message })}\n`);
+		process.stderr.write(`${JSON.stringify({ event: "receiver_start_failed", reason: err?.message, ...githubFailureFields(err) })}\n`);
 		// entryExitCode, NOT a bare 1. This file is what `receiver.service` execs -- cli.mjs is not on that
 		// path -- so the mapping cli.mjs documents ("a supervisor restarting on exit 2 would loop on a config
 		// that can never parse") only reaches a real deployment from here. A tagged config refusal exits 2