@elisym/mcp 0.12.1 → 0.13.0

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { LIMITS, DEFAULT_KIND_OFFSET, SolanaPaymentStrategy, makeCensor, DEFAULT_REDACT_PATHS, validateAgentName, RELAYS, toDTag, formatAssetAmount, estimateNetworkBaseline, formatSol as formatSol$1, USDC_SOLANA_DEVNET, estimateSolFeeLamports, formatFeeBreakdown, resolveAssetFromPaymentRequest as resolveAssetFromPaymentRequest$1, parseAssetAmount, ElisymIdentity, ElisymClient, NATIVE_SOL, resolveKnownAsset, formatNetworkBaseline, getProtocolProgramId, getProtocolConfig, assetKey, assetByKey, KNOWN_ASSETS } from '@elisym/sdk';
+import { LIMITS, DEFAULT_KIND_OFFSET, SolanaPaymentStrategy, makeCensor, DEFAULT_REDACT_PATHS, validateAgentName, RELAYS, toDTag, JobWaitTimeoutError, formatAssetAmount, estimateNetworkBaseline, formatSol as formatSol$1, USDC_SOLANA_DEVNET, estimateSolFeeLamports, formatFeeBreakdown, resolveAssetFromPaymentRequest as resolveAssetFromPaymentRequest$1, parseAssetAmount, ElisymIdentity, ElisymClient, NATIVE_SOL, resolveKnownAsset, formatNetworkBaseline, getProtocolProgramId, getProtocolConfig, assetKey, assetByKey, KNOWN_ASSETS } from '@elisym/sdk';
 import { listAgents, createAgentDir, writeYamlInitial, writeExampleSkillTemplate, writeSecrets, resolveAgent, loadAgent, globalConfigPath, writeYaml, writeFileAtomic as writeFileAtomic$1 } from '@elisym/sdk/agent-store';
 import { loadGlobalConfig, writeGlobalConfig } from '@elisym/sdk/node';
 import { getBase58Encoder, getBase58Decoder, generateKeyPairSigner, createSolanaRpc, address, createSolanaRpcSubscriptions, sendAndConfirmTransactionFactory, getSignatureFromTransaction, pipe, createTransactionMessage, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, signTransactionMessageWithSigners, createKeyPairSignerFromBytes, isAddress } from '@solana/kit';
@@ -1536,9 +1536,6 @@ function buildJobCompletionTip(jobId, providerNpub) {
 
 Tip: rate this provider with submit_feedback (job_event_id="${jobId}", rating="positive"|"negative"), or save them with add_contact (npub="${providerNpub}").`;
 }
-function classifyJobFailure(message) {
-  return /timed out/i.test(message) ? "timeout" : "failed";
-}
 function pendingJobResult(jobId, paymentSig, submittedAt, warningBlock) {
   const elapsedSecs = Math.round((Date.now() - submittedAt) / 1e3);
   return textResult(
@@ -1803,6 +1800,9 @@ ${sanitized.text}`);
             onFeedback: payHandler.onFeedback,
             onError(error) {
               reject(new Error(`Job error: ${error}`));
+            },
+            onTimeout(timeoutMs) {
+              reject(new JobWaitTimeoutError(timeoutMs));
             }
           },
           timeoutMs: params.timeoutMs,
@@ -1831,8 +1831,9 @@ ${sanitized.text}`);
 ${result}${tip}`);
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
-    const failure = classifyJobFailure(msg);
-    const pending = failure === "timeout" && paymentSig !== void 0;
+    const isTimeout = e instanceof JobWaitTimeoutError;
+    const failure = isTimeout ? "timeout" : "failed";
+    const pending = isTimeout && paymentSig !== void 0;
     await recordJobOutcome(agent, {
       jobEventId: jobId,
       capability: params.dTag,
@@ -1893,10 +1894,7 @@ function awaitJobResult(agent, options, fn, safetyTimeoutMs) {
     const resolvedOptions = fn({ resolve: safeResolve, reject: safeReject });
     closeFn = agent.client.marketplace.subscribeToJobUpdates(resolvedOptions);
     if (safetyTimeoutMs) {
-      safetyTimer = setTimeout(
-        () => safeReject(new Error("Subscription timed out (safety fallback).")),
-        safetyTimeoutMs
-      );
+      safetyTimer = setTimeout(() => safeReject(new JobWaitTimeoutError()), safetyTimeoutMs);
     }
   });
 }
@@ -1967,6 +1965,9 @@ var customerTools = [
               },
               onError(error) {
                 reject(new Error(`Job error: ${error}`));
+              },
+              onTimeout(timeoutMs) {
+                reject(new JobWaitTimeoutError(timeoutMs));
               }
             },
             timeoutMs: timeout,
@@ -1978,7 +1979,7 @@ var customerTools = [
         );
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
-        if (classifyJobFailure(msg) === "timeout") {
+        if (e instanceof JobWaitTimeoutError) {
           return textResult(
             `event_id="${input.job_event_id}": result not ready yet (nothing within ${timeout / 1e3}s). This is NOT an error - the provider may still be working. Retry get_job_result later (optionally widen lookback_secs); results persist on the relays.`
           );
@@ -2302,6 +2303,9 @@ ${sanitized.text}`
                 onFeedback: payHandler.onFeedback,
                 onError(error) {
                   reject(new Error(`Job error: ${error}`));
+                },
+                onTimeout(timeoutMs) {
+                  reject(new JobWaitTimeoutError(timeoutMs));
                 }
               },
               timeoutMs: timeout,
@@ -2330,8 +2334,9 @@ ${sanitized.text}`
 ${result}${tip}`);
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
-        const failure = classifyJobFailure(msg);
-        const pending = failure === "timeout" && paymentSig !== void 0;
+        const isTimeout = e instanceof JobWaitTimeoutError;
+        const failure = isTimeout ? "timeout" : "failed";
+        const pending = isTimeout && paymentSig !== void 0;
         await recordJobOutcome(agent, {
           jobEventId: jobId,
           capability: dTag,