@nocobase/app-plugin-agents 2.0.0-beta.1 → 2.0.0-beta.11

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

@@ -1,17 +1,22 @@
 import { invalid, notFound } from '../../kernel/errors.js';
 import { findAgent } from '../agents/index.js';
-import { annotatePlaceholders, firstTurn, renderTurnPrompt, } from '../brief/index.js';
+import { STABLE_AGENT_LAYER_PREFIX, annotatePlaceholders, firstTurn, renderTurnPrompt, } from '../brief/index.js';
 import { briefOf, skillTargets } from './claim.js';
 import { prepareExtensions, withSections, } from './extensions.js';
 import { DEFAULT_THREAD } from './run.service.js';
 /** The id a sample subject is previewed under. */
 export const SAMPLE_SUBJECT_ID = 'sample';
-/**
- * The system prompt in two: the platform's part, with the runner's placeholders annotated, and the agent's own prompt,
- * which ends it as written (`joinBrief` puts it last, after a fixed English lead-in that stays with the platform's part).
- */
+/** The platform text and the owner's instructions, separated for display regardless of their execution order. */
 export function splitPrompt(prompt, instructions) {
     const own = instructions?.trim() ?? '';
+    const prefix = STABLE_AGENT_LAYER_PREFIX;
+    const first = own && prompt.startsWith(`${prefix}\n\n${own}\n\n`);
+    if (first) {
+        return {
+            platform: annotatePlaceholders(`${prefix}\n\n${prompt.slice(prefix.length + own.length + 4)}`),
+            agentPrompt: own,
+        };
+    }
     const at = own && prompt.endsWith(own) ? prompt.length - own.length : prompt.length;
     return {
         platform: annotatePlaceholders(prompt.slice(0, at)),

package/dist/server/core/runs/preview.js.map

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

package/dist/server/core/runs/quota-wait.d.ts

@@ -0,0 +1,7 @@
+import type { FailRequest } from '@nocobase/agent-protocol';
+import type { Tx } from '../../kernel/tx.js';
+import type { TransitionDeps } from './transitions.js';
+import { type RunRecord } from './run.store.js';
+/** Suspend the same run; unknown reset times remain terminal until a person retries. */
+export declare function waitForQuota(tx: Tx, deps: TransitionDeps, run: RunRecord, request: FailRequest): Promise<RunRecord | null>;
+//# sourceMappingURL=quota-wait.d.ts.map

package/dist/server/core/runs/quota-wait.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quota-wait.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/quota-wait.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAkC,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhF,wFAAwF;AACxF,wBAAsB,YAAY,CAChC,EAAE,EAAE,EAAE,EACN,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,SAAS,EACd,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA2D3B"}

package/dist/server/core/runs/quota-wait.js

@@ -0,0 +1,56 @@
+import { revokeTokens } from './transitions.js';
+import { endExecution } from './execution.js';
+import { findRunRecord, runsRepo, toRun } from './run.store.js';
+/** Suspend the same run; unknown reset times remain terminal until a person retries. */
+export async function waitForQuota(tx, deps, run, request) {
+    const now = deps.clock.now().toISOString();
+    const windows = request.quota?.windows.filter((window) => window.exhausted) ?? [];
+    const reset = windows.length && windows.every((window) => window.resetsAt !== null)
+        ? windows
+            .map((window) => window.resetsAt)
+            .sort()
+            .at(-1)
+        : null;
+    const availableAt = reset && Date.parse(reset) > Date.parse(now) ? reset : null;
+    const status = availableAt ? 'queued' : 'failed';
+    const result = await runsRepo(tx.conn).updateMany({
+        filter: {
+            id: run.id,
+            status: run.status,
+            attempt: run.attempt,
+            runnerId: run.runnerId,
+        },
+        values: {
+            status,
+            runnerPinId: run.runnerPinId ?? run.runnerId,
+            runnerId: null,
+            requires: [...new Set([...toRun(run).requires, 'strictSession'])],
+            sessionId: request.sessionId ?? run.sessionId,
+            freshSession: false,
+            availableAt,
+            queueEnteredAt: now,
+            attempt: Number(run.attempt) + (availableAt ? 1 : 0),
+            finishedAt: availableAt ? null : now,
+            leaseExpiresAt: null,
+            dispatchedAt: null,
+            startedAt: null,
+            acceptsInput: false,
+            failureReason: request.reason,
+            failureDetail: request.detail?.slice(0, 10_000) ?? null,
+            updatedAt: now,
+        },
+    });
+    if (result.updatedCount !== 1)
+        return null;
+    await endExecution(tx.conn, run, now, request.reason, undefined, request.quota);
+    await revokeTokens(tx, run.id, now);
+    const waiting = (await findRunRecord(tx.conn, run.id));
+    await deps.subjects
+        .get(run.subjectKind)
+        ?.sink?.onQuotaWait?.(tx, toRun(waiting));
+    tx.emit({ type: 'run.changed', quotaWait: true, runId: run.id, status });
+    if (availableAt)
+        tx.emit({ type: 'run.requeued', runId: run.id, availableAt });
+    return waiting;
+}
+//# sourceMappingURL=quota-wait.js.map

package/dist/server/core/runs/quota-wait.js.map

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

package/dist/server/core/runs/run-data-purge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-data-purge.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/run-data-purge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,eAAO,MAAM,0BAA0B,EAAE,MAAoB,CAAC;AAC9D,eAAO,MAAM,oBAAoB,EAAE,MAAY,CAAC;AAChD,eAAO,MAAM,oBAAoB,EAAE,MAAa,CAAC;AACjD,eAAO,MAAM,uBAAuB,EAAE,MAAY,CAAC;AACnD,eAAO,MAAM,sBAAsB,EAAE,MAAmB,CAAC;AAEzD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOvD;AAED,qFAAqF;AACrF,eAAO,MAAM,uCAAuC,EAAE,MAAyB,CAAC;AAEhF;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAO5D;AAED,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,MAAM,CAAC;IACrC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACnD,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CA0ExB"}
+{"version":3,"file":"run-data-purge.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/run-data-purge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,eAAO,MAAM,0BAA0B,EAAE,MAAoB,CAAC;AAC9D,eAAO,MAAM,oBAAoB,EAAE,MAAY,CAAC;AAChD,eAAO,MAAM,oBAAoB,EAAE,MAAa,CAAC;AACjD,eAAO,MAAM,uBAAuB,EAAE,MAAY,CAAC;AACnD,eAAO,MAAM,sBAAsB,EAAE,MAAmB,CAAC;AAEzD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOvD;AAED,qFAAqF;AACrF,eAAO,MAAM,uCAAuC,EAAE,MAAyB,CAAC;AAEhF;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAO5D;AAED,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,MAAM,CAAC;IACrC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACnD,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CA6ExB"}

package/dist/server/core/runs/run-data-purge.js

@@ -44,6 +44,7 @@ export function createRunDataPurge(deps) {
                 .select(['id', 'finishedAt'])
                 .where('status', 'in', ['completed', 'failed', 'cancelled'])
                 .where('finishedAt', '<', cutoff)
+                .where((eb) => eb.or([eb('runnerPinId', 'is', null), eb('status', '!=', 'failed')]))
                 .where((eb) => eb.or([
                 eb.exists(eb
                     .selectFrom('agRunEvents')

package/dist/server/core/runs/run-data-purge.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-data-purge.js","sourceRoot":"","sources":["../../../../server/core/runs/run-data-purge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-data-purge.js","sourceRoot":"","sources":["../../../../server/core/runs/run-data-purge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAI3D,MAAM,CAAC,MAAM,0BAA0B,GAAW,EAAE,GAAG,MAAM,CAAC;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAW,GAAG,CAAC;AAChD,MAAM,CAAC,MAAM,oBAAoB,GAAW,IAAI,CAAC;AACjD,MAAM,CAAC,MAAM,uBAAuB,GAAW,GAAG,CAAC;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAW,CAAC,GAAG,MAAM,CAAC;AAEzD,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC;QACxE,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC;AAED,qFAAqF;AACrF,MAAM,CAAC,MAAM,uCAAuC,GAAW,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AAEhF;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAc;IAClD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC;QACxE,MAAM,IAAI,KAAK,CACb,4EAA4E,CAC7E,CAAC;IACJ,OAAO,KAAK,CAAC;AACf,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,kBAAkB,CAAC,IAKlC;IACC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;IAClC,OAAO,KAAK,IAAqB,EAAE;QACjC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACpD,IAAI,IAAI,KAAK,CAAC;YAAE,OAAO,CAAC,CAAC;QACzB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;QACnE,IAAI,MAAuD,CAAC;QAC5D,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,OACE,MAAM,GAAG,oBAAoB;YAC7B,GAAG,EAAE,GAAG,OAAO,GAAG,sBAAsB,EACxC,CAAC;YACD,IAAI,IAAI,GAAG,IAAI,CAAC,EAAE;iBACf,IAAI,EAAE;iBACN,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;iBAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;iBAC5B,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;iBAC3D,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC;iBAChC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CACZ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CACrE;iBACA,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CACZ,EAAE,CAAC,EAAE,CAAC;gBACJ,EAAE,CAAC,MAAM,CACP,EAAE;qBACC,UAAU,CAAC,aAAa,CAAC;qBACzB,MAAM,CAAC,IAAI,CAAC;qBACZ,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE,WAAW,CAAC,CACnD;gBACD,EAAE,CAAC,MAAM,CACP,EAAE;qBACC,UAAU,CAAC,aAAa,CAAC;qBACzB,MAAM,CAAC,IAAI,CAAC;qBACZ,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE,WAAW,CAAC,CACnD;aACF,CAAC,CACH,CAAC;YACJ,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,IAAI,GAAG,MAAM,CAAC;gBACpB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CACvB,EAAE,CAAC,EAAE,CAAC;oBACJ,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC;oBACtC,EAAE,CAAC,GAAG,CAAC;wBACL,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC;wBACtC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;qBACvB,CAAC;iBACH,CAAC,CACH,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI;iBACpB,OAAO,CAAC,YAAY,CAAC;iBACrB,OAAO,CAAC,IAAI,CAAC;iBACb,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,oBAAoB,GAAG,MAAM,CAAC,CAAC;iBACpE,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,GAAG,OAAO,IAAI,sBAAsB;gBAAE,MAAM;YACrE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBACnC,MAAM,IAAI,CAAC,KAAK;qBACb,UAAU,CAAC,aAAa,CAAC;qBACzB,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC;qBACzB,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,CAAC,KAAK;qBACb,UAAU,CAAC,aAAa,CAAC;qBACzB,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC;qBACzB,OAAO,EAAE,CAAC;YACf,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;YACtB,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YAC1B,MAAM,GAAG,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,GAAG,oBAAoB,IAAI,MAAM,IAAI,oBAAoB;gBACtE,MAAM;YACR,MAAM,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}

package/dist/server/core/runs/run.service.d.ts

@@ -9,7 +9,7 @@
  */
 import { type ActorRef, type RunEventType, type RunInput, type RunInputType, type RunnerFeature, type RunSelf, type RunStatus } from '@nocobase/agent-protocol';
 import type { Runner } from '../../../shared/runners.js';
-import type { DatabaseConnection } from '@nocobase/db';
+import type { DatabaseConnection, Expression, ExpressionBuilder, SqlBool } from '@nocobase/db';
 import type { RunBrief } from '../../../shared/briefs.js';
 import type { Run, RunDetail, RunEventPage, RunExecution, RunWait, Workload, WorkloadQuery, SubjectAgentWork } from '../../../shared/runs.js';
 import type { Clock } from '../../kernel/clock.js';
@@ -20,7 +20,8 @@ import type { AgentService } from '../agents/index.js';
 import type { ClaimEligibility } from './eligibility.js';
 import { type RunRequestService } from './run-requests.js';
 import { type RunTokenIdentity } from './run-tokens.js';
-import type { SubjectRegistry } from './ports.js';
+import { type RecentRunSummary } from './run.store.js';
+import type { CancelRequest, SubjectRegistry } from './ports.js';
 import { type WorkloadRunners } from './workload.js';
 import { type TransitionDeps } from './transitions.js';
 import type { ClaimService } from './claim.js';
@@ -32,6 +33,13 @@ export interface NewInput {
     readonly payload?: unknown;
 }
 export interface EnqueueRequest {
+    readonly runnerId?: string;
+    /**
+     * Hands a queued or failed run's work to the new run: the original is cancelled by `actorUserId` and the new run
+     * becomes its replacement (`retryOfRunId`). The original agent's lock serializes this with its retry and claim, so a
+     * run is replaced or retried once. Refused with `RUN_ALREADY_RETRIED`, `RUN_NOT_RETRYABLE` or `AGENT_BUSY`.
+     */
+    readonly replacesRunId?: string;
     /** Trusted application dispatch: prefer a compatible authorized active run across comment roots. */
     readonly preferActive?: boolean;
     /** Supplied only by a real comment entry point; subsequent comment dispatches share its first run. */
@@ -121,6 +129,7 @@ export type EnqueueResult = RunEnqueued | RunRequestPending;
  */
 export declare function queuedRun(result: EnqueueResult): RunEnqueued;
 export interface RunFilter {
+    readonly visibility?: (eb: ExpressionBuilder) => Expression<SqlBool>;
     readonly subjectKind?: string;
     readonly subjectId?: string;
     readonly agentId?: string;
@@ -155,8 +164,11 @@ export interface RunService {
     readonly requests: RunRequestService;
     /** Adds input to a run that has not ended. */
     addInput(runId: string, input: NewInput, outer?: Tx): Promise<string>;
-    /** A queued run ends at once; a held one is asked to stop. In `outer`, joins the caller's transaction. */
-    cancel(runId: string, byUserId: string | null, outer?: Tx): Promise<Run>;
+    /**
+     * A queued run ends at once; a held one is asked to stop. In `outer`, joins the caller's transaction. `request`
+     * reaches the subject's `onCancelRequested` unchanged.
+     */
+    cancel(runId: string, byUserId: string | null, outer?: Tx, request?: CancelRequest): Promise<Run>;
     /**
      * Ends the queued runs on a subject, of one agent or of any, or of one agent on every subject; optionally only those
      * `actorUserId` woke. Held runs are left alone. Answers the runs it ended. In `outer`, joins the caller's transaction.
@@ -185,6 +197,13 @@ export interface RunService {
         readonly source: string;
     } | null>;
     list(filter: RunFilter): Promise<Run[]>;
+    /** The agents that have a run on the subject (only the runs `involvingUserId` started or owns, when given), each once. */
+    agentIds(filter: {
+        readonly visibility?: RunFilter['visibility'];
+        readonly subjectKind: string;
+        readonly subjectId: string;
+        readonly involvingUserId?: string;
+    }): Promise<string[]>;
     inputTriggers(runIds: readonly string[]): Promise<ReadonlyMap<string, readonly {
         type: string;
         payload: unknown;
@@ -204,7 +223,8 @@ export interface RunService {
      * candidate runners; null when the run does not exist or is not queued. Whoever calls decides what of it a person may
      * see.
      */
-    queueWait(runId: string): Promise<RunWait | null>;
+    /** A conversation supplies its binding (null when unbound), restricting the existing queue facts to that runner. */
+    queueWait(runId: string, conversationRunnerId?: string | null): Promise<RunWait | null>;
     events(runId: string, afterSeq: number, limit: number, types?: readonly RunEventType[]): Promise<RunEventPage>;
     /** The run a run token belongs to; `RUN_TOKEN_INVALID` otherwise. */
     authenticateToken(value: string): Promise<RunTokenIdentity>;
@@ -242,6 +262,12 @@ export interface RunService {
         readonly subjectKind: string;
         readonly subjectId: string;
     }, exceptRunId: string): Promise<string | null>;
+    /** The five latest terminal runs of this agent on this subject, with summaries capped at 400 characters. */
+    recentSummaries(conn: DatabaseConnection, key: {
+        readonly agentId: string;
+        readonly subjectKind: string;
+        readonly subjectId: string;
+    }, exceptRunId: string): Promise<RecentRunSummary[]>;
 }
 export interface RunServiceDeps extends TransitionDeps {
     readonly diagnose?: ClaimService['diagnose'];

package/dist/server/core/runs/run.service.d.ts.map

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

package/dist/server/core/runs/run.service.js

@@ -14,7 +14,7 @@ import { findAgent, lockAgentForClaim } from '../agents/index.js';
 import { agentNamesOf } from '../agents/agent.store.js';
 import { createRunRequestService, insertRunRequest, } from './run-requests.js';
 import { authenticateRunToken } from './run-tokens.js';
-import { ACTIVE, eventsRepo, findRunRecord, inputsOnSince, inputsRepo, isActive, isTerminal, lastSummary, openRunsOn, openRunsOnEach, pendingInputs, reposRepo, runsOfKey, runsRepo, toInput, toInputView, toRepo, toRun, usageRepo, } from './run.store.js';
+import { ACTIVE, eventsRepo, findRunRecord, inputsOnSince, inputsRepo, isActive, isTerminal, lastSummary, recentSummaries, openRunsOn, openRunsOnEach, pendingInputs, reposRepo, runnerPreferenceOf, runsOfKey, runsRepo, toInput, toInputView, toRepo, toRun, usageRepo, } from './run.store.js';
 import { readQueueWait, readWorkload, } from './workload.js';
 import { finishRun } from './transitions.js';
 import { gateInputs, gatePending } from './input-gate.js';
@@ -113,6 +113,9 @@ export function createRunService(deps) {
                 agentId: agent.id,
                 agentType: 'runner',
                 runnerId: null,
+                runnerPinId: values.runnerPinId ?? null,
+                tool: values.tool ?? null,
+                model: values.model ?? null,
                 status: 'queued',
                 priority: values.priority,
                 attempt: 1,
@@ -132,6 +135,8 @@ export function createRunService(deps) {
                 requestedByUserId: values.requestedByUserId,
                 confirmedByUserId: values.confirmedByUserId,
                 ownerUserId: values.ownerUserId,
+                // The actor's choice now: a later change applies to runs queued after it.
+                runnerPreference: await runnerPreferenceOf(unit.conn, values.actorUserId),
                 requires: cleanList([...values.requires]),
                 acceptsInput: false,
                 availableAt: values.availableAt ?? null,
@@ -145,8 +150,9 @@ export function createRunService(deps) {
                 cancelledById: null,
                 failureReason: null,
                 failureDetail: null,
+                failureParams: null,
                 summary: null,
-                sessionId: null,
+                sessionId: values.sessionId ?? null,
                 workDir: null,
                 directoryKey: null,
                 claimFailures: 0,
@@ -398,6 +404,10 @@ export function createRunService(deps) {
         }
         const waiting = open.find((run) => run.status === 'queued');
         const target = working ?? waiting;
+        if (target && work.retryOfRunId)
+            throw precondition('AGENT_BUSY', 'The agent is already working on this.', {
+                runId: target.id,
+            });
         const commentInput = (rootId) => rootId
             ? {
                 ...work.input,
@@ -428,6 +438,7 @@ export function createRunService(deps) {
             commentExecution: work.commentExecution,
             commentOwnerKey: work.commentOwnerKey,
             freshSession: work.freshSession,
+            runnerPinId: work.runnerPinId,
             subject: work.subject,
             threadScope: work.threadScope,
             actorUserId: work.actorUserId,
@@ -436,7 +447,7 @@ export function createRunService(deps) {
             ownerUserId: work.ownerUserId,
             priority: work.priority,
             requires: work.requires,
-            retryOfRunId: null,
+            retryOfRunId: work.retryOfRunId ?? null,
             availableAt: work.fireAt,
             ...(work.parentRunId ? { parentRunId: work.parentRunId } : {}),
             ...(work.maxAttempts ? { maxAttempts: work.maxAttempts } : {}),
@@ -444,6 +455,43 @@ export function createRunService(deps) {
         const inputId = await insertInput(unit, runId, commentInput(work.commentRootRunId === '' ? runId : work.commentRootRunId));
         return { runId, outcome: 'created', status: 'queued', inputId };
     }
+    /**
+     * Cancels a queued or failed run that is being replaced (`EnqueueRequest.replacesRunId`), under its agent's lock and
+     * revision. Not a stop request: the subject's cancel hooks do not run, since its work continues in the replacement.
+     */
+    async function withdrawReplaced(unit, runId, subject, byUserId) {
+        const target = await require(unit.conn, runId);
+        await lockAgentForClaim(unit.conn, target.agentId, clock.now().toISOString());
+        const run = await require(unit.conn, runId);
+        if (run.subjectKind !== subject.kind || run.subjectId !== subject.id)
+            throw invalid('A replacement cannot cross subjects.');
+        const retried = await runsRepo(unit.conn).findOne({
+            filter: { retryOfRunId: run.id },
+        });
+        if (retried)
+            throw precondition('RUN_ALREADY_RETRIED', 'This run has already been retried.', { runId: retried.id });
+        if (run.status === 'queued') {
+            const ended = await finishRun(unit, deps, run, { status: 'cancelled', reason: 'cancelled', cancelledById: byUserId }, true);
+            if (!ended)
+                throw conflict('The run changed; try again.');
+            return;
+        }
+        if (run.status !== 'failed')
+            throw precondition('RUN_NOT_RETRYABLE', 'Only a queued or failed run can be replaced.');
+        const now = clock.now().toISOString();
+        const changed = await runsRepo(unit.conn).updateMany({
+            filter: { id: run.id, status: 'failed', revision: run.revision },
+            values: { status: 'cancelled', cancelledById: byUserId, updatedAt: now },
+        });
+        if (changed.updatedCount !== 1)
+            throw conflict('The run changed; try again.');
+        unit.emit({
+            type: 'run.changed',
+            ...(run.runnerPinId ? { quotaWait: false } : {}),
+            runId: run.id,
+            status: 'cancelled',
+        });
+    }
     /** The source of the chain of work a request belongs to (`EnqueueRequest.requestedByUserId`). */
     async function sourceOf(unit, request) {
         if (request.comment &&
@@ -761,13 +809,19 @@ export function createRunService(deps) {
             const agent = await requireInvocable(unit, request.agentId, actorUserId);
             if (foreign)
                 await requireRunnerFor(unit, agent, actorUserId, request.requires ?? []);
+            if (request.replacesRunId)
+                await withdrawReplaced(unit, request.replacesRunId, request.subject, request.actorUserId ?? actorUserId);
             const result = await queue(unit, agent, {
+                ...(request.replacesRunId
+                    ? { retryOfRunId: request.replacesRunId }
+                    : {}),
                 preferActive: request.preferActive,
                 sourceRunId: request.causedByRunId,
                 commentRootRunId,
                 commentExecution,
                 commentOwnerKey,
                 freshSession: request.freshSession,
+                runnerPinId: request.runnerId,
                 subject: request.subject,
                 threadScope,
                 actorUserId,
@@ -848,7 +902,7 @@ export function createRunService(deps) {
             }
             return insertInput(unit, run.id, input);
         }, outer),
-        cancel: (runId, byUserId, outer) => tx.run(async (unit) => {
+        cancel: (runId, byUserId, outer, request) => tx.run(async (unit) => {
             const run = await require(unit.conn, runId);
             if (isTerminal(run.status))
                 throw new ProtocolError('RUN_NOT_ACTIVE', `The run is ${run.status}.`);
@@ -860,7 +914,7 @@ export function createRunService(deps) {
                 }, false, async () => {
                     await deps.subjects
                         .get(run.subjectKind)
-                        ?.sink?.onCancelRequested?.(unit, toRun({ ...run, cancelledById: byUserId }));
+                        ?.sink?.onCancelRequested?.(unit, toRun({ ...run, cancelledById: byUserId }), request);
                 });
                 if (!ended)
                     throw conflict('The run changed; try again.');
@@ -882,7 +936,7 @@ export function createRunService(deps) {
                     ...run,
                     cancelRequestedAt: now,
                     cancelledById: byUserId,
-                }));
+                }), request);
                 unit.emit({ type: 'run.changed', runId: run.id, status: run.status });
             }
             return toRun(await require(unit.conn, run.id));
@@ -947,6 +1001,15 @@ export function createRunService(deps) {
                     throw precondition('RUN_ALREADY_RETRIED', 'This run has already been retried.', {
                         runId: retried.id,
                     });
+                // Take the original over by its revision. The conditional write reads the latest row on every dialect, so a
+                // replacement (`replacesRunId`) whose transaction read an older snapshot before the lock fails to cancel it,
+                // and this retry fails if a replacement committed first.
+                const taken = await runsRepo(unit.conn).updateMany({
+                    filter: { id: run.id, status: run.status, revision: run.revision },
+                    values: { updatedAt: clock.now().toISOString() },
+                });
+                if (taken.updatedCount !== 1)
+                    throw conflict('The run changed; try again.');
                 const previousInputs = await inputsRepo(unit.conn).findMany({
                     filter: { runId: run.id },
                 });
@@ -1017,7 +1080,11 @@ export function createRunService(deps) {
                     priority: Number(run.priority),
                     requires: toRun(run).requires,
                     retryOfRunId: run.id,
-                    freshSession: run.freshSession,
+                    freshSession: run.runnerPinId ? false : run.freshSession,
+                    runnerPinId: run.runnerPinId,
+                    sessionId: run.sessionId,
+                    tool: run.tool,
+                    model: run.model,
                 });
                 if (renewComment && oldRoot) {
                     const origins = await inputsRepo(unit.conn).findMany({
@@ -1190,40 +1257,65 @@ export function createRunService(deps) {
             return result;
         },
         async list(filter) {
+            let query = tx.read().query.selectFrom('agRuns').selectAll();
+            for (const key of ['subjectKind', 'subjectId', 'agentId'])
+                if (filter[key])
+                    query = query.where(key, '=', filter[key]);
+            if (filter.status)
+                query = query.where('status', 'in', typeof filter.status === 'string' ? [filter.status] : filter.status);
+            if (filter.involvingUserId)
+                query = query.where((eb) => eb.or([
+                    eb('actorUserId', '=', filter.involvingUserId),
+                    eb('ownerUserId', '=', filter.involvingUserId),
+                ]));
+            if (filter.visibility)
+                query = query.where(filter.visibility);
+            if (filter.cursor) {
+                const cursor = filter.cursor;
+                query = query.where((eb) => eb.or([
+                    eb('createdAt', '<', cursor.createdAt),
+                    eb.and([
+                        eb('createdAt', '=', cursor.createdAt),
+                        eb('id', '<', cursor.id),
+                    ]),
+                ]));
+            }
+            const ids = await query
+                .clearSelect()
+                .select('id')
+                .orderBy('createdAt', 'desc')
+                .orderBy('id', 'desc')
+                .limit(Math.min(Math.max(filter.limit ?? 50, 1), 200))
+                .execute();
+            if (ids.length === 0)
+                return [];
             const records = await runsRepo(tx.read()).findMany({
-                filter: (f) => f.and([
-                    ...(filter.subjectKind
-                        ? [f.string('subjectKind').eq(filter.subjectKind)]
-                        : []),
-                    ...(filter.subjectId
-                        ? [f.string('subjectId').eq(filter.subjectId)]
-                        : []),
-                    ...(filter.agentId ? [f.string('agentId').eq(filter.agentId)] : []),
-                    ...(filter.status
-                        ? [
-                            f.or((typeof filter.status === 'string'
-                                ? [filter.status]
-                                : filter.status).map((status) => f.string('status').eq(status))),
-                        ]
-                        : []),
-                    ...(filter.involvingUserId
-                        ? [
-                            f.or([
-                                f.string('actorUserId').eq(filter.involvingUserId),
-                                f.string('ownerUserId').eq(filter.involvingUserId),
-                            ]),
-                        ]
-                        : []),
-                ]),
+                filter: (f) => f.or(ids.map(({ id }) => f.string('id').eq(id))),
                 sort: (sort) => [
                     sort.field('createdAt').desc(),
                     sort.field('id').desc(),
                 ],
-                limit: Math.min(Math.max(filter.limit ?? 50, 1), 200),
-                ...(filter.cursor ? { cursor: filter.cursor } : {}),
             });
             return readRuns(records);
         },
+        async agentIds(filter) {
+            let query = tx
+                .read()
+                .query.selectFrom('agRuns')
+                .select('agentId')
+                .distinct()
+                .where('subjectKind', '=', filter.subjectKind)
+                .where('subjectId', '=', filter.subjectId);
+            if (filter.visibility)
+                query = query.where(filter.visibility);
+            const userId = filter.involvingUserId;
+            if (userId !== undefined)
+                query = query.where((eb) => eb.or([
+                    eb('actorUserId', '=', userId),
+                    eb('ownerUserId', '=', userId),
+                ]));
+            return (await query.execute()).map((row) => String(row.agentId));
+        },
         async lastEnded(subjectKind, subjectIds) {
             if (subjectIds.length === 0)
                 return [];
@@ -1271,8 +1363,8 @@ export function createRunService(deps) {
         workload(query) {
             return readWorkload(tx.read(), clock, deps.runners, query);
         },
-        queueWait(runId) {
-            return readQueueWait(tx.read(), clock, deps.runners, runId, deps.diagnose);
+        queueWait(runId, conversationRunnerId) {
+            return readQueueWait(tx.read(), clock, deps.runners, runId, conversationRunnerId === undefined ? deps.diagnose : undefined, conversationRunnerId);
         },
         async events(runId, afterSeq, limit, types) {
             const conn = tx.read();
@@ -1323,6 +1415,7 @@ export function createRunService(deps) {
             const agent = await findAgent(conn, run.agentId);
             return {
                 runId: run.id,
+                freshSession: run.freshSession === true,
                 attempt: Number(run.attempt),
                 status: run.status,
                 agent: { id: run.agentId, name: agent?.name ?? run.agentId },
@@ -1366,6 +1459,7 @@ export function createRunService(deps) {
         pendingInputs: async (conn, runId) => (await pendingInputs(conn, runId)).map(toInput),
         inputsSince: inputsOnSince,
         lastSummary,
+        recentSummaries,
     };
 }
 //# sourceMappingURL=run.service.js.map