@sema-agent/server 7.146.0 → 7.148.0

package/dist/boot/reapers.js

@@ -5,7 +5,7 @@ import { STORE_SWEEP_LEGS, StoreSweepError } from "../plugins/store-sweep.js";
 import { isAdoptionQuiescing, trackMaintenanceLeg } from "../adoption/quiesce.js";
 import { createApprovalReconciler } from "../approval-reconciler.js";
 import { createE2bOrphanSandboxProvider, reclaimOrphanE2bSandboxes, E2B_ORPHAN_GRACE_MS } from "../plugins/e2b-orphan-reclaim.js";
-import { SANDBOX_POD_REAP_PERIOD_MS } from "../plugins/k8s-pod-reaper.js";
+import { SANDBOX_REAP_PERIOD_MS } from "../plugins/sandbox-reaper.js";
 import { APPROVAL_ASK_RETENTION_PASS_MS, runApprovalAskRetentionPass } from "../approval-ask-retention.js";
 import { seatText } from "../trace/exit-seat.js";
 export const REAPER_FAILURE_WARN_THRESHOLD = 5;
@@ -86,24 +86,27 @@ export function createPlacementAwareReapSessions(deps) {
     };
 }
 export function startReapers(ctx) {
-    const { config, logger, metrics, localRoot, backend, subRunner, runStore, checkpointStore, parkCommits, rateLimiter, costQuota, storeSweep, fileHistoryErasure, taskAttachmentStore, imageBakes, worktreeReap, workflowNotifyGate, workflowRecoverOpts, sqlWorkflowRunStore, workflowNotifyJournal, backgroundAgentStore, mailboxStore, toolApproval, permissionRuleStores, approvalNonceStore, getRunDenySweep, userInputLedger, approvalAskAudit, sandboxPodReaper, } = ctx;
+    const { config, logger, metrics, localRoot, backend, subRunner, runStore, checkpointStore, parkCommits, rateLimiter, costQuota, storeSweep, fileHistoryErasure, taskAttachmentStore, imageBakes, worktreeReap, workflowNotifyGate, workflowRecoverOpts, sqlWorkflowRunStore, workflowNotifyJournal, backgroundAgentStore, mailboxStore, toolApproval, permissionRuleStores, approvalNonceStore, getRunDenySweep, userInputLedger, approvalAskAudit, sandboxReaper, } = ctx;
     const leg = (p) => {
         if (p !== undefined)
             trackMaintenanceLeg(p);
     };
+    const reapLogged = (metric, labels) => (n) => {
+        if (typeof n === "number" && n > 0)
+            logger.info("reaper_swept", { metric, ...labels, count: n });
+    };
     const reapCount = (metric, labels) => (n) => {
-        if (typeof n === "number" && n > 0) {
+        if (typeof n === "number" && n > 0)
             metrics.inc(metric, labels, n);
-            logger.info("reaper_swept", { metric, ...labels, count: n });
-        }
+        reapLogged(metric, labels)(n);
     };
-    const e2bOrphanProvider = config.remoteExec?.provider === "e2b" && config.remoteExec.orphanReclaim !== false
+    const e2bOrphanProvider = config.remoteExec.provider === "e2b" && config.remoteExec.orphanReclaim !== false
         ? createE2bOrphanSandboxProvider({ apiKey: config.remoteExec.apiKey })
         : undefined;
     let e2bOrphanLastRunMs = Date.now() - E2B_ORPHAN_GRACE_MS;
     let e2bOrphanInFlight = false;
-    let sandboxPodReapLastRunMs = Date.now() - SANDBOX_POD_REAP_PERIOD_MS;
-    let sandboxPodReapInFlight = false;
+    let sandboxReapLastRunMs = Date.now() - SANDBOX_REAP_PERIOD_MS;
+    let sandboxReapInFlight = false;
     let wfRunReapInFlight = false;
     let attachmentSweepInFlight = false;
     let bgAgentReapInFlight = false;
@@ -111,7 +114,7 @@ export function startReapers(ctx) {
     const probeClockSkewGuard = createThrottledReaperCatch("probe_clock_skew", logger);
     const runsReapStaleGuard = createThrottledReaperCatch("runs_reap_stale", logger);
     const e2bOrphanGuard = createThrottledReaperCatch("e2b_orphan_reclaim", logger);
-    const sandboxPodReapGuard = createThrottledReaperCatch("sandbox_pod_reap", logger);
+    const sandboxReapGuard = createThrottledReaperCatch("sandbox_reap", logger);
     const checkpointsReapExpiredGuard = createThrottledReaperCatch("checkpoints_reap_expired", logger);
     const approvalNonceReapExpiredGuard = createThrottledReaperCatch("approval_nonce_reap_expired", logger);
     const runsFailSuspendedExpiredCheckpointGuard = createThrottledReaperCatch("runs_fail_suspended_expired_checkpoint", logger);
@@ -246,8 +249,8 @@ export function startReapers(ctx) {
         quiesceLogged = false;
         leg(probeClockSkew().then(() => probeClockSkewGuard.onSuccess(), probeClockSkewGuard.onError));
         leg(runStore
-            ?.reapStale(config.runStaleSec * 1000)
-            .then(reapCount("runs_reaped_total", { kind: "stale" }))
+            ?.reapStale()
+            .then(reapLogged("runs_reaped_total", { kind: "stale" }))
             .then(() => runsReapStaleGuard.onSuccess(), runsReapStaleGuard.onError)
             .then(() => userInputLedger?.converge().then(reapCount("user_input_converged_total", {}))));
         if (checkpointStore) {
@@ -396,14 +399,14 @@ export function startReapers(ctx) {
                 e2bOrphanInFlight = false;
             }));
         }
-        if (sandboxPodReaper && Date.now() - sandboxPodReapLastRunMs >= SANDBOX_POD_REAP_PERIOD_MS && !sandboxPodReapInFlight) {
-            sandboxPodReapInFlight = true;
-            sandboxPodReapLastRunMs = Date.now();
-            leg(sandboxPodReaper
+        if (sandboxReaper && Date.now() - sandboxReapLastRunMs >= SANDBOX_REAP_PERIOD_MS && !sandboxReapInFlight) {
+            sandboxReapInFlight = true;
+            sandboxReapLastRunMs = Date.now();
+            leg(sandboxReaper
                 .reapOnce(runStore)
-                .then(() => sandboxPodReapGuard.onSuccess(), sandboxPodReapGuard.onError)
+                .then(() => sandboxReapGuard.onSuccess(), sandboxReapGuard.onError)
                 .finally(() => {
-                sandboxPodReapInFlight = false;
+                sandboxReapInFlight = false;
             }));
         }
     }, config.reapIntervalSec * 1000);

package/dist/boot/resolve-spec.d.ts

@@ -16,6 +16,7 @@ import type { StoreBackend } from "../plugins/store-backend.js";
 import { type TaskAttachmentStore } from "../plugins/task-attachment-store.js";
 import type { createPrincipalEntitlementsClient } from "../runtime-caps-resolver.js";
 import { type OwnerAwareSessionStore } from "../security.js";
+import { type HistoryAnchorReaders } from "../history-anchor.js";
 import type { MemoryScopeStores } from "../memory-scope-stores.js";
 import type { MemorySyncRunner } from "../memory-sync-client.js";
 import type { PeerDesk } from "../peer-seat.js";
@@ -38,16 +39,17 @@ export interface ResolveSpecCtx {
     setSessionShellEnv: (sid: string, env: Record<string, string>) => void;
     /** 两张 per-session 登记簿的**租户围栏**(codex R1-F1):每次提交对拍本会话的主人,换主即清。
      *  论证(为什么 device lane 把这条从「不需要」变成「必需」)逐字见 `createSessionScopedRegistries` 头注。 */
-    fenceSessionOwner: (sid: string, owner: string | null) => void;
+    fenceSessionOwner: (sid: string, owner: string | null, incarnation?: string) => void;
     hookLlm: ReturnType<typeof createHookLlm>["hookLlm"];
     hookAgent: HookLlmCall;
-    /** 部署座在任务座之下挂了链成员的站点式样(第 5 段装配口从引擎准入记录读出,`boot/deployment-mods.ts` 的 `belowTaskChainPatternsOf`)—— 原样交 hooks 注册上下文(托管车道在这些站上只许收紧)。 */
+    /** 部署座在任务座之下挂了链成员的站点式样(第 5 段装配口从引擎准入记录读出,`boot/deployment-mods.ts` 的 `belowTaskChainPatternsOf`)—— 原样交 hooks 注册上下文(请求钩子两条车道在这些站上只许收紧)。 */
     belowTaskChainPatterns: readonly string[];
     fleetBus: FleetEventBus;
     hookWakeBus: {
         deliver?: (sessionId: string, text: string) => Promise<boolean>;
     };
-    resumeAnchorStore: ReturnType<StoreBackend["resumeAnchor"]> | undefined;
+    /** 历史锚手柄的两只读店(锚店 + run 店;run 店只为未知手柄的 404 选成因半句,`history-anchor.ts`)。缺席 = 本部署没有锚店(提交面 501)。 */
+    historyAnchors: HistoryAnchorReaders | undefined;
     ownerAware: OwnerAwareSessionStore;
     taskLimitCaps: {
         timeoutSec: number | undefined;