@jinn-network/client 0.1.1 → 0.1.2-canary.d6e72dfd

package/dist/adapters/claim-registry/abi.js

@@ -0,0 +1,93 @@
+/**
+ * Typed ABI fragments for ClaimRegistry.
+ *
+ * Mirrors the Solidity interface in contracts/src/claiming/ClaimRegistry.sol.
+ * Use these instead of the inline fragment in adapters/mech/types.ts when
+ * constructing a ClaimRegistryClient — they include the full event set.
+ */
+export const CLAIM_REGISTRY_ABI = [
+    // ── Write functions ──────────────────────────────────────────────────────────
+    {
+        name: 'claimJob',
+        type: 'function',
+        stateMutability: 'nonpayable',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [],
+    },
+    {
+        name: 'releaseClaim',
+        type: 'function',
+        stateMutability: 'nonpayable',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [],
+    },
+    {
+        name: 'expireClaim',
+        type: 'function',
+        stateMutability: 'nonpayable',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [],
+    },
+    // ── Read functions ───────────────────────────────────────────────────────────
+    {
+        name: 'getJobClaim',
+        type: 'function',
+        stateMutability: 'view',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [
+            { name: 'claimer', type: 'address' },
+            { name: 'expiresAt', type: 'uint256' },
+        ],
+    },
+    {
+        name: 'claims',
+        type: 'function',
+        stateMutability: 'view',
+        inputs: [{ name: '', type: 'bytes32' }],
+        outputs: [
+            { name: 'claimer', type: 'address' },
+            { name: 'expiresAt', type: 'uint256' },
+        ],
+    },
+    {
+        name: 'claimTTL',
+        type: 'function',
+        stateMutability: 'view',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint256' }],
+    },
+    {
+        name: 'expiredClaimCount',
+        type: 'function',
+        stateMutability: 'view',
+        inputs: [{ name: '', type: 'address' }],
+        outputs: [{ name: '', type: 'uint256' }],
+    },
+    // ── Events ───────────────────────────────────────────────────────────────────
+    {
+        name: 'JobClaimed',
+        type: 'event',
+        inputs: [
+            { name: 'requestId', type: 'bytes32', indexed: true },
+            { name: 'claimer', type: 'address', indexed: true },
+            { name: 'expiresAt', type: 'uint256', indexed: false },
+        ],
+    },
+    {
+        name: 'ClaimExpired',
+        type: 'event',
+        inputs: [
+            { name: 'requestId', type: 'bytes32', indexed: true },
+            { name: 'previousClaimer', type: 'address', indexed: true },
+        ],
+    },
+    {
+        name: 'ClaimReleased',
+        type: 'event',
+        inputs: [
+            { name: 'requestId', type: 'bytes32', indexed: true },
+            { name: 'claimer', type: 'address', indexed: true },
+        ],
+    },
+];
+//# sourceMappingURL=abi.js.map

package/dist/adapters/claim-registry/abi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abi.js","sourceRoot":"","sources":["../../../src/adapters/claim-registry/abi.ts"],"names":[],"mappings":"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"}

package/dist/adapters/claim-registry/client.d.ts

@@ -0,0 +1,89 @@
+/**
+ * ClaimRegistryClient — typed wrapper for the ClaimRegistry contract.
+ *
+ * Wraps the read/write surfaces of ClaimRegistry with proper types and
+ * idiomatic async interfaces.
+ *
+ * Write operations (claimJob, releaseClaim) go through the Safe multisig via
+ * executeSafeTransaction. This is required so that the on-chain claimer address
+ * matches the Safe — our canonical OLAS/staking identity. Using the raw EOA
+ * would cause a mismatch: OnChainClaimPolicy already claims through the Safe,
+ * so `weAlreadyClaimed()` would return false even when the Safe holds the claim,
+ * triggering a redundant on-chain write that reverts as JobAlreadyClaimed.
+ *
+ * expireClaim() is permissionless (anyone can GC others' expired claims) and
+ * is kept as a direct EOA call — the gas payer does not affect claim ownership.
+ */
+import { type Address, type Hex, type PublicClient, type WalletClient } from 'viem';
+export declare const ZERO_ADDRESS: Address;
+export interface JobClaimInfo {
+    claimer: Address;
+    /** Unix timestamp (seconds) when the claim expires. 0 if no active claim. */
+    expiresAt: bigint;
+    /** True if claimer !== ZERO_ADDRESS and expiresAt > 0 (claim is still active per contract). */
+    isActive: boolean;
+}
+export interface ClaimJobResult {
+    /** Transaction hash. Empty string when skipped (already ours or failed). */
+    txHash: string;
+    /** True if we now hold the claim (new or pre-existing). */
+    claimed: boolean;
+}
+export declare class ClaimRegistryClient {
+    private readonly publicClient;
+    private readonly walletClient;
+    private readonly contractAddress;
+    /**
+     * The Safe multisig address — used as the canonical claimer identity.
+     * claimJob/releaseClaim are routed through Safe so that msg.sender on-chain
+     * is the Safe address, matching the OLAS staking identity.
+     */
+    private readonly safeAddress;
+    constructor(publicClient: PublicClient, walletClient: WalletClient, contractAddress: Address, 
+    /**
+     * The Safe multisig address — used as the canonical claimer identity.
+     * claimJob/releaseClaim are routed through Safe so that msg.sender on-chain
+     * is the Safe address, matching the OLAS staking identity.
+     */
+    safeAddress: Address);
+    /**
+     * Read the active claim for a request.
+     * Returns `(ZERO_ADDRESS, 0, false)` if no active claim (contract returns
+     * (address(0), 0) for expired/non-existent claims).
+     */
+    getJobClaim(requestId: Hex): Promise<JobClaimInfo>;
+    /**
+     * Check whether the Safe already holds an active claim for this request.
+     * Used for idempotency on resume.
+     */
+    weAlreadyClaimed(requestId: Hex): Promise<boolean>;
+    /**
+     * Claim a marketplace request through the Safe multisig.
+     *
+     * Idempotent: if the Safe already holds an active claim, returns
+     * `{ txHash: '', claimed: true }` without submitting a transaction.
+     *
+     * Returns `{ txHash: '', claimed: false }` when:
+     *   - Another address holds an active claim
+     *   - The eligibility check fails (IneligibleToClaim)
+     *   - The tx reverts for any other handled reason
+     *
+     * Throws on unrecognised RPC errors.
+     */
+    claimJob(requestId: Hex): Promise<ClaimJobResult>;
+    /**
+     * Voluntarily release a claim through the Safe multisig (no punishment).
+     * Should only be called when the Safe holds the claim.
+     * No-op (returns false) if the Safe doesn't hold the claim.
+     */
+    releaseClaim(requestId: Hex): Promise<boolean>;
+    /**
+     * Garbage-collect a stale (expired) claim.
+     *
+     * expireClaim is permissionless — anyone can call it to GC others' expired
+     * claims. The caller gets no reward; the previous claimer gets an
+     * expiredClaimCount increment. Since the gas payer doesn't affect claim
+     * ownership, this is sent directly from the EOA (cheaper than a Safe tx).
+     */
+    expireClaim(requestId: Hex): Promise<boolean>;
+}

package/dist/adapters/claim-registry/client.js

@@ -0,0 +1,205 @@
+/**
+ * ClaimRegistryClient — typed wrapper for the ClaimRegistry contract.
+ *
+ * Wraps the read/write surfaces of ClaimRegistry with proper types and
+ * idiomatic async interfaces.
+ *
+ * Write operations (claimJob, releaseClaim) go through the Safe multisig via
+ * executeSafeTransaction. This is required so that the on-chain claimer address
+ * matches the Safe — our canonical OLAS/staking identity. Using the raw EOA
+ * would cause a mismatch: OnChainClaimPolicy already claims through the Safe,
+ * so `weAlreadyClaimed()` would return false even when the Safe holds the claim,
+ * triggering a redundant on-chain write that reverts as JobAlreadyClaimed.
+ *
+ * expireClaim() is permissionless (anyone can GC others' expired claims) and
+ * is kept as a direct EOA call — the gas payer does not affect claim ownership.
+ */
+import { encodeFunctionData, } from 'viem';
+import { CLAIM_REGISTRY_ABI } from './abi.js';
+import { executeSafeTransaction } from '../mech/safe.js';
+import { waitForTransactionReceiptWithRetry } from '../../tx-retry.js';
+export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+// ── ClaimRegistryClient ───────────────────────────────────────────────────────
+export class ClaimRegistryClient {
+    publicClient;
+    walletClient;
+    contractAddress;
+    safeAddress;
+    constructor(publicClient, walletClient, contractAddress, 
+    /**
+     * The Safe multisig address — used as the canonical claimer identity.
+     * claimJob/releaseClaim are routed through Safe so that msg.sender on-chain
+     * is the Safe address, matching the OLAS staking identity.
+     */
+    safeAddress) {
+        this.publicClient = publicClient;
+        this.walletClient = walletClient;
+        this.contractAddress = contractAddress;
+        this.safeAddress = safeAddress;
+    }
+    // ── Read methods ─────────────────────────────────────────────────────────────
+    /**
+     * Read the active claim for a request.
+     * Returns `(ZERO_ADDRESS, 0, false)` if no active claim (contract returns
+     * (address(0), 0) for expired/non-existent claims).
+     */
+    async getJobClaim(requestId) {
+        const result = await this.publicClient.readContract({
+            address: this.contractAddress,
+            abi: CLAIM_REGISTRY_ABI,
+            functionName: 'getJobClaim',
+            args: [requestId],
+        });
+        const claimer = result[0];
+        const expiresAt = result[1];
+        return {
+            claimer,
+            expiresAt,
+            isActive: claimer !== ZERO_ADDRESS && expiresAt > 0n,
+        };
+    }
+    /**
+     * Check whether the Safe already holds an active claim for this request.
+     * Used for idempotency on resume.
+     */
+    async weAlreadyClaimed(requestId) {
+        const info = await this.getJobClaim(requestId);
+        return (info.isActive &&
+            info.claimer.toLowerCase() === this.safeAddress.toLowerCase());
+    }
+    // ── Write methods ─────────────────────────────────────────────────────────────
+    /**
+     * Claim a marketplace request through the Safe multisig.
+     *
+     * Idempotent: if the Safe already holds an active claim, returns
+     * `{ txHash: '', claimed: true }` without submitting a transaction.
+     *
+     * Returns `{ txHash: '', claimed: false }` when:
+     *   - Another address holds an active claim
+     *   - The eligibility check fails (IneligibleToClaim)
+     *   - The tx reverts for any other handled reason
+     *
+     * Throws on unrecognised RPC errors.
+     */
+    async claimJob(requestId) {
+        // Idempotency: already claimed by our Safe
+        const existing = await this.getJobClaim(requestId);
+        if (existing.isActive) {
+            if (existing.claimer.toLowerCase() === this.safeAddress.toLowerCase()) {
+                return { txHash: '', claimed: true };
+            }
+            // Someone else has an active claim
+            return { txHash: '', claimed: false };
+        }
+        const data = encodeFunctionData({
+            abi: CLAIM_REGISTRY_ABI,
+            functionName: 'claimJob',
+            args: [requestId],
+        });
+        try {
+            const txHash = await executeSafeTransaction(this.publicClient, this.walletClient, {
+                safeAddress: this.safeAddress,
+                to: this.contractAddress,
+                value: 0n,
+                data,
+            });
+            // executeSafeTransaction waits for the receipt internally, but does not
+            // inspect its status. Wait again with full retry and throw if reverted so
+            // callers don't see a false-positive claimed=true on a reverted claim.
+            const receipt = await waitForTransactionReceiptWithRetry(this.publicClient, txHash, {
+                onRetry: ({ attempt, message }) => {
+                    console.error(`[claim-registry] wait claimJob receipt retry ${attempt}: ${message}`);
+                },
+            });
+            if (receipt.status !== 'success') {
+                throw new Error(`claimJob transaction reverted (status=${receipt.status}, txHash=${txHash})`);
+            }
+            return { txHash, claimed: true };
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            if (message.includes('JobAlreadyClaimed') ||
+                message.includes('IneligibleToClaim') ||
+                message.includes('execution reverted')) {
+                return { txHash: '', claimed: false };
+            }
+            throw err;
+        }
+    }
+    /**
+     * Voluntarily release a claim through the Safe multisig (no punishment).
+     * Should only be called when the Safe holds the claim.
+     * No-op (returns false) if the Safe doesn't hold the claim.
+     */
+    async releaseClaim(requestId) {
+        // Verify the Safe holds the claim before sending a tx that would revert
+        const existing = await this.getJobClaim(requestId);
+        if (!existing.isActive ||
+            existing.claimer.toLowerCase() !== this.safeAddress.toLowerCase()) {
+            return false;
+        }
+        const data = encodeFunctionData({
+            abi: CLAIM_REGISTRY_ABI,
+            functionName: 'releaseClaim',
+            args: [requestId],
+        });
+        try {
+            await executeSafeTransaction(this.publicClient, this.walletClient, {
+                safeAddress: this.safeAddress,
+                to: this.contractAddress,
+                value: 0n,
+                data,
+            });
+            return true;
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            // NotClaimOwner or NoClaimExists — claim was already gone
+            if (message.includes('NotClaimOwner') || message.includes('NoClaimExists')) {
+                return false;
+            }
+            throw err;
+        }
+    }
+    /**
+     * Garbage-collect a stale (expired) claim.
+     *
+     * expireClaim is permissionless — anyone can call it to GC others' expired
+     * claims. The caller gets no reward; the previous claimer gets an
+     * expiredClaimCount increment. Since the gas payer doesn't affect claim
+     * ownership, this is sent directly from the EOA (cheaper than a Safe tx).
+     */
+    async expireClaim(requestId) {
+        const account = this.walletClient.account;
+        if (!account)
+            throw new Error('[ClaimRegistryClient] walletClient has no account');
+        const data = encodeFunctionData({
+            abi: CLAIM_REGISTRY_ABI,
+            functionName: 'expireClaim',
+            args: [requestId],
+        });
+        try {
+            const txHash = await this.walletClient.sendTransaction({
+                account,
+                chain: null,
+                to: this.contractAddress,
+                data,
+                value: 0n,
+            });
+            await waitForTransactionReceiptWithRetry(this.publicClient, txHash, {
+                onRetry: ({ attempt, message }) => {
+                    console.error(`[claim-registry] wait expireClaim receipt retry ${attempt}: ${message}`);
+                },
+            });
+            return true;
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            if (message.includes('NoClaimExists') || message.includes('ClaimNotExpired')) {
+                return false;
+            }
+            throw err;
+        }
+    }
+}
+//# sourceMappingURL=client.js.map

package/dist/adapters/claim-registry/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/adapters/claim-registry/client.ts"],"names":[],"mappings":"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"}

package/dist/adapters/mech/adapter.d.ts

@@ -13,6 +13,7 @@ export declare class MechAdapter implements ExecutionAdapter {
     private pendingEvaluations;
     private pendingEvaluationClaims;
     private claimedButNotEvaluated;
+    private pendingEvaluationResults;
     private originalStates;
     private store?;
     private claimPolicy;

package/dist/adapters/mech/adapter.js

@@ -20,6 +20,9 @@ export class MechAdapter {
     // Restoration requests where claimDelivery succeeded but evaluation creation failed.
     // Swept on each poll cycle so they don't require a new Deliver event.
     claimedButNotEvaluated = new Set();
+    // Restoration result content cached across evaluation-job retries so a transient
+    // Safe/router failure does not silently strip evaluator context on the next poll.
+    pendingEvaluationResults = new Map();
     // Original desired states keyed by request ID (restoration and evaluation)
     // so we can yield accurate desiredState in DeliveredResult
     originalStates = new Map();
@@ -143,15 +146,27 @@ export class MechAdapter {
                     });
                     this.requestBlockCursor = currentBlock;
                     const decoded = decodeMarketplaceRequestLogs(logs);
-                    for (const { requestId, requestDataHex, priorityMech } of decoded) {
+                    for (const { requestId, requestDataHex, priorityMech, transactionHash, blockNumber } of decoded) {
                         if (!this.claimPolicy.shouldAccept({ requestId, requestDataHex, priorityMech })) {
                             continue;
                         }
                         try {
                             const digest = requestDataHex.startsWith('0x') ? requestDataHex.slice(2) : requestDataHex;
-                            const payload = await fetchFromIpfs(this.config.ipfsGatewayUrl, `f01551220${digest}`);
+                            // CIDv1 hex with raw codec (0x55) + sha2-256 (0x12) + 32-byte length (0x20).
+                            // The Autonolas registry returns raw-codec CIDs when uploading files with
+                            // cid-version=1 (Kubo default for files). This is confirmed by the existing
+                            // IPFS_GATEWAY_PREFIX constant (f01551220) which has worked in production.
+                            // If the gateway ever switches to dag-pb (0x70) the prefix would be f01701220.
+                            const intentCid = `f01551220${digest}`;
+                            const payload = await fetchFromIpfs(this.config.ipfsGatewayUrl, intentCid);
                             const desiredState = parseDesiredStateFromPayload(payload);
-                            yield { requestId, desiredState };
+                            yield {
+                                requestId,
+                                desiredState,
+                                intentCid,
+                                onchainCreationTx: transactionHash,
+                                onchainCreationBlock: blockNumber,
+                            };
                         }
                         catch (err) {
                             console.error(`[mech] Failed to parse request ${requestId}:`, err);
@@ -195,45 +210,59 @@ export class MechAdapter {
                     this.deliveryBlockCursor = currentBlock;
                     const decoded = decodeDeliverLogs(logs);
                     for (const { requestId, deliveryDataHex, mechAddress } of decoded) {
-                        // Only claim deliveries for requests this client created
-                        const isOurs = this.pendingEvaluations.has(requestId) || this.pendingEvaluationClaims.has(requestId);
-                        if (!isOurs)
+                        // Two concerns, independent:
+                        //   (a) Did this Safe DELIVER this? → claim it (counter credit goes to msg.sender)
+                        //       The Deliver event's mechAddress is mechServiceMultisig (the Safe that owns
+                        //       the mech), so we compare against this.config.safeAddress.
+                        //   (b) Did this Safe CREATE the underlying request? → act on the delivery
+                        //       (trigger eval creation for restoration deliveries; clean up for eval deliveries)
+                        const iDelivered = mechAddress.toLowerCase() === this.config.safeAddress.toLowerCase();
+                        const iCreatedRestoration = this.pendingEvaluations.has(requestId);
+                        const iCreatedEvaluation = this.pendingEvaluationClaims.has(requestId);
+                        if (!iDelivered && !iCreatedRestoration && !iCreatedEvaluation)
                             continue;
-                        try {
-                            const variant = this.config.routerClaimDeliveryVariant;
-                            let evidenceHash;
-                            if (variant === 'v2' && this.pendingEvaluations.has(requestId)) {
-                                try {
-                                    const checkpoint = {
-                                        version: 1,
-                                        desiredStateHash: requestId,
-                                        toolCalls: [],
-                                        externalInteractions: [],
-                                        outcome: 'success',
-                                    };
-                                    evidenceHash = computeEvidenceSimHash(checkpoint);
-                                }
-                                catch (err) {
-                                    console.error(`[mech] Failed to compute evidence SimHash for ${requestId}:`, err);
+                        // (a) If I delivered, claim delivery → msg.sender = my Safe → correct role credit.
+                        if (iDelivered) {
+                            try {
+                                const variant = this.config.routerClaimDeliveryVariant;
+                                let evidenceHash;
+                                if (variant === 'v2') {
+                                    try {
+                                        const checkpoint = {
+                                            version: 1,
+                                            desiredStateHash: requestId,
+                                            toolCalls: [],
+                                            externalInteractions: [],
+                                            outcome: 'success',
+                                        };
+                                        evidenceHash = computeEvidenceSimHash(checkpoint);
+                                    }
+                                    catch (err) {
+                                        console.error(`[mech] Failed to compute evidence SimHash for ${requestId}:`, err);
+                                    }
                                 }
+                                await claimDelivery(this.publicClient, this.walletClient, this.config.safeAddress, this.config.routerAddress, requestId, { variant, evidenceHash });
                             }
-                            await claimDelivery(this.publicClient, this.walletClient, this.config.safeAddress, this.config.routerAddress, requestId, {
-                                variant,
-                                evidenceHash,
-                            });
-                        }
-                        catch (err) {
-                            const message = err instanceof Error ? err.message : String(err);
-                            if (message.includes('RequestNotFound')) {
-                                console.error(`[mech] claimDelivery skipped (not a router request): ${requestId}`);
-                                continue;
+                            catch (err) {
+                                const message = err instanceof Error ? err.message : String(err);
+                                if (message.includes('RequestNotFound')) {
+                                    console.error(`[mech] claimDelivery skipped (not a router request): ${requestId}`);
+                                    // fall through — creator actions below don't depend on our claim specifically
+                                }
+                                else if (/already.*claimed|alreadyClaimed/i.test(message)) {
+                                    // Idempotent: someone else raced us, fine.
+                                }
+                                else {
+                                    console.error(`[mech] claimDelivery failed for ${requestId}:`, err);
+                                    // Don't continue — may retry next poll via unchanged tracking
+                                    continue;
+                                }
                             }
-                            console.error(`[mech] claimDelivery failed for ${requestId}:`, err);
-                            // Don't remove from pending — will retry next poll
-                            continue;
                         }
-                        // If this was a restoration delivery, fetch result and post the evaluation job
-                        if (this.pendingEvaluations.has(requestId)) {
+                        // (b) If I created the restoration, post the eval job once the claim is on-chain.
+                        //     The deliverer (someone else, or us if we also delivered) must have claimed first.
+                        //     tryCreateEvaluationJob calls verifyRestorationClaimed() which polls for the claim.
+                        if (iCreatedRestoration) {
                             let restorationResultData;
                             try {
                                 const digest = deliveryDataHex.startsWith('0x') ? deliveryDataHex.slice(2) : deliveryDataHex;
@@ -245,11 +274,11 @@ export class MechAdapter {
                             }
                             await this.tryCreateEvaluationJob(requestId, restorationResultData);
                         }
-                        // If this was an evaluation delivery, just clear the tracking
-                        if (this.pendingEvaluationClaims.has(requestId)) {
+                        // (c) If I created the evaluation, clean up tracking once delivered.
+                        if (iCreatedEvaluation) {
                             this.pendingEvaluationClaims.delete(requestId);
                         }
-                        // Parse and yield the delivery result
+                        // (d) Yield the delivery result.
                         try {
                             const deliveryDigest = deliveryDataHex.startsWith('0x') ? deliveryDataHex.slice(2) : deliveryDataHex;
                             const resultPayload = await fetchFromIpfs(this.config.ipfsGatewayUrl, `f01551220${deliveryDigest}`);
@@ -291,6 +320,10 @@ export class MechAdapter {
         if (!this.pendingEvaluations.has(requestId))
             return;
         const originalState = this.pendingEvaluations.get(requestId);
+        if (restorationResultData) {
+            this.pendingEvaluationResults.set(requestId, restorationResultData);
+        }
+        const cachedRestorationResultData = restorationResultData ?? this.pendingEvaluationResults.get(requestId);
         try {
             const evaluationState = {
                 ...originalState,
@@ -298,7 +331,7 @@ export class MechAdapter {
                 restorationRequestId: requestId,
                 context: {
                     ...originalState.context,
-                    ...(restorationResultData ? { restorationResult: restorationResultData } : {}),
+                    ...(cachedRestorationResultData ? { restorationResult: cachedRestorationResultData } : {}),
                 },
             };
             const evaluationPayload = buildDesiredStatePayload(evaluationState);
@@ -328,6 +361,7 @@ export class MechAdapter {
             // Success — clean up both tracking sets
             this.pendingEvaluations.delete(requestId);
             this.claimedButNotEvaluated.delete(requestId);
+            this.pendingEvaluationResults.delete(requestId);
         }
         catch (err) {
             console.error(`[mech] Failed to create evaluation job for ${requestId}:`, err);