@jinn-network/client 0.1.6 → 0.1.7-canary.17a8ecb8

package/dist/tasks/sources.js

@@ -13,22 +13,50 @@ export class StaticConfiguredTaskSource {
         }));
     }
 }
+/**
+ * Filter a config-level tasks[] array to only entries that can be posted via
+ * the production adapter (i.e. those with a solverNetManifestCid).
+ *
+ * This is the guard for issue #415: a tasks[] entry without a manifest CID
+ * will always throw PermanentError in signTaskDocument, causing the creator loop
+ * to backoff and retry indefinitely. Filtering here prevents the entry from ever
+ * entering the posting cycle and emits a one-time warning per dropped entry at
+ * startup.
+ *
+ * Only call this on the config-level tasks[] array (the production path). Do not
+ * apply it to Task objects created in tests or via other in-memory sources.
+ */
+export function filterBindableTasks(tasks) {
+    return tasks.filter((task) => {
+        if (!task.solverNetManifestCid) {
+            console.warn(`[creator] Skipping configured task "${task.id}": missing solverNetManifestCid. ` +
+                `Legacy tasks[] entries without a SolverNet manifest binding can never be posted ` +
+                `(spec §14 BINDING rule). Remove this entry from your config or add a solverNetManifestCid.`);
+            return false;
+        }
+        return true;
+    });
+}
 export class GeneratedTaskSource {
     sourceKey;
     generator;
-    constructor(sourceKey, generator) {
+    opts;
+    constructor(sourceKey, generator, opts = {}) {
         this.sourceKey = sourceKey;
         this.generator = generator;
+        this.opts = opts;
     }
     async collect(_now) {
         const generated = await this.generator();
         if (!generated)
             return [];
         const tasks = Array.isArray(generated) ? generated : [generated];
-        return tasks.map((task) => {
-            const bucketKey = task.window
-                ? `${task.window.startTs}:${task.window.endTs}`
-                : task.id;
+        return tasks.map((task, index) => {
+            const overrideBucketKey = this.opts.bucketKeyForTask?.(task, index);
+            const bucketKey = overrideBucketKey
+                ?? (task.window
+                    ? `${task.window.startTs}:${task.window.endTs}`
+                    : task.id);
             return {
                 task,
                 sourceKey: this.sourceKey,

package/dist/tasks/sources.js.map

@@ -1 +1 @@
-{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/tasks/sources.ts"],"names":[],"mappings":"AAiCA,MAAM,OAAO,0BAA0B;IAGR;IAFpB,SAAS,GAAG,YAAY,CAAC;IAElC,YAA6B,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAE9C,KAAK,CAAC,OAAO,CAAC,IAAU;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/B,IAAI;YACJ,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,EAAE;YACzC,aAAa,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;YACxC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE;SAChE,CAAC,CAAC,CAAC;IACN,CAAC;CACF;AAED,MAAM,OAAO,mBAAmB;IAEnB;IACQ;IAFnB,YACW,SAAiB,EACT,SAAwB;QADhC,cAAS,GAAT,SAAS,CAAQ;QACT,cAAS,GAAT,SAAS,CAAe;IACxC,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,IAAU;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACjE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM;gBAC3B,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBAC/C,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO;gBACL,IAAI;gBACJ,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,EAAE,IAAI,EAAE,iBAA0B,EAAE,SAAS,EAAE;gBAC9D,UAAU,EAAE;oBACV,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,SAAS;oBACT,IAAI,EAAE,WAAW;iBAClB;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"sources.js","sourceRoot":"","sources":["../../src/tasks/sources.ts"],"names":[],"mappings":"AAiCA,MAAM,OAAO,0BAA0B;IAGR;IAFpB,SAAS,GAAG,YAAY,CAAC;IAElC,YAA6B,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAE9C,KAAK,CAAC,OAAO,CAAC,IAAU;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/B,IAAI;YACJ,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,EAAE,EAAE;YACzC,aAAa,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;YACxC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE;SAChE,CAAC,CAAC,CAAC;IACN,CAAC;CACF;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CACV,uCAAuC,IAAI,CAAC,EAAE,mCAAmC;gBACjF,kFAAkF;gBAClF,4FAA4F,CAC7F,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,OAAO,mBAAmB;IAEnB;IACQ;IACA;IAHnB,YACW,SAAiB,EACT,SAAwB,EACxB,OAEb,EAAE;QAJG,cAAS,GAAT,SAAS,CAAQ;QACT,cAAS,GAAT,SAAS,CAAe;QACxB,SAAI,GAAJ,IAAI,CAEf;IACL,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAC,IAAU;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACjE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC/B,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,iBAAiB;mBAC9B,CAAC,IAAI,CAAC,MAAM;oBACb,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;oBAC/C,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACf,OAAO;gBACL,IAAI;gBACJ,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,EAAE,IAAI,EAAE,iBAA0B,EAAE,SAAS,EAAE;gBAC9D,UAAU,EAAE;oBACV,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,SAAS;oBACT,IAAI,EAAE,WAAW;iBAClB;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/trajectory/transcript-parsers/types.d.ts

@@ -5,24 +5,24 @@ export declare const TranscriptEventSchema: z.ZodDiscriminatedUnion<"kind", [z.Z
     content: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     kind: "user-message";
-    content: string;
     timestamp: string;
+    content: string;
 }, {
     kind: "user-message";
-    content: string;
     timestamp: string;
+    content: string;
 }>, z.ZodObject<{
     kind: z.ZodLiteral<"assistant-message">;
     timestamp: z.ZodString;
     content: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     kind: "assistant-message";
-    content: string;
     timestamp: string;
+    content: string;
 }, {
     kind: "assistant-message";
-    content: string;
     timestamp: string;
+    content: string;
 }>, z.ZodObject<{
     kind: z.ZodLiteral<"tool-call">;
     timestamp: z.ZodString;
@@ -31,13 +31,13 @@ export declare const TranscriptEventSchema: z.ZodDiscriminatedUnion<"kind", [z.Z
 }, "strip", z.ZodTypeAny, {
     name: string;
     kind: "tool-call";
-    args: Record<string, unknown>;
     timestamp: string;
+    args: Record<string, unknown>;
 }, {
     name: string;
     kind: "tool-call";
-    args: Record<string, unknown>;
     timestamp: string;
+    args: Record<string, unknown>;
 }>, z.ZodObject<{
     kind: z.ZodLiteral<"tool-result">;
     timestamp: z.ZodString;
@@ -47,14 +47,14 @@ export declare const TranscriptEventSchema: z.ZodDiscriminatedUnion<"kind", [z.Z
 }, "strip", z.ZodTypeAny, {
     name: string;
     kind: "tool-result";
-    content: string;
     timestamp: string;
+    content: string;
     isError?: boolean | undefined;
 }, {
     name: string;
     kind: "tool-result";
-    content: string;
     timestamp: string;
+    content: string;
     isError?: boolean | undefined;
 }>, z.ZodObject<{
     kind: z.ZodLiteral<"edit">;

package/dist/tx-retry.d.ts

@@ -8,6 +8,9 @@ export declare const TX_RETRY_DEFAULTS: {
     readonly maxDelayMs: 12000;
     /** Extra fee bump per retry attempt after the first (basis points, 1500 = +15%) */
     readonly feeBumpBpsPerAttempt: 1500;
+    /** Minimum bump over the previously submitted fee for same-sender nonce replacement. */
+    readonly replacementBumpBps: 1500;
+    readonly stuckNonceAfterMs: 120000;
 };
 export declare function flattenErrorMessage(error: unknown): string;
 /**
@@ -15,12 +18,24 @@ export declare function flattenErrorMessage(error: unknown): string;
  * Intentionally conservative: do not treat insufficient balance or user rejections as recoverable.
  */
 export declare function isRecoverableTransactionError(error: unknown): boolean;
+/**
+ * True when the error message contains the RPC's "nonce too low" signal.
+ *
+ * Issue #562: a daemon respawn can leave the locally-pinned ledger nonce
+ * behind the RPC's pending nonce, and every retry that re-submits with the
+ * stale value triggers this error. Callers use this helper to decide whether
+ * to refresh the pinned nonce before the next retry attempt.
+ */
+export declare function isNonceTooLowError(error: unknown): boolean;
 export declare function sleep(ms: number): Promise<void>;
 export declare function backoffDelay(attemptIndex: number, baseMs: number, maxMs: number): Promise<void>;
 export interface TxRetryOptions {
     maxAttempts?: number;
     baseDelayMs?: number;
     maxDelayMs?: number;
+    ledger?: TxSubmissionLedger;
+    logicalTx?: string;
+    stuckNonceAfterMs?: number;
     /** If set, invoked before each retry (attempt >= 1) for logging/metrics */
     onRetry?: (info: {
         attempt: number;
@@ -28,6 +43,125 @@ export interface TxRetryOptions {
         message: string;
     }) => void;
 }
+export interface TxFeeSnapshot {
+    maxFeePerGas?: bigint;
+    maxPriorityFeePerGas?: bigint;
+    gasPrice?: bigint;
+}
+export type Eip1559FeeOverrides = {
+    maxFeePerGas: bigint;
+    maxPriorityFeePerGas: bigint;
+    gasPrice?: undefined;
+};
+export type LegacyFeeOverrides = {
+    gasPrice: bigint;
+    maxFeePerGas?: undefined;
+    maxPriorityFeePerGas?: undefined;
+};
+export type EmptyFeeOverrides = {
+    maxFeePerGas?: undefined;
+    maxPriorityFeePerGas?: undefined;
+    gasPrice?: undefined;
+};
+export type TxFeeOverrides = Eip1559FeeOverrides | LegacyFeeOverrides | EmptyFeeOverrides;
+export type TxFeeOverrideResult = {
+    kind: 'eip1559';
+    overrides: Eip1559FeeOverrides;
+    snapshot: TxFeeSnapshot;
+} | {
+    kind: 'legacy';
+    overrides: LegacyFeeOverrides;
+    snapshot: TxFeeSnapshot;
+} | {
+    kind: 'none';
+    overrides: EmptyFeeOverrides;
+    snapshot: TxFeeSnapshot;
+};
+export type TxRecoveryTransactionRequest = TxFeeOverrides & {
+    account?: unknown;
+    to: Address;
+    value: bigint;
+    nonce: number;
+};
+export interface TxRecoveryWalletClient {
+    account?: unknown;
+    sendTransaction(tx: TxRecoveryTransactionRequest): Promise<Hex>;
+}
+export type TxRetryTransactionRequest = TxFeeOverrides & {
+    account?: unknown;
+    to?: Address;
+    data?: Hex;
+    value?: bigint;
+    gas?: bigint;
+    nonce?: number;
+    [key: string]: unknown;
+};
+export interface TxRetryWalletClient {
+    account?: unknown;
+    sendTransaction(tx: TxRetryTransactionRequest): Promise<Hex>;
+}
+export interface TxSubmissionKey {
+    chainId: number;
+    from: Address;
+    nonce: number;
+}
+export interface TxSubmissionLedgerEntry extends TxSubmissionKey {
+    hash?: Hex;
+    logicalTx?: string;
+    submittedAtMs: number;
+    fees: TxFeeSnapshot;
+    to?: Address;
+    value?: bigint;
+    data?: Hex;
+    resolvedAtMs?: number | null;
+}
+type MaybePromise<T> = T | Promise<T>;
+export interface TxSubmissionLedger {
+    getTxSubmission(key: TxSubmissionKey): MaybePromise<TxSubmissionLedgerEntry | null>;
+    recordTxSubmission(entry: TxSubmissionLedgerEntry): MaybePromise<void>;
+    markTxSubmissionResolved(key: TxSubmissionKey & {
+        resolvedAtMs: number;
+    }): MaybePromise<void>;
+}
+export interface NonceLedgerSubmission {
+    hash?: Hex;
+    logicalTx?: string;
+    submittedAtMs?: number;
+    fees: TxFeeSnapshot;
+    to?: Address;
+    value?: bigint;
+    data?: Hex;
+}
+export interface NonceLedgerContext {
+    ledger: TxSubmissionLedger;
+    chainId: number;
+    from: Address;
+    nonce: number;
+    feeResultForAttempt(attemptIndex: number, options?: {
+        forceEstimate?: boolean;
+    }): Promise<TxFeeOverrideResult>;
+    recordSubmitted(entry: NonceLedgerSubmission): Promise<void>;
+    markResolved(resolvedAtMs?: number): Promise<void>;
+    /**
+     * Re-read the pending nonce from the RPC, update `nonce` in place, and
+     * return the new value. Callers use this after a `nonce too low` revert
+     * (issue #562) so the next retry attempt picks up the fresh value.
+     */
+    refreshNonce(): Promise<number>;
+}
+export interface WithNonceLedgerArgs {
+    publicClient: PublicClient;
+    walletClient?: TxRecoveryWalletClient;
+    ledger?: TxSubmissionLedger;
+    from: Address;
+    nonce?: number;
+    chainId?: number;
+    recoverStuckNonce?: boolean;
+    staleAfterMs?: number;
+}
+export declare function createMemoryTxSubmissionLedger(): TxSubmissionLedger;
+export declare function setDefaultTxSubmissionLedger(ledger: TxSubmissionLedger): void;
+export declare function getDefaultTxSubmissionLedger(): TxSubmissionLedger;
 export declare function withRecoverableRetry<T>(fn: (attemptIndex: number) => Promise<T>, options?: TxRetryOptions): Promise<T>;
 /**
  * Poll publicClient.getCode until bytecode is present at `address`, or give up.
@@ -42,27 +176,40 @@ export declare function waitForContractCode(publicClient: PublicClient, address:
     baseDelayMs?: number;
     maxDelayMs?: number;
 }): Promise<Hex>;
+export declare function mergeFeeEstimateWithPrevious(current: TxFeeSnapshot, previous?: TxFeeSnapshot | null, attemptIndex?: number): TxFeeSnapshot;
+/**
+ * EIP-1559 or legacy gas overrides for viem, increasingly aggressive on later attempts.
+ *
+ * The result carries both the spreadable viem transaction overrides and the
+ * ledger snapshot, keeping call sites from recasting the override object.
+ */
+export declare function viemFeeOverrideResultForAttempt(publicClient: PublicClient, attemptIndex: number, options?: {
+    previousFees?: TxFeeSnapshot | null;
+    forceEstimate?: boolean;
+}): Promise<TxFeeOverrideResult>;
 /** EIP-1559 or legacy gas overrides for viem, increasingly aggressive on later attempts. */
-export declare function viemFeeOverridesForAttempt(publicClient: PublicClient, attemptIndex: number): Promise<{
-    maxFeePerGas: bigint;
-    maxPriorityFeePerGas: bigint;
-} | {
-    gasPrice: bigint;
-} | Record<string, never>>;
+export declare function viemFeeOverridesForAttempt(publicClient: PublicClient, attemptIndex: number, options?: {
+    previousFees?: TxFeeSnapshot | null;
+    forceEstimate?: boolean;
+}): Promise<TxFeeOverrides>;
 export declare function waitForTransactionReceiptWithRetry(publicClient: PublicClient, hash: Hex, options?: TxRetryOptions & {
     pollingInterval?: number;
     confirmations?: number;
 }): Promise<TransactionReceipt>;
-export declare function viemSendTransactionWithRetry(walletClient: {
-    sendTransaction: (tx: any) => Promise<Hex>;
-}, publicClient: PublicClient, txRequest: {
-    account: any;
-    to?: Address;
-    data?: Hex;
-    value?: bigint;
-    gas?: bigint;
-    maxFeePerGas?: bigint;
-    maxPriorityFeePerGas?: bigint;
-    gasPrice?: bigint;
-    [key: string]: any;
-}, options?: TxRetryOptions): Promise<Hex>;
+export declare function removeConflictingLegacyGasPrice<T extends TxFeeSnapshot>(tx: T): void;
+export declare function withNonceLedger<T>(args: WithNonceLedgerArgs, fn: (context: NonceLedgerContext) => Promise<T>): Promise<T>;
+export declare function recoverStuckNonceIfNeeded(args: {
+    publicClient: PublicClient;
+    walletClient: TxRecoveryWalletClient;
+    ledger?: TxSubmissionLedger;
+    from: Address;
+    chainId?: number;
+    staleAfterMs?: number;
+    nowMs?: number;
+}): Promise<{
+    nonce: number;
+    previousHash?: Hex;
+    recoveryHash: Hex;
+} | null>;
+export declare function viemSendTransactionWithRetry(walletClient: TxRetryWalletClient, publicClient: PublicClient, txRequest: TxRetryTransactionRequest, options?: TxRetryOptions): Promise<Hex>;
+export {};