@hasna/loops 0.4.10 → 0.4.12

package/dist/cli/index.js

@@ -1323,6 +1323,7 @@ function rowToWorkflowWorkItem(row) {
     subjectRef: row.subject_ref,
     projectKey: row.project_key ?? undefined,
     projectGroup: row.project_group ?? undefined,
+    routeScope: row.route_scope ?? undefined,
     priority: row.priority,
     status: row.status,
     attempts: row.attempts,
@@ -1603,6 +1604,13 @@ class Store {
           this.addColumnIfMissing("loop_runs", "claim_token", "TEXT");
           this.db.exec("CREATE INDEX IF NOT EXISTS idx_runs_claim_token ON loop_runs(claim_token) WHERE claim_token IS NOT NULL");
         }
+      },
+      {
+        id: "0008_work_item_route_scope",
+        apply: () => {
+          this.addColumnIfMissing("workflow_work_items", "route_scope", "TEXT");
+          this.db.exec("CREATE INDEX IF NOT EXISTS idx_workflow_work_items_scope ON workflow_work_items(route_scope, status)");
+        }
       }
     ];
   }
@@ -1750,6 +1758,7 @@ class Store {
         subject_ref TEXT NOT NULL,
         project_key TEXT,
         project_group TEXT,
+        route_scope TEXT,
         priority INTEGER NOT NULL,
         status TEXT NOT NULL,
         attempts INTEGER NOT NULL,
@@ -1767,6 +1776,13 @@ class Store {
       CREATE INDEX IF NOT EXISTS idx_workflow_work_items_project ON workflow_work_items(project_key, status);
       CREATE INDEX IF NOT EXISTS idx_workflow_work_items_group ON workflow_work_items(project_group, status);
       CREATE INDEX IF NOT EXISTS idx_workflow_work_items_invocation ON workflow_work_items(invocation_id);
+      -- idx_workflow_work_items_scope (route_scope, status) is created ONLY by
+      -- migration 0008_work_item_route_scope, never here: this baseline DDL
+      -- re-runs on EVERY open (0001 is not skip-guarded), and on a pre-0008
+      -- database the CREATE TABLE above is a no-op, so an index on route_scope
+      -- here would execute before the column exists and crash the open
+      -- ("no such column: route_scope"). New columns may be folded into the
+      -- CREATE TABLE (fresh-db only); their indexes must live in the migration.
 
       CREATE TABLE IF NOT EXISTS workflow_step_runs (
         id TEXT PRIMARY KEY,
@@ -2558,10 +2574,10 @@ class Store {
     const id = genId();
     const status = input.status ?? "queued";
     this.db.query(`INSERT INTO workflow_work_items (id, route_key, idempotency_key, invocation_id, source_type, source_ref,
-          subject_ref, project_key, project_group, priority, status, attempts, next_attempt_at, lease_expires_at,
+          subject_ref, project_key, project_group, route_scope, priority, status, attempts, next_attempt_at, lease_expires_at,
           workflow_id, loop_id, workflow_run_id, last_reason, created_at, updated_at)
          VALUES ($id, $routeKey, $idempotencyKey, $invocationId, $sourceType, $sourceRef, $subjectRef,
-          $projectKey, $projectGroup, $priority, $status, 0, $nextAttemptAt, NULL, NULL, NULL, NULL,
+          $projectKey, $projectGroup, $routeScope, $priority, $status, 0, $nextAttemptAt, NULL, NULL, NULL, NULL,
           $lastReason, $created, $updated)
          ON CONFLICT(route_key, idempotency_key) DO UPDATE SET
           invocation_id=excluded.invocation_id,
@@ -2570,6 +2586,7 @@ class Store {
           subject_ref=excluded.subject_ref,
           project_key=excluded.project_key,
           project_group=excluded.project_group,
+          route_scope=excluded.route_scope,
           priority=excluded.priority,
           status=CASE
             WHEN workflow_work_items.status IN ('succeeded', 'admitted', 'running', 'failed', 'dead_letter', 'cancelled')
@@ -2611,6 +2628,7 @@ class Store {
       $subjectRef: input.subjectRef,
       $projectKey: input.projectKey ?? null,
       $projectGroup: input.projectGroup ?? null,
+      $routeScope: input.routeScope ?? null,
       $priority: input.priority ?? 0,
       $status: status,
       $nextAttemptAt: input.nextAttemptAt ?? null,
@@ -2648,11 +2666,21 @@ class Store {
   countActiveWorkflowWorkItems(args = {}) {
     const active = ["admitted", "running"];
     const placeholders = active.map(() => "?").join(",");
-    const global = this.db.query(`SELECT COUNT(*) AS count FROM workflow_work_items WHERE status IN (${placeholders})`).get(...active)?.count ?? 0;
+    const routeScope = args.routeScope?.trim() || undefined;
+    const global = routeScope ? this.db.query(`SELECT COUNT(*) AS count FROM workflow_work_items WHERE status IN (${placeholders}) AND route_scope = ?`).get(...active, routeScope)?.count ?? 0 : this.db.query(`SELECT COUNT(*) AS count FROM workflow_work_items WHERE status IN (${placeholders})`).get(...active)?.count ?? 0;
     const project = args.projectKey ? this.db.query(`SELECT COUNT(*) AS count FROM workflow_work_items WHERE status IN (${placeholders}) AND project_key = ?`).get(...active, args.projectKey)?.count ?? 0 : 0;
     const projectGroup = args.projectGroup ? this.db.query(`SELECT COUNT(*) AS count FROM workflow_work_items WHERE status IN (${placeholders}) AND project_group = ?`).get(...active, args.projectGroup)?.count ?? 0 : undefined;
     return { global, project, ...projectGroup !== undefined ? { projectGroup } : {} };
   }
+  countRunningWorkflowStepsByAuthProfile() {
+    const rows = this.db.query("SELECT account_profile, COUNT(*) AS count FROM workflow_step_runs WHERE status = 'running' AND account_profile IS NOT NULL GROUP BY account_profile").all();
+    const counts = {};
+    for (const row of rows) {
+      if (row.account_profile)
+        counts[row.account_profile] = row.count;
+    }
+    return counts;
+  }
   requeueWorkflowWorkItem(id, patch = {}) {
     const current = this.getWorkflowWorkItem(id);
     if (!current)
@@ -3088,6 +3116,9 @@ class Store {
       }
       input.workflow.steps.forEach((step, sequence) => {
         const account = step.account ?? step.target.account;
+        const agentTarget = step.target.type === "agent" ? step.target : undefined;
+        const resolvedProfile = account?.profile ?? agentTarget?.authProfile ?? null;
+        const resolvedTool = account?.tool ?? (agentTarget?.authProfile ? agentTarget.provider : null);
         this.db.query(`INSERT INTO workflow_step_runs (id, workflow_run_id, step_id, sequence, status, started_at, finished_at,
               exit_code, pid, duration_ms, stdout, stderr, error, account_profile, account_tool, created_at, updated_at)
              VALUES ($id, $workflowRunId, $stepId, $sequence, 'pending', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -3096,8 +3127,8 @@ class Store {
           $workflowRunId: runId,
           $stepId: step.id,
           $sequence: sequence,
-          $accountProfile: account?.profile ?? null,
-          $accountTool: account?.tool ?? null,
+          $accountProfile: resolvedProfile,
+          $accountTool: resolvedTool,
           $created: now,
           $updated: now
         });
@@ -4237,7 +4268,7 @@ class Store {
 // package.json
 var package_default = {
   name: "@hasna/loops",
-  version: "0.4.10",
+  version: "0.4.12",
   description: "Persistent local loop and workflow runner for deterministic commands and headless AI coding agents",
   type: "module",
   main: "dist/index.js",
@@ -6969,6 +7000,9 @@ function buildHealthReport(store, opts = {}) {
 }
 
 // src/lib/scheduler.ts
+function loopLane(loop) {
+  return loop.target.type === "command" ? "command" : "agent";
+}
 function manualRunScheduledFor(loop, now = new Date) {
   if (loop.archivedAt)
     return now.toISOString();
@@ -7361,14 +7395,23 @@ function claimDueRuns(deps) {
   const maxClaims = Math.max(0, deps.maxClaims ?? Number.POSITIVE_INFINITY);
   if (maxClaims === 0)
     return { claims, claimed, completed: [], skipped, recovered, expired };
+  const laneLimits = deps.laneLimits;
+  const laneClaims = { command: 0, agent: 0 };
+  const laneCap = (lane) => laneLimits === undefined ? Number.POSITIVE_INFINITY : Math.max(0, laneLimits[lane] ?? Number.POSITIVE_INFINITY);
+  const laneFull = (lane) => laneClaims[lane] >= laneCap(lane);
   for (const loop of deps.store.dueLoops(now)) {
     if (claims.length >= maxClaims)
       break;
+    const lane = loopLane(loop);
+    if (laneFull(lane))
+      continue;
     const plan = dueSlots(loop, now);
     let loopSkips = 0;
     for (const slot of plan.slots) {
       if (claims.length >= maxClaims)
         break;
+      if (laneFull(lane))
+        break;
       if (loopSkips >= MAX_SKIPS_PER_LOOP_PER_TICK)
         break;
       const run = claimSlot(deps, loop, slot);
@@ -7377,6 +7420,7 @@ function claimDueRuns(deps) {
       if ("loop" in run) {
         claims.push(run);
         claimed.push(run.run);
+        laneClaims[lane] += 1;
       } else if (run.status === "skipped") {
         skipped.push(run);
         loopSkips += 1;
@@ -7648,13 +7692,23 @@ function intervalFromEnv() {
   const value = Number(raw);
   return Number.isFinite(value) && value > 0 ? value : undefined;
 }
-function concurrencyFromEnv() {
-  const raw = process.env.LOOPS_DAEMON_CONCURRENCY;
+function positiveIntEnv(name) {
+  const raw = process.env[name];
   if (!raw)
     return;
   const value = Number(raw);
   return Number.isInteger(value) && value > 0 ? value : undefined;
 }
+function concurrencyFromEnv() {
+  return positiveIntEnv("LOOPS_DAEMON_CONCURRENCY");
+}
+var DEFAULT_COMMAND_CONCURRENCY = 4;
+var DEFAULT_AGENT_CONCURRENCY = 8;
+function resolveLaneConcurrency(opts = {}) {
+  const command = Math.max(1, opts.commandConcurrency ?? positiveIntEnv("LOOPS_DAEMON_COMMAND_CONCURRENCY") ?? DEFAULT_COMMAND_CONCURRENCY);
+  const agent = Math.max(1, opts.agentConcurrency ?? opts.concurrency ?? positiveIntEnv("LOOPS_DAEMON_AGENT_CONCURRENCY") ?? concurrencyFromEnv() ?? DEFAULT_AGENT_CONCURRENCY);
+  return { command, agent };
+}
 var DAEMON_LOG_MAX_BYTES = 50 * 1024 * 1024;
 var DAEMON_LOG_KEEP = 2;
 function daemonLogLine(message) {
@@ -7700,7 +7754,7 @@ async function runDaemon(opts = {}) {
   const runnerId = `${hostname2()}:${process.pid}:${leaseId}`;
   const intervalMs = opts.intervalMs ?? intervalFromEnv() ?? 1000;
   const leaseTtlMs = opts.leaseTtlMs ?? Math.max(60000, intervalMs * 10);
-  const concurrency = Math.max(1, opts.concurrency ?? concurrencyFromEnv() ?? 4);
+  const laneConcurrency = resolveLaneConcurrency(opts);
   const log = opts.log ?? defaultDaemonLog;
   const sleep = opts.sleep ?? realSleep;
   const lease = store.acquireDaemonLease({
@@ -7712,12 +7766,13 @@ async function runDaemon(opts = {}) {
   if (!lease)
     throw new Error("another loops daemon holds the database lease");
   writePid(process.pid, pidPath);
-  log(`started pid=${process.pid} interval=${intervalMs}ms lease=${leaseId}`);
+  log(`started pid=${process.pid} interval=${intervalMs}ms lease=${leaseId} ` + `command_concurrency=${laneConcurrency.command} agent_concurrency=${laneConcurrency.agent}`);
   let stopFlag = false;
   let leaseLost = false;
   let leaseEpoch = 0;
   let runAbort = new AbortController;
   const activeRuns = new Map;
+  const activeByLane = { command: 0, agent: 0 };
   const requestStop = (message) => {
     stopFlag = true;
     if (!runAbort.signal.aborted)
@@ -7810,7 +7865,12 @@ async function runDaemon(opts = {}) {
     log(`run ${finalRun.id} ${finalRun.status} loop=${claim.loop.id}`);
   };
   const startClaim = (claim) => {
-    const task = executeDaemonRun(claim).catch((err) => log(`run ${claim.run.id} error: ${err instanceof Error ? err.message : String(err)}`)).finally(() => activeRuns.delete(claim.run.id));
+    const lane = loopLane(claim.loop);
+    activeByLane[lane] += 1;
+    const task = executeDaemonRun(claim).catch((err) => log(`run ${claim.run.id} error: ${err instanceof Error ? err.message : String(err)}`)).finally(() => {
+      activeRuns.delete(claim.run.id);
+      activeByLane[lane] -= 1;
+    });
     activeRuns.set(claim.run.id, task);
   };
   try {
@@ -7846,19 +7906,23 @@ async function runDaemon(opts = {}) {
       onTickError: (err) => log(`tick error: ${err instanceof Error ? err.message : String(err)}`),
       tickFn: async () => {
         ensureLease();
-        const available = Math.max(0, concurrency - activeRuns.size);
+        const laneLimits = {
+          command: Math.max(0, laneConcurrency.command - activeByLane.command),
+          agent: Math.max(0, laneConcurrency.agent - activeByLane.agent)
+        };
         const result = claimDueRuns({
           store,
           runnerId,
           daemonLeaseId: leaseId,
           beforeRun: () => ensureLease(),
-          maxClaims: available
+          maxClaims: laneLimits.command + laneLimits.agent,
+          laneLimits
         });
         for (const claim of result.claims)
           startClaim(claim);
         const changed = result.claims.length + result.skipped.length + result.recovered.length + result.expired.length;
         if (changed > 0) {
-          log(`tick claimed=${result.claims.length} active=${activeRuns.size} skipped=${result.skipped.length} recovered=${result.recovered.length} expired=${result.expired.length}`);
+          log(`tick claimed=${result.claims.length} active=${activeRuns.size} (command=${activeByLane.command} agent=${activeByLane.agent}) skipped=${result.skipped.length} recovered=${result.recovered.length} expired=${result.expired.length}`);
         }
         await reapAbandoned(result.recovered);
       }
@@ -9431,6 +9495,79 @@ function prHandoffCommand(opts) {
   ].join(`
 `);
 }
+
+// src/lib/route/profile-pool.ts
+function stableIndex(seed, size) {
+  let hash = 2166136261;
+  for (let i = 0;i < seed.length; i += 1) {
+    hash ^= seed.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return Math.abs(hash >>> 0) % size;
+}
+function poolRoleOffset(role) {
+  if (role === "worker")
+    return 0;
+  if (role === "verifier")
+    return 1;
+  if (role === "planner")
+    return 2;
+  return 3;
+}
+function selectLeastLoadedProfile(pool, loadCounts, anchor, exclude) {
+  const size = pool.length;
+  let best;
+  let bestExcluded = true;
+  let bestLoad = Number.POSITIVE_INFINITY;
+  for (let k = 0;k < size; k += 1) {
+    const profile = pool[(anchor + k) % size];
+    const excluded = exclude.has(profile);
+    const load = loadCounts[profile] ?? 0;
+    if (best === undefined) {
+      best = profile;
+      bestExcluded = excluded;
+      bestLoad = load;
+      continue;
+    }
+    const better = excluded === bestExcluded ? load < bestLoad : !excluded && bestExcluded;
+    if (better) {
+      best = profile;
+      bestExcluded = excluded;
+      bestLoad = load;
+    }
+  }
+  return best;
+}
+var ROLE_PRIORITY = ["worker", "verifier", "planner", "triage"];
+function assignPoolAuthProfiles(input) {
+  const pool = input.pool.filter((entry) => entry.trim().length > 0);
+  if (pool.length === 0)
+    return { profiles: {}, deferred: false, minLoad: 0 };
+  const minLoad = pool.reduce((min, profile) => Math.min(min, input.loadCounts[profile] ?? 0), Number.POSITIVE_INFINITY);
+  const guard = input.maxPerProfile !== undefined && input.maxPerProfile > 0;
+  if (guard && minLoad >= input.maxPerProfile) {
+    return {
+      profiles: {},
+      deferred: true,
+      minLoad,
+      reason: `per-profile active limit reached (all ${pool.length} pool members >= ${input.maxPerProfile} running; min ${minLoad})`
+    };
+  }
+  const workerIndex = stableIndex(input.seed, pool.length);
+  const rolesToAssign = ROLE_PRIORITY.filter((role) => input.roles.includes(role));
+  for (const role of input.roles)
+    if (!rolesToAssign.includes(role))
+      rolesToAssign.push(role);
+  const profiles = {};
+  const taken = new Set;
+  for (const role of rolesToAssign) {
+    const anchor = (workerIndex + poolRoleOffset(role)) % pool.length;
+    const profile = selectLeastLoadedProfile(pool, input.loadCounts, anchor, taken);
+    profiles[role] = profile;
+    taken.add(profile);
+  }
+  return { profiles, deferred: false, minLoad: Number.isFinite(minLoad) ? minLoad : 0 };
+}
 // src/lib/templates-custom.ts
 import { existsSync as existsSync6, lstatSync as lstatSync2, mkdirSync as mkdirSync7, readdirSync, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
 import { join as join6, resolve as resolve3 } from "path";
@@ -9826,25 +9963,13 @@ function parseDeterministicTimeoutMs(raw, fallbackMs, label = "timeoutMs") {
     throw new Error(`${label} must be a positive integer number of milliseconds`);
   return value;
 }
-function stableIndex(seed, size) {
-  let hash = 2166136261;
-  for (let i = 0;i < seed.length; i += 1) {
-    hash ^= seed.charCodeAt(i);
-    hash = Math.imul(hash, 16777619);
-  }
-  return Math.abs(hash >>> 0) % size;
-}
 function rolePoolValue(pool, seed, role) {
   if (!pool?.length)
     return;
   const workerIndex = stableIndex(seed, pool.length);
-  if (role === "worker" || pool.length === 1)
+  if (pool.length === 1)
     return pool[workerIndex];
-  if (role === "verifier")
-    return pool[(workerIndex + 1) % pool.length];
-  if (role === "planner")
-    return pool[(workerIndex + 2) % pool.length];
-  return pool[(workerIndex + 3) % pool.length];
+  return pool[(workerIndex + poolRoleOffset(role)) % pool.length];
 }
 function authProfileForRole(input, role, seed) {
   if (role === "triage" && input.triageAuthProfile)
@@ -10014,7 +10139,8 @@ function agentTarget(input, prompt, role, seed, plan) {
     allowlist: input.manualBreakGlass ? { enforcement: "metadata_only", commands: ["manual-break-glass"] } : undefined,
     routing: {
       projectPath: input.routeProjectPath ?? input.projectPath,
-      ...input.projectGroup ? { projectGroup: input.projectGroup } : {}
+      ...input.projectGroup ? { projectGroup: input.projectGroup } : {},
+      role
     },
     account: accountForRole(input, role, seed),
     timeoutMs: agentTimeoutMs(input),
@@ -11513,6 +11639,37 @@ function prReferenceFrom(text) {
     return { owner: short[1], repo: short[2], number: Number(short[3]) };
   return;
 }
+var PR_FINGERPRINT_FIELDS = [
+  "pr_fingerprint",
+  "prFingerprint",
+  "github_pr",
+  "githubPr",
+  "github_pr_fingerprint",
+  "githubPrFingerprint",
+  "pull_request_fingerprint",
+  "pullRequestFingerprint"
+];
+function prFingerprint(ref) {
+  return `${ref.owner.toLowerCase()}/${ref.repo.toLowerCase()}#${ref.number}`;
+}
+function prFingerprintFromField(value) {
+  if (!value)
+    return;
+  const match = /([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)#(\d+)/.exec(value);
+  return match ? prFingerprint({ owner: match[1], repo: match[2], number: Number(match[3]) }) : undefined;
+}
+function prFingerprintFromTask(data, metadata) {
+  const records = [...taskEventRecords(data, metadata), ...automationRecords(data, metadata)];
+  for (const field of PR_FINGERPRINT_FIELDS) {
+    for (const value of routeFieldValues(records, field)) {
+      const fingerprint = prFingerprintFromField(value);
+      if (fingerprint)
+        return fingerprint;
+    }
+  }
+  const ref = prReferenceFrom(routeEvidenceText(records));
+  return ref ? prFingerprint(ref) : undefined;
+}
 function ghAuthorResolver(ref) {
   const result = spawnSync7("gh", ["pr", "view", String(ref.number), "--repo", `${ref.owner}/${ref.repo}`, "--json", "author", "-q", ".author.login"], { encoding: "utf8", timeout: 20000 });
   if (result.error || result.status !== 0)
@@ -11588,7 +11745,9 @@ function prReviewRoutingDecision(data, metadata, opts, resolveAuthor = ghAuthorR
       allowed: false,
       reason: `PR is already ${prState.toLowerCase()}; skipping merge/review route (freshness gate)`,
       reviewers: [],
-      signals: [...signals, "pr-not-open"]
+      signals: [...signals, "pr-not-open"],
+      freshnessSkip: true,
+      prState
     };
   }
   const reviewers = githubLogins([
@@ -11685,7 +11844,8 @@ function routeProjectGroup(optsGroup, data, metadata) {
 function routeThrottleDecision(store, args) {
   const projectPath = normalizeRoutePath(args.projectPath) ?? resolve6(args.projectPath);
   const projectGroup = args.projectGroup?.trim() || undefined;
-  const counts = store.countActiveWorkflowWorkItems({ projectKey: projectPath, projectGroup });
+  const routeScope = args.routeScope?.trim() || undefined;
+  const counts = store.countActiveWorkflowWorkItems({ projectKey: projectPath, projectGroup, routeScope });
   const base = {
     projectPath,
     ...projectGroup ? { projectGroup } : {},
@@ -11847,6 +12007,33 @@ async function readEventEnvelopeInput(opts = {}) {
     throw new ValidationError("event.source is required");
   return event;
 }
+function resolveRouteScope(opts, routeKey) {
+  return opts.maxActiveScope?.trim() || process.env.LOOPS_LOOP_NAME?.trim() || routeKey || undefined;
+}
+function buildPoolRoutingPlan(opts, provider, authProfilePool, workflowBody, seed) {
+  if (provider !== "codewith")
+    return;
+  const pool = (authProfilePool ?? []).filter((entry) => entry.trim().length > 0);
+  if (pool.length < 2)
+    return;
+  const pinned = Boolean(opts.triageAuthProfile || opts.plannerAuthProfile || opts.workerAuthProfile || opts.verifierAuthProfile);
+  if (pinned)
+    return;
+  const rolesByStepId = {};
+  for (const step of workflowBody.steps) {
+    const target = step.target;
+    if (target.type !== "agent" || target.provider !== "codewith")
+      continue;
+    const role = target.routing?.role;
+    if (role)
+      rolesByStepId[step.id] = role;
+  }
+  if (Object.keys(rolesByStepId).length === 0)
+    return;
+  const explicitMax = nonNegativeInteger(opts.maxPerProfile, "--max-per-profile");
+  const maxPerProfile = explicitMax ?? 2;
+  return { pool, seed, maxPerProfile: maxPerProfile > 0 ? maxPerProfile : undefined, rolesByStepId };
+}
 function dedupedRoutePrint(plan, outcome) {
   return {
     kind: "deduped",
@@ -11876,6 +12063,7 @@ function routeEvent(plan) {
     subjectRef: plan.subjectRef,
     projectKey: plan.routeProjectPath,
     projectGroup: plan.projectGroup,
+    routeScope: plan.routeScope,
     priority: 0,
     status: "queued"
   };
@@ -11915,6 +12103,7 @@ function routeEvent(plan) {
     const workflowPreflightSpec = workflowSpecForPreflight(workflowBody, "event-preflight");
     generatedRouteSandboxPreflight(workflowPreflightSpec);
     const preflight = opts.preflight ? preflightStoredWorkflow(workflowPreflightSpec, plan.workflowContext, {}) : undefined;
+    let poolAssignment;
     const outcome = store.writeTransaction(() => {
       const invocation = store.createWorkflowInvocation(plan.invocationInput);
       const existingItem = store.findWorkflowWorkItem(plan.routeKey, idempotencyKey);
@@ -11925,12 +12114,39 @@ function routeEvent(plan) {
           return { kind: "deduped", existingItem, existingLoop, existingWorkflow, invocation };
         }
       }
-      const throttle = hasThrottleLimits(plan.throttleLimits) ? routeThrottleDecision(store, { projectPath: plan.routeProjectPath, projectGroup: plan.projectGroup, limits: plan.throttleLimits }) : undefined;
+      const throttle = hasThrottleLimits(plan.throttleLimits) ? routeThrottleDecision(store, {
+        projectPath: plan.routeProjectPath,
+        projectGroup: plan.projectGroup,
+        routeScope: plan.routeScope,
+        limits: plan.throttleLimits
+      }) : undefined;
+      if (plan.poolRouting) {
+        const loadCounts = store.countRunningWorkflowStepsByAuthProfile();
+        poolAssignment = assignPoolAuthProfiles({
+          pool: plan.poolRouting.pool,
+          seed: plan.poolRouting.seed,
+          loadCounts,
+          maxPerProfile: plan.poolRouting.maxPerProfile,
+          roles: Object.values(plan.poolRouting.rolesByStepId)
+        });
+      }
+      const activeThrottled = Boolean(throttle && !throttle.allowed);
+      const poolDeferred = Boolean(poolAssignment?.deferred);
+      const deferred = activeThrottled || poolDeferred;
+      const deferReason = activeThrottled ? throttle.reason : poolAssignment?.reason;
+      const effectiveThrottle = activeThrottled ? throttle : poolDeferred ? {
+        allowed: false,
+        reason: deferReason,
+        projectPath: plan.routeProjectPath,
+        ...plan.projectGroup ? { projectGroup: plan.projectGroup } : {},
+        limits: plan.throttleLimits,
+        counts: throttle?.counts ?? { global: 0, project: 0 }
+      } : throttle;
       const workItem = store.upsertWorkflowWorkItem({
         ...workItemInput,
         invocationId: invocation.id,
-        status: throttle && !throttle.allowed ? "deferred" : "queued",
-        lastReason: throttle && !throttle.allowed ? throttle.reason : undefined
+        status: deferred ? "deferred" : "queued",
+        lastReason: deferred ? deferReason : undefined
       });
       const requeue = workItem.attempts > 0 && workItem.status === "queued" ? {
         previousWorkItemId: workItem.id,
@@ -11938,8 +12154,16 @@ function routeEvent(plan) {
         reason: workItem.lastReason
       } : undefined;
       const refreshedInvocation = store.refreshWorkflowInvocationForWorkItem(workItem.id, plan.invocationInput);
-      if (throttle && !throttle.allowed)
-        return { kind: "throttled", invocation: refreshedInvocation, workItem, throttle };
+      if (deferred)
+        return { kind: "throttled", invocation: refreshedInvocation, workItem, throttle: effectiveThrottle };
+      if (poolAssignment && !poolAssignment.deferred) {
+        for (const step of workflowBody.steps) {
+          const role = plan.poolRouting?.rolesByStepId[step.id];
+          const chosen = role ? poolAssignment.profiles[role] : undefined;
+          if (chosen && step.target.type === "agent")
+            step.target.authProfile = chosen;
+        }
+      }
       const workflow = routeWorkflowForStorage(store, workflowBody);
       const loop = store.createLoop({
         ...loopInput,
@@ -11997,6 +12221,7 @@ function routeEvent(plan) {
         loop: publicLoop(outcome.loop),
         requeue: outcome.requeue,
         throttle: outcome.throttle,
+        ...poolAssignment && !poolAssignment.deferred && Object.keys(poolAssignment.profiles).length ? { accountProfiles: poolAssignment.profiles, routeScope: plan.routeScope } : {},
         sandboxPreflight,
         preflight
       },
@@ -12045,7 +12270,8 @@ function routeTodosTaskEvent(event, opts) {
   const projectGroup = routeProjectGroup(opts.projectGroup, data, metadata);
   const throttleLimits = routeThrottleLimitsFromOpts(opts);
   const sourceProjectIdempotencyPrefix = sourceTodosProjectPath ? normalizeRoutePath(sourceTodosProjectPath) ?? resolve7(sourceTodosProjectPath) : undefined;
-  const idempotencyKey = sourceProjectIdempotencyPrefix ? `todos-task:${sourceProjectIdempotencyPrefix}:${taskId}` : `todos-task:${taskId}`;
+  const prFingerprint2 = prFingerprintFromTask(data, metadata);
+  const idempotencyKey = prFingerprint2 ? `todos-task:pr:${prFingerprint2}` : sourceProjectIdempotencyPrefix ? `todos-task:${sourceProjectIdempotencyPrefix}:${taskId}` : `todos-task:${taskId}`;
   const idempotencySuffix = stableSuffix(idempotencyKey);
   const namePrefix = opts.namePrefix ?? "event:todos-task";
   const workflowName = `${namePrefix}:${taskId.slice(0, 8)}:${idempotencySuffix}:workflow`;
@@ -12077,7 +12303,8 @@ function routeTodosTaskEvent(event, opts) {
         event,
         taskId,
         routeError: true,
-        prReviewRouting
+        prReviewRouting,
+        ...prReviewRouting.freshnessSkip ? { freshnessSkip: true, prState: prReviewRouting.prState } : {}
       },
       human: `skipped task ${taskId}: ${prReviewRouting.reason}`
     };
@@ -12178,6 +12405,8 @@ function routeTodosTaskEvent(event, opts) {
     invocationInput,
     routeProjectPath,
     projectGroup,
+    routeScope: resolveRouteScope(opts, "todos-task"),
+    poolRouting: buildPoolRoutingPlan(opts, provider, providerRouting.authProfilePool, workflowBody, taskId),
     subjectRef: taskId,
     loopName,
     loopDescription: `Run ${workflowBody.name} once for task ${taskId}; idempotency=${idempotencyKey}; event=${event.id}`,
@@ -12291,6 +12520,8 @@ function routeGenericEvent(event, opts) {
     invocationInput,
     routeProjectPath,
     projectGroup,
+    routeScope: resolveRouteScope(opts, "generic-event"),
+    poolRouting: buildPoolRoutingPlan(opts, provider, providerRouting.authProfilePool, workflowBody, `${event.source}:${event.type}:${event.id}`),
     subjectRef: stringField(event.subject) ?? event.id,
     loopName,
     loopDescription: `Run ${workflowBody.name} once for event ${event.id}; idempotency=${idempotencyKey}`,
@@ -12494,6 +12725,8 @@ function compactDrainResult(result) {
     workflowId: stringField(workflow?.id),
     workflowName: stringField(workflow?.name),
     providerRouting,
+    accountProfiles: objectField2(value.accountProfiles),
+    routeScope: stringField(value.routeScope),
     requeue,
     queuedAtSource: value.queuedAtSource,
     fatal: value.fatal === true ? true : undefined
@@ -12638,6 +12871,31 @@ function markInvalidDrainTaskNonRouteable(sourceTodosProject, task, reason) {
     untagAutoRoute: todosMutationSummary(untagResult)
   };
 }
+function isFreshnessSkip(result) {
+  return result.kind === "skipped" && result.value.freshnessSkip === true;
+}
+function closeFreshnessSkippedTask(sourceTodosProject, task, reason) {
+  const taskId = taskField(task, ["id", "task_id", "taskId"]);
+  if (!taskId)
+    return { attempted: false, reason: "task id missing" };
+  const comment = `OpenLoops freshness gate closed this task: ${reason}. The referenced PR is already merged/closed, so the ` + `merge/review route will not dispatch a worker. Marked done and removed auto:route/route:enabled so drains stop re-skipping it.`;
+  const commentResult = runLocalCommand("todos", ["--project", sourceTodosProject, "comment", taskId, comment], { timeoutMs: 30000 });
+  const doneResult = runLocalCommand("todos", ["--project", sourceTodosProject, "done", taskId, "--notes", "PR already merged/closed; closed by OpenLoops freshness gate"], { timeoutMs: 30000 });
+  const untagAutoRoute = runLocalCommand("todos", ["--project", sourceTodosProject, "untag", taskId, "auto:route"], { timeoutMs: 30000 });
+  const untagRouteEnabled = runLocalCommand("todos", ["--project", sourceTodosProject, "untag", taskId, "route:enabled"], { timeoutMs: 30000 });
+  const leftQueue = doneResult.ok || untagAutoRoute.ok || untagRouteEnabled.ok;
+  return {
+    ok: leftQueue,
+    attempted: true,
+    taskId,
+    action: "freshness-close",
+    error: leftQueue ? undefined : "task could not be closed or untagged; inspect per-command results",
+    comment: todosMutationSummary(commentResult),
+    done: todosMutationSummary(doneResult),
+    untagAutoRoute: todosMutationSummary(untagAutoRoute),
+    untagRouteEnabled: todosMutationSummary(untagRouteEnabled)
+  };
+}
 function drainTodosTaskRoutes(opts) {
   const maxDispatch = positiveInteger(opts.maxDispatch ?? "1", "--max-dispatch") ?? 1;
   const todosProject = opts.todosProject ?? defaultLoopsProject();
@@ -12679,6 +12937,12 @@ function drainTodosTaskRoutes(opts) {
         result = skippedDrainTask(task, event, redact(message, 640) ?? "route task failed", { fatal: true });
       }
     }
+    if (!opts.dryRun && isFreshnessSkip(result)) {
+      const sourceTaskProject = opts.todosProjectsFromRegistry ? taskField(task, ["source_project_path", "sourceProjectPath"]) ?? todosProject : todosProject;
+      const reason = stringField(result.value.reason) ?? "PR already merged/closed (freshness gate)";
+      const sourceTaskUpdate = closeFreshnessSkippedTask(sourceTaskProject, task, reason);
+      result = { ...result, value: { ...result.value, sourceTaskUpdate } };
+    }
     results.push(result);
     if (result.kind === "created")
       created += 1;
@@ -12704,6 +12968,7 @@ function drainTodosTaskRoutes(opts) {
     deduped: results.filter((result) => result.kind === "deduped").length,
     throttled: results.filter((result) => result.kind === "throttled").length,
     skipped: results.filter((result) => result.kind === "skipped").length,
+    freshnessClosed: results.filter((result) => isFreshnessSkip(result) && result.value.sourceTaskUpdate?.attempted === true).length,
     fatal: results.filter((result) => result.value.fatal === true).length,
     maxDispatch,
     source: "todos ready",
@@ -12732,6 +12997,7 @@ function drainTodosTaskRoutes(opts) {
     deduped: report.deduped,
     throttled: report.throttled,
     skipped: report.skipped,
+    freshnessClosed: report.freshnessClosed,
     fatal: report.fatal,
     maxDispatch: report.maxDispatch,
     source: report.source,
@@ -12741,7 +13007,7 @@ function drainTodosTaskRoutes(opts) {
   } : { ...report, evidencePath };
   return {
     value,
-    human: `drained todos ready queue: considered=${report.considered} created=${report.created} deduped=${report.deduped} throttled=${report.throttled} skipped=${report.skipped} fatal=${report.fatal}`
+    human: `drained todos ready queue: considered=${report.considered} created=${report.created} deduped=${report.deduped} throttled=${report.throttled} skipped=${report.skipped} freshnessClosed=${report.freshnessClosed} fatal=${report.fatal}`
   };
 }
 // src/lib/route/route-tasks.ts
@@ -13126,6 +13392,18 @@ var AGENT_ROUTING_OPTION_SPECS = [
     kind: "value",
     description: "skip creating a workflow when this many active routed workflows already exist for the project group"
   },
+  {
+    flags: "--max-active-scope <key>",
+    key: "maxActiveScope",
+    kind: "value",
+    description: "scope --max-active counting to this route/drain identity (defaults to the LOOPS_LOOP_NAME of the running loop, else the route key) so each drain's --max-active is its own ceiling instead of a store-wide one"
+  },
+  {
+    flags: "--max-per-profile <n>",
+    key: "maxPerProfile",
+    kind: "value",
+    description: "for codewith auth-profile pools, spread dispatch to the least-loaded account and defer when every pool member already has this many running steps (default 2 for pools of 2+; 0 disables the guard)"
+  },
   { flags: "--worktree-mode <mode>", key: "worktreeMode", kind: "value", description: "worktree isolation mode: auto, required, off, or main", defaultValue: "auto" },
   { flags: "--worktree-root <path>", key: "worktreeRoot", kind: "value", description: "base directory for OpenLoops-managed git worktrees" },
   { flags: "--worktree-branch-prefix <prefix>", key: "worktreeBranchPrefix", kind: "value", description: "branch prefix for generated worktrees", defaultValue: "openloops" },