@nocobase/app-plugin-agents 0.1.0-beta.11 → 0.1.0-beta.13

package/dist/server/core/runs/claim.d.ts

@@ -1,50 +1,8 @@
-/**
- * Claiming: handing queued runs to a runner that fits them, within each agent's concurrency limit, one run per
- * (agent, subject, thread) at a time, through the runners' one long-poll (`routes/runners/runner.ts`), which hands
- * out jobs from the same slots. A runner fits a run when it has the agent's
- * tool enabled (on the web), installed and signed in, the agent names no runner or names it, it is shared with the
- * team or belongs to the person who woke the agent, its features cover what the run requires (worked out from the
- * payload: checkouts, directories, skills, secrets), its owner's local policy (`Runner.policy`) lets it take the
- * agent's runs on the run's subject and repositories, and it has a free slot. A working directory that is a directory
- * on one runner pins the run to that runner, one run at a time per directory. A run's variables go to the runner that
- * takes it, personal ones included, unless one of them is for team runners only (`teamRunnersOnly`): then only a team
- * runner takes the run, and the variables that asked for one are noted on it (`teamOnlyVariables`), so its wait says
- * which.
- *
- * A slot is free for a run when the runner's total has room and so does the coding tool it runs with: the tool's limit
- * (`Runner.toolSlots`, never above the total) over the runs of that tool the runner holds here, and what the runner
- * said it can still take of that tool across every application (`ClaimRequest.tools`). The run takes the first of its
- * agent's entries whose tool the runner runs and has room for, so an agent listing two tools runs with the second while
- * the first is full; a run none of whose tools has room is passed over for the runs behind it.
- *
- * Variables are checked and opened in the claim's own transaction, on its connection: which ones the assembled payload
- * gets, whether any is for team runners only, and their values, so what the runner receives is what was checked. The
- * names taken from the runner go in `workspace.passthrough`, without values.
- *
- * A claim is one transaction per run. It first writes the agent's row (`lockAgentForClaim`): on databases with row
- * locks, concurrent claims for the same agent wait there, so the concurrency count read next is current. The run is
- * then taken with a guarded update (`status = 'queued'`), so two runners can never take the same run. The payload is
- * assembled in the same transaction; if assembly fails the transaction rolls back, the run stays queued, and the
- * failure is counted (`claimFailures`) until the run fails `setupFailed`.
- *
- * Portable by design: the database layer offers no `FOR UPDATE SKIP LOCKED` or advisory locks, and the guarded update
- * plus the agent-row write give the same guarantees on every dialect (SQLite serializes writers anyway).
- *
- * Polls are the hot path: every runner walks the same candidates, so a write per candidate is a write per candidate per
- * runner per poll. Everything that rules a candidate out is read outside any transaction — identity, `fits()`, slots,
- * concurrency and comment consent — and a transaction opens only for the run about to be claimed. The agent row is
- * the only row a claim locks with a self-update, and only in that final transaction after `fits()` (or when a stale
- * identity has to be repaired first, which current work never needs). PostgreSQL runs at READ COMMITTED, where each
- * statement sees the latest committed rows, so no transaction needs no-op writes to refresh a snapshot; comment
- * consent needs no chain lock, because confirmation is final and rejection or Run as me end the chain's queued runs,
- * which the guarded update sees. A new write or lock here needs a measured reason (`tests/claim-concurrency.test.ts`
- * counts them, and the lock waits on PostgreSQL).
-
- */
 import { type AgentTool, type RunApp, type RunnerFeature, type RunPayload, type RunSkill, type WorkspaceDir } from '@nocobase/agent-protocol';
 import type { DistService } from '../../distribution/index.js';
 import { type Runner } from '../../../shared/runners.js';
 import type { DatabaseConnection } from '@nocobase/db';
+import type { Slots } from '../../runners/slots.js';
 import type { Agent, RunnerModelEntry } from '../../../shared/agents.js';
 import type { BriefLayers } from '../../../shared/briefs.js';
 import type { Run, ModelSelectionWait } from '../../../shared/runs.js';
@@ -96,6 +54,7 @@ export interface ClaimDeps extends TransitionDeps {
     /** The tarballs the application serves, for a `served` CLI. */
     readonly dist?: Pick<DistService, 'find'>;
     /** What a runner holds now (its slots); runs and jobs share them. */
+    readonly slotsHeld: Slots['held'];
     readonly slotsUsed: (conn: DatabaseConnection, runnerId: string) => Promise<number>;
     /** Sections the application adds to every brief's context layer. */
     readonly sections?: BriefSectionRegistry;
@@ -111,21 +70,21 @@ export interface ClaimDeps extends TransitionDeps {
  * The entry `runner` takes a run of `agent` with: the first whose tool it has enabled, installed and signed in, with
  * the entry's model among those it reports (`runsEntry`). Null when it has none of them.
  */
-export declare function pickEntry(runner: Runner, agent: Pick<Agent, 'modelEntries'>): RunnerModelEntry | null;
+export declare function pickEntry(runner: Runner, agent: Pick<Agent, 'modelEntries'>, now: number): RunnerModelEntry | null;
 /**
  * The entry `runner` takes a run of `agent` with when some of its tools are full: the first whose tool it runs and
  * `open` says has room. Null when none has.
  */
-export declare function pickOpenEntry(runner: Runner, agent: Pick<Agent, 'modelEntries'>, open: (tool: AgentTool) => boolean): RunnerModelEntry | null;
+export declare function pickOpenEntry(runner: Runner, agent: Pick<Agent, 'modelEntries'>, open: (tool: AgentTool) => boolean, now: number): RunnerModelEntry | null;
 /** Whether `runner` has one of `agent`'s tools and models enabled, installed, signed in and reported. */
-export declare function hasTool(runner: Runner, agent: Pick<Agent, 'modelEntries'>): boolean;
+export declare function hasTool(runner: Runner, agent: Pick<Agent, 'modelEntries'>, now: number): boolean;
 /**
  * Whether `runner` may run work of `agent` as `actorUserId` that needs `requires`, before any lock is taken and before
  * a payload is known: the agent enabled, its tool and model reported there, its owner's policy, and trust.
  */
-export declare function fitsActor(runner: Runner, agent: Agent, actorUserId: string, requires: readonly RunnerFeature[]): boolean;
+export declare function fitsActor(runner: Runner, agent: Agent, actorUserId: string, requires: readonly RunnerFeature[], now: number): boolean;
 /** Whether `runner` may run `run` of `agent`, before any lock is taken and before its payload is known. */
-export declare function fits(runner: Runner, agent: Agent, run: RunRecord): boolean;
+export declare function fits(runner: Runner, agent: Agent, run: RunRecord, now: number): boolean;
 /** The runner features a payload needs. */
 export declare function payloadRequires(dirs: readonly WorkspaceDir[], skills: number, variables: number, workspaceKey?: boolean): RunnerFeature[];
 /** The working directories as a runner receives them: without what only the server uses. */

package/dist/server/core/runs/claim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/claim.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/claim.ts"],"names":[],"mappings":"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"}

package/dist/server/core/runs/claim.js

@@ -1,4 +1,3 @@
-import { GLOBAL_SKILL_TARGET } from '../../../shared/skills.js';
 /**
  * Claiming: handing queued runs to a runner that fits them, within each agent's concurrency limit, one run per
  * (agent, subject, thread) at a time, through the runners' one long-poll (`routes/runners/runner.ts`), which hands
@@ -42,6 +41,7 @@ import { GLOBAL_SKILL_TARGET } from '../../../shared/skills.js';
  * counts them, and the lock waits on PostgreSQL).
 
  */
+import { GLOBAL_SKILL_TARGET } from '../../../shared/skills.js';
 import { ANNOUNCED_FAILURES, isProtocolSupported, policyAllowsAgent, policyAllowsRepo, policyAllowsSubject, TIMINGS, } from '@nocobase/agent-protocol';
 import { runnerLowOnDisk, runsEntry, toolLimit, supportsWorkspaceKey, } from '../../../shared/runners.js';
 import { queueStart } from './selection.js';
@@ -50,7 +50,7 @@ import { later } from '../../kernel/clock.js';
 import { notFound } from '../../kernel/errors.js';
 import { runSecretsKey } from '../../kernel/redaction.js';
 import { cleanList, covers, jsonObject } from '../../kernel/values.js';
-import { findAgent, lockAgentForClaim } from '../agents/index.js';
+import { findAgent, findAgents, lockAgentForClaim } from '../agents/index.js';
 import { joinBrief, renderBrief } from '../brief/index.js';
 import { cliPackageFor } from './cli-package.js';
 import { executionHistory } from './execution.js';
@@ -58,7 +58,6 @@ import { describeVariables, variableRefs, } from '../variables/index.js';
 import { mountsFor, prepareExtensions, repoAccessFor, sessionKeyOf, withSections, } from './extensions.js';
 import { MAX_CLAIM_FAILURES, toolPolicyFor } from './policy.js';
 import { mintRunToken } from './run-tokens.js';
-import { runsHeldByTool } from './runner-view.js';
 import { ACTIVE, countActive, eventsRepo, findRunRecord, markDelivered, pendingInputs, runsOfKey, runsRepo, inputsRepo, sessionsRepo, toInput, toExecutions, toRun, } from './run.store.js';
 import { dropInputs } from './input-gate.js';
 import { finishRun } from './transitions.js';
@@ -107,25 +106,25 @@ function toolRoom(tools) {
  * The entry `runner` takes a run of `agent` with: the first whose tool it has enabled, installed and signed in, with
  * the entry's model among those it reports (`runsEntry`). Null when it has none of them.
  */
-export function pickEntry(runner, agent) {
-    return agent.modelEntries.find((entry) => runsEntry(runner, entry)) ?? null;
+export function pickEntry(runner, agent, now) {
+    return (agent.modelEntries.find((entry) => runsEntry(runner, entry, now)) ?? null);
 }
 /**
  * The entry `runner` takes a run of `agent` with when some of its tools are full: the first whose tool it runs and
  * `open` says has room. Null when none has.
  */
-export function pickOpenEntry(runner, agent, open) {
-    return (agent.modelEntries.find((entry) => runsEntry(runner, entry) && open(entry.tool)) ?? null);
+export function pickOpenEntry(runner, agent, open, now) {
+    return (agent.modelEntries.find((entry) => runsEntry(runner, entry, now) && open(entry.tool)) ?? null);
 }
 /** Whether `runner` has one of `agent`'s tools and models enabled, installed, signed in and reported. */
-export function hasTool(runner, agent) {
-    return pickEntry(runner, agent) !== null;
+export function hasTool(runner, agent, now) {
+    return pickEntry(runner, agent, now) !== null;
 }
 /**
  * Whether `runner` may run work of `agent` as `actorUserId` that needs `requires`, before any lock is taken and before
  * a payload is known: the agent enabled, its tool and model reported there, its owner's policy, and trust.
  */
-export function fitsActor(runner, agent, actorUserId, requires) {
+export function fitsActor(runner, agent, actorUserId, requires, now) {
     if (agent.status !== 'enabled' || runnerLowOnDisk(runner))
         return false;
     if (!isProtocolSupported(runner.protocolVersion) ||
@@ -134,15 +133,15 @@ export function fitsActor(runner, agent, actorUserId, requires) {
         return false;
     if (!covers(runner.features, requires))
         return false;
-    if (!hasTool(runner, agent))
+    if (!hasTool(runner, agent, now))
         return false;
     if (!policyAllowsAgent(runner.policy, agent))
         return false;
     return runner.trust === 'team' || runner.ownerUserId === actorUserId;
 }
 /** Whether `runner` may run `run` of `agent`, before any lock is taken and before its payload is known. */
-export function fits(runner, agent, run) {
-    return fitsActor(runner, agent, run.actorUserId, toRun(run).requires);
+export function fits(runner, agent, run, now) {
+    return fitsActor(runner, agent, run.actorUserId, toRun(run).requires, now);
 }
 /** The runner features a payload needs. */
 export function payloadRequires(dirs, skills, variables, workspaceKey = false) {
@@ -247,30 +246,46 @@ async function settleClaimInputs(conn, pending, effective, now) {
 }
 export function createClaimService(deps) {
     const { tx, clock } = deps;
+    /** Reuse only identical ordered targets, within this attempt and connection. */
+    function claimResources(conn, runId) {
+        const cache = new Map();
+        return (agent, assembly) => {
+            const skills = skillTargets(agent, assembly);
+            const variables = variableTargets(agent, assembly);
+            const key = JSON.stringify([skills, variables]);
+            let result = cache.get(key);
+            if (!result) {
+                result = (async () => ({
+                    skills: await deps.skills.forRun(conn, skills, runId),
+                    variables: await deps.variables.prepareRun(conn, variables),
+                }))();
+                cache.set(key, result);
+            }
+            return result;
+        };
+    }
     /** Database reads only; used by the actual claim and ordered-model diagnostics. */
-    async function assemblyCompatibility(conn, run, agent, runner, assembly) {
+    async function assemblyCompatibility(conn, run, agent, runner, assembly, resources = claimResources(conn, run.id)) {
         if (!isProtocolSupported(runner.protocolVersion) ||
             (assembly.workspaceKey && !supportsWorkspaceKey(runner)))
             return 'incompatible';
-        const skills = await deps.skills.forRun(conn, skillTargets(agent, assembly), run.id);
-        const targets = variableTargets(agent, assembly);
-        const names = await deps.variables.namesOf(conn, targets);
+        const { skills, variables } = await resources(agent, assembly);
+        const names = variables.names;
         if (!covers(runner.features, [
             ...run.requires,
             ...payloadRequires(payloadDirs(assembly.dirs), skills.length, names.length, Boolean(assembly.workspaceKey)),
         ]))
             return 'incompatible';
-        if (!fitsActor(runner, agent, run.actorUserId, run.requires) ||
+        if (!fitsActor(runner, agent, run.actorUserId, run.requires, clock.now().getTime()) ||
             !policyAllowsSubject(runner.policy, assembly.subject.key) ||
             assembly.dirs.some((dir) => (dir.kind === 'repo' && !policyAllowsRepo(runner.policy, dir.url)) ||
                 (dir.kind === 'directory' && dir.runnerId !== runner.id)))
             return 'restricted';
-        if (runner.trust !== 'team' &&
-            (await deps.variables.teamOnly(conn, targets)).length > 0)
+        if (runner.trust !== 'team' && variables.teamOnly.length > 0)
             return 'restricted';
         return 'ready';
     }
-    async function selectionFacts(conn, run, agent, requirePolicy = true, trust) {
+    async function selectionFacts(conn, run, agent, requirePolicy = true, trust, resources = claimResources(conn, run.id)) {
         const policy = await deps.selectionPolicies?.forRun(conn, run);
         if ((requirePolicy && !policy) || !deps.runners)
             return null;
@@ -299,7 +314,7 @@ export function createClaimService(deps) {
                 new Date(runner.lastSeenAt).getTime() + TIMINGS.offlineAfterMs >
                     now.getTime());
             const installed = connected.filter((runner) => runner.tools.some((tool) => tool.kind === entry.tool));
-            const usable = installed.filter((runner) => runsEntry(runner, entry));
+            const usable = installed.filter((runner) => runsEntry(runner, entry, clock.now().getTime()));
             const online = usable.filter((runner) => runner.trust === 'team' || runner.ownerUserId === run.actorUserId);
             const compatible = [];
             const loads = [];
@@ -339,7 +354,7 @@ export function createClaimService(deps) {
                     });
                     continue;
                 }
-                const reason = await assemblyCompatibility(conn, run, single, runner, assembly);
+                const reason = await assemblyCompatibility(conn, run, single, runner, assembly, resources);
                 if (reason !== 'ready') {
                     incompatible ||= reason === 'incompatible';
                     loads.push({
@@ -350,7 +365,8 @@ export function createClaimService(deps) {
                     });
                     continue;
                 }
-                const requiredVariables = await deps.variables.passthroughOf(conn, variableTargets(single, assembly));
+                const requiredVariables = (await resources(single, assembly)).variables
+                    .passthrough;
                 if (requiredVariables.length > 0 && runner.variables == null) {
                     unknown = true;
                     continue;
@@ -358,8 +374,9 @@ export function createClaimService(deps) {
                 if (requiredVariables.some((name) => !runner.variables?.includes(name)))
                     continue;
                 compatible.push(runner);
-                const byTool = await runsHeldByTool(conn, runner.id);
-                const used = await deps.slotsUsed(conn, runner.id);
+                const held = await deps.slotsHeld(conn, runner.id);
+                const byTool = held.byTool ?? {};
+                const used = held.jobs + held.runs;
                 const directory = directoryKeyOf(runner.id, payloadDirs(assembly.dirs));
                 const blockedDirectory = directory !== null &&
                     (await directoryBusy(conn, runner.id, run.id, directory));
@@ -448,7 +465,7 @@ export function createClaimService(deps) {
             entries,
         };
     }
-    async function assemble({ conn }, run, agent, runner, inputs, leaseExpiresAt, prepared, entry) {
+    async function assemble({ conn }, run, agent, runner, inputs, leaseExpiresAt, prepared, entry, resources = claimResources(conn, run.id)) {
         const binding = deps.subjects.get(run.subjectKind);
         if (!binding)
             throw new Error(`No context provider is registered for subjects of kind "${run.subjectKind}".`);
@@ -463,7 +480,7 @@ export function createClaimService(deps) {
         };
         const assembly = await binding.context.assemble(conn, claim, prepared.get('subject'));
         // workspace.key is required for coordinating runs; old runners must not silently ignore it.
-        if ((await assemblyCompatibility(conn, toRun(run), agent, runner, assembly)) === 'incompatible')
+        if ((await assemblyCompatibility(conn, toRun(run), agent, runner, assembly, resources)) === 'incompatible')
             throw new NotForThisRunner();
         inputs = assembly.inputs ?? inputs;
         const effectiveClaim = { ...claim, inputs };
@@ -480,9 +497,8 @@ export function createClaimService(deps) {
         if (directoryKey !== null &&
             (await directoryBusy(conn, runner.id, run.id, directoryKey)))
             throw new NotForThisRunner();
-        const skills = await deps.skills.forRun(conn, skillTargets(agent, assembly), run.id);
-        const variables = variableTargets(agent, assembly);
-        const names = await deps.variables.namesOf(conn, variables);
+        const { skills, variables } = await resources(agent, assembly);
+        const names = variables.names;
         const requires = cleanList([
             ...view.requires,
             ...payloadRequires(dirs, skills.length, names.length, Boolean(assembly.workspaceKey)),
@@ -491,19 +507,19 @@ export function createClaimService(deps) {
             throw new NotForThisRunner();
         // A variable for team runners only keeps a personal runner off the run.
         if (names.length > 0 && runner.trust !== 'team') {
-            const teamOnly = await deps.variables.teamOnly(conn, variables);
+            const teamOnly = variables.teamOnly;
             if (teamOnly.length > 0)
                 throw new TeamRunnersOnly(teamOnly);
         }
         const env = names.length > 0
-            ? await deps.variables.forRun(conn, variables, {
+            ? await variables.deliver({
                 runId: run.id,
                 runnerId: runner.id,
             })
             : [];
         // Variables taken from the runner: names only. A runner that does not provide one fails the run while preparing
         // it, saying how to provide it; runners are not chosen by them.
-        const passthrough = await deps.variables.passthroughOf(conn, variables);
+        const passthrough = variables.passthrough;
         const nowText = clock.now().toISOString();
         const clean = await consumeReset(conn, { kind: run.subjectKind, id: run.subjectId }, run.id, nowText);
         const session = await sessionsRepo(conn).findOne({
@@ -853,8 +869,6 @@ export function createClaimService(deps) {
         const conn = tx.read();
         // Rules that do not depend on who the run acts as come first, and settle the rest of the pass: an agent at its
         // limit is checked once per poll, not once per queued run.
-        if ((await deps.slotsUsed(conn, runner.id)) >= runner.slots)
-            return { kind: 'full', scope: 'runner' };
         if ((await countActive(conn, 'agentId', agent.id)) >= agent.maxConcurrentRuns)
             return { kind: 'full', scope: 'agent' };
         // Repair pre-upgrade queued work before even checking personal runner ownership. Reading first keeps a poll over
@@ -873,7 +887,7 @@ export function createClaimService(deps) {
             candidate = current;
         }
         // Avoid assembling or asking authorization when a cheap claim rule already rules this work out.
-        if (!fits(runner, agent, candidate) ||
+        if (!fits(runner, agent, candidate, clock.now().getTime()) ||
             (await runsOfKey(conn, candidate, ACTIVE)).length > 0)
             return { kind: 'skipped' };
         const consent = await commentConsentFor(conn, runner, candidate);
@@ -891,6 +905,7 @@ export function createClaimService(deps) {
             }
         }
         let taken;
+        let runnerFull = false;
         try {
             taken = await tx.run(async (unit) => {
                 const { conn } = unit;
@@ -908,50 +923,54 @@ export function createClaimService(deps) {
                     agent.maxConcurrentRuns)
                     return null;
                 // Slots are shared with the jobs the runner holds.
-                if ((await deps.slotsUsed(conn, runner.id)) >= runner.slots)
+                const held = await deps.slotsHeld(conn, runner.id);
+                if (held.runs + held.jobs >= runner.slots) {
+                    runnerFull = true;
                     return null;
-                // The first of the agent's tools with room, by its limit here and by what the runner said it can take.
-                const byTool = await runsHeldByTool(conn, runner.id);
-                const current = await findRunRecord(conn, candidate.id);
+                }
+                // Total and per-tool room come from the same locked snapshot.
+                const byTool = held.byTool ?? {};
+                const current = identity;
                 if (!current ||
                     current.status !== 'queued' ||
                     (current.availableAt &&
                         new Date(current.availableAt).getTime() > now.getTime()))
                     return null;
-                const entry = pickOpenEntry(runner, agent, (tool) => (byTool[tool] ?? 0) < toolLimit(runner, tool) && reported.has(tool));
+                const entry = pickOpenEntry(runner, agent, (tool) => (byTool[tool] ?? 0) < toolLimit(runner, tool) && reported.has(tool), now.getTime());
                 if (!entry)
                     return null;
                 const busy = await runsOfKey(conn, candidate, ACTIVE);
                 if (busy.length > 0)
                     return null;
-                const leaseExpiresAt = later(now, TIMINGS.leaseMs);
+                const leaseExpiresAt = later(now, TIMINGS.startTimeoutMs);
+                const dispatchValues = {
+                    status: 'dispatched',
+                    failureReason: null,
+                    failureDetail: null,
+                    runnerId: runner.id,
+                    // Brief providers observe this reservation inside the claim transaction.
+                    // Replace a previous attempt's tool before computing the roster.
+                    tool: entry.tool,
+                    leaseExpiresAt,
+                    dispatchedAt: nowText,
+                    lastActivityAt: nowText,
+                    availableAt: null,
+                    updatedAt: nowText,
+                    ...(consent.confirmedByUserId
+                        ? { confirmedByUserId: consent.confirmedByUserId }
+                        : {}),
+                };
                 const claimed = await runsRepo(conn).updateMany({
                     filter: (f) => f.and([
                         f.string('id').eq(candidate.id),
                         f.string('status').eq('queued'),
                         f.string('actorUserId').eq(candidate.actorUserId),
                     ]),
-                    values: {
-                        status: 'dispatched',
-                        failureReason: null,
-                        failureDetail: null,
-                        runnerId: runner.id,
-                        // Brief providers observe this reservation inside the claim transaction.
-                        // Replace a previous attempt's tool before computing the roster.
-                        tool: entry.tool,
-                        leaseExpiresAt,
-                        dispatchedAt: nowText,
-                        lastActivityAt: nowText,
-                        availableAt: null,
-                        updatedAt: nowText,
-                        ...(consent.confirmedByUserId
-                            ? { confirmedByUserId: consent.confirmedByUserId }
-                            : {}),
-                    },
+                    values: dispatchValues,
                 });
                 if (claimed.updatedCount !== 1)
                     return null;
-                const run = (await findRunRecord(conn, candidate.id));
+                const run = { ...current, ...dispatchValues };
                 const pending = (await pendingInputs(conn, run.id)).filter((input) => !run.commentRootRunId ||
                     input.type !== 'comment' ||
                     jsonObject(input.payload).commentRootRunId === run.commentRootRunId);
@@ -962,7 +981,8 @@ export function createClaimService(deps) {
                         return null;
                     // Admission must precede preflight assembly: a missing or obsolete
                     // subject is cancelled normally, rather than counted as setup failure.
-                    const selection = await selectionFacts(conn, toRun(current), agent);
+                    const resources = claimResources(conn, run.id);
+                    const selection = await selectionFacts(conn, toRun(current), agent, true, undefined, resources);
                     const elapsed = Math.max(0, (now.getTime() - queueStart(toRun(current))) / 1000);
                     const preferredAvailable = (selection?.entries[0]?.compatibleCount ?? 0) > 0 ||
                         selection?.entries[0]?.reason === 'unknown' ||
@@ -983,7 +1003,7 @@ export function createClaimService(deps) {
                             waitedSeconds: elapsed,
                         };
                     }
-                    assembled = await assemble(unit, run, agent, runner, pending.map(toInput), leaseExpiresAt, prepared, entry);
+                    assembled = await assemble(unit, run, agent, runner, pending.map(toInput), leaseExpiresAt, prepared, entry, resources);
                 }
                 catch (error) {
                     if (error instanceof NotForThisRunner)
@@ -1050,7 +1070,9 @@ export function createClaimService(deps) {
         }
         if (!taken) {
             await discardRepoAccess(candidate, prepared);
-            return { kind: 'skipped' };
+            return runnerFull
+                ? { kind: 'full', scope: 'runner' }
+                : { kind: 'skipped' };
         }
         // After the claim commits, never inside it: decisions settle the request before touching runs, so a claim that
         // held its run while waiting for the request could deadlock with them. A request left pending by a crash here is
@@ -1119,21 +1141,21 @@ export function createClaimService(deps) {
             return null;
         const conn = tx.read();
         const queued = await candidates();
-        const agents = new Map();
+        const agents = await findAgents(conn, queued
+            .filter((candidate) => !seen.has(candidate.id))
+            .map((candidate) => candidate.agentId));
         const full = new Set();
         for (const candidate of queued) {
             if (seen.has(candidate.id) || full.has(candidate.agentId))
                 continue;
             seen.add(candidate.id);
-            if (!agents.has(candidate.agentId))
-                agents.set(candidate.agentId, await findAgent(conn, candidate.agentId));
             const agent = agents.get(candidate.agentId);
             if (!agent ||
                 (!deps.subjects.get(candidate.subjectKind)?.actsAs &&
-                    !fits(runner, agent, candidate)))
+                    !fits(runner, agent, candidate, clock.now().getTime())))
                 continue;
             // None of its tools has room on the runner's side: the runs behind it may still fit.
-            if (!pickOpenEntry(runner, agent, (tool) => reported.has(tool)))
+            if (!pickOpenEntry(runner, agent, (tool) => reported.has(tool), clock.now().getTime()))
                 continue;
             try {
                 const result = await attempt(runner, agent, candidate, reported);
@@ -1203,13 +1225,13 @@ export function createClaimService(deps) {
         async claim(runner, free, tools) {
             if (runner.status !== 'online' || runnerLowOnDisk(runner))
                 return [];
-            if ((await deps.slotsUsed(tx.read(), runner.id)) >= runner.slots)
-                return [];
             const payloads = [];
             const seen = new Set();
             const limit = Math.min(free, runner.slots);
             const reported = toolRoom(tools);
             while (payloads.length < limit) {
+                if ((await deps.slotsUsed(tx.read(), runner.id)) >= runner.slots)
+                    break;
                 const payload = await claimOne(runner, seen, reported);
                 if (!payload)
                     break;