@jinn-network/client 0.1.6 → 0.1.7-canary.0a586ca9

package/dist/trajectory/transcript-watcher.js

@@ -23,6 +23,13 @@
  * every previously-seen transcript record. (The `jinn capture import` CLI
  * uses `parser.parseFull` for one-shot history ingest.)
  *
+ * ## Directory watching
+ *
+ * `directories` watches a session folder for new or growing `*.jsonl` files
+ * (e.g. `~/.codex/sessions`, `~/.claude/projects/**`). Existing files are
+ * registered at startup with the same tail-from-end baseline; `add` events
+ * register files created after startup.
+ *
  * ## Cursor SQLite quirk — fail loudly
  *
  * The Cursor parser's `parseChunk` is a no-op: SQLite isn't streaming, and
@@ -35,12 +42,14 @@
  * Spec: spec/2026-05-07-telemetry-collector-and-task-generator.md §4.2 path B.
  */
 import * as fs from 'node:fs/promises';
+import { resolve as resolvePath } from 'node:path';
 import chokidar from 'chokidar';
 import { ClaudeCodeJsonlParser } from './transcript-parsers/claude-code-jsonl.js';
 import { CodexSessionParser } from './transcript-parsers/codex-session.js';
 import { GeminiSessionParser } from './transcript-parsers/gemini-session.js';
 import { AiderHistoryParser } from './transcript-parsers/aider-history.js';
 import { ContinueDevDataParser } from './transcript-parsers/continue-devdata.js';
+import { listSessionJsonlFiles } from './transcript-session-dirs.js';
 function makeParser(tool) {
     switch (tool) {
         case 'claude-code':
@@ -54,10 +63,6 @@ function makeParser(tool) {
         case 'continue':
             return new ContinueDevDataParser();
         case 'cursor':
-            // See file header. Cursor streaming via chokidar would silently miss
-            // WAL deltas; the parser's parseChunk is a deliberate no-op. Polling-
-            // based Cursor support is a Phase 3.5+ follow-up; until then operators
-            // should use `jinn capture import` for Cursor sessions.
             throw new Error("Cursor SQLite watching not yet supported in v0 — use 'jinn capture import' " +
                 'for Cursor sessions or wait for polling support (Phase 3.5+).');
         default: {
@@ -66,41 +71,107 @@ function makeParser(tool) {
         }
     }
 }
+async function tailOffsetForPath(filePath) {
+    try {
+        const stats = await fs.stat(filePath);
+        return stats.size;
+    }
+    catch {
+        return 0;
+    }
+}
+function isJsonlSessionFile(filePath) {
+    return filePath.endsWith('.jsonl');
+}
 export async function startTranscriptWatcher(cfg) {
+    const sources = cfg.sources ?? [];
+    const directories = cfg.directories ?? [];
+    if (sources.length === 0 && directories.length === 0) {
+        throw new Error('startTranscriptWatcher requires at least one source or directory');
+    }
     const states = new Map();
-    for (const source of cfg.sources) {
-        // Construct the parser first so a Cursor source fails loudly *before* we
-        // open any chokidar handles.
-        const parser = makeParser(source.tool);
-        let nextOffset = 0;
-        try {
-            const stats = await fs.stat(source.path);
-            nextOffset = stats.size;
-        }
-        catch {
-            // File doesn't exist yet — start at offset 0; chokidar will fire `add`
-            // when it appears.
-            nextOffset = 0;
+    const directoryParsers = new Map();
+    const registerSource = async (source, opts) => {
+        const normalizedPath = resolvePath(source.path);
+        const nextOffset = opts.tailFromEnd ? await tailOffsetForPath(normalizedPath) : 0;
+        const parser = opts.parser ?? makeParser(source.tool);
+        states.set(normalizedPath, {
+            source: { ...source, path: normalizedPath },
+            parser,
+            nextOffset,
+            inFlight: Promise.resolve(),
+        });
+    };
+    for (const source of sources) {
+        await registerSource(source, { tailFromEnd: true });
+    }
+    for (const dir of directories) {
+        const parser = makeParser(dir.tool);
+        directoryParsers.set(dir.tool, parser);
+        const files = await listSessionJsonlFiles(dir.directory, dir.recursive === true);
+        for (const filePath of files) {
+            await registerSource({
+                tool: dir.tool,
+                path: filePath,
+                sessionId: dir.sessionIdFromPath(filePath),
+            }, { tailFromEnd: true, parser });
         }
-        states.set(source.path, { source, parser, nextOffset, inFlight: Promise.resolve() });
     }
     let shuttingDown = false;
-    const watcher = chokidar.watch(cfg.sources.map((s) => s.path), {
+    const watchPaths = [
+        ...sources.map((s) => s.path),
+        ...directories.map((d) => d.directory),
+    ];
+    const watcher = chokidar.watch(watchPaths, {
         persistent: true,
-        // Wait for writers to settle before reading; cheap insurance against
-        // half-written JSONL lines.
         awaitWriteFinish: { stabilityThreshold: 50, pollInterval: 25 },
-        // Tail-from-end: on startup, current contents are the baseline. Only
-        // mutations *after* startup should dispatch.
         ignoreInitial: true,
     });
+    const resolveDirectoryForPath = (filepath) => {
+        const normalized = resolvePath(filepath);
+        for (const dir of directories) {
+            const root = resolvePath(dir.directory);
+            const prefix = root.endsWith('/') ? root : `${root}/`;
+            if (normalized === root || normalized.startsWith(prefix)) {
+                return dir;
+            }
+        }
+        return undefined;
+    };
+    const ensureStateForPath = async (filepath) => {
+        const normalized = resolvePath(filepath);
+        const existing = states.get(normalized);
+        if (existing)
+            return existing;
+        const dir = resolveDirectoryForPath(normalized);
+        if (!dir || !isJsonlSessionFile(normalized))
+            return undefined;
+        const parser = directoryParsers.get(dir.tool) ?? makeParser(dir.tool);
+        directoryParsers.set(dir.tool, parser);
+        const source = {
+            tool: dir.tool,
+            path: normalized,
+            sessionId: dir.sessionIdFromPath(normalized),
+        };
+        const state = {
+            source,
+            parser,
+            nextOffset: 0,
+            inFlight: Promise.resolve(),
+        };
+        states.set(normalized, state);
+        return state;
+    };
     const enqueue = (filepath) => {
         if (shuttingDown)
             return;
-        const state = states.get(filepath);
-        if (!state)
-            return;
-        state.inFlight = state.inFlight.then(() => handleChange(state));
+        const normalized = resolvePath(filepath);
+        void (async () => {
+            const state = states.get(normalized) ?? await ensureStateForPath(normalized);
+            if (!state)
+                return;
+            state.inFlight = state.inFlight.then(() => handleChange(state));
+        })();
     };
     watcher.on('add', enqueue);
     watcher.on('change', enqueue);
@@ -115,9 +186,6 @@ export async function startTranscriptWatcher(cfg) {
         catch {
             return;
         }
-        // Truncation or stale event — skip. (We deliberately do not reset
-        // nextOffset on truncation; if the file is rotated we'd need explicit
-        // operator intervention. Phase 3.5+ may add inode-change detection.)
         if (size <= state.nextOffset)
             return;
         const handle = await fs.open(state.source.path, 'r');
@@ -148,8 +216,6 @@ export async function startTranscriptWatcher(cfg) {
         async shutdown() {
             shuttingDown = true;
             await watcher.close();
-            // Drain any in-flight per-source handlers so post-shutdown the map is
-            // settled. Errors here are intentionally swallowed — we're tearing down.
             await Promise.allSettled(Array.from(states.values(), (state) => state.inFlight));
         },
     };

package/dist/trajectory/transcript-watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"transcript-watcher.js","sourceRoot":"","sources":["../../src/trajectory/transcript-watcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,QAA4B,MAAM,UAAU,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAqCjF,SAAS,UAAU,CAAC,IAAiB;IACnC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,aAAa;YAChB,OAAO,IAAI,qBAAqB,EAAE,CAAC;QACrC,KAAK,OAAO;YACV,OAAO,IAAI,kBAAkB,EAAE,CAAC;QAClC,KAAK,YAAY;YACf,OAAO,IAAI,mBAAmB,EAAE,CAAC;QACnC,KAAK,OAAO;YACV,OAAO,IAAI,kBAAkB,EAAE,CAAC;QAClC,KAAK,UAAU;YACb,OAAO,IAAI,qBAAqB,EAAE,CAAC;QACrC,KAAK,QAAQ;YACX,qEAAqE;YACrE,sEAAsE;YACtE,uEAAuE;YACvE,wDAAwD;YACxD,MAAM,IAAI,KAAK,CACb,6EAA6E;gBAC3E,+DAA+D,CAClE,CAAC;QACJ,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,UAAU,GAAU,IAAI,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,uBAAuB,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;AACH,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,GAA4B;IAE5B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC9C,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QACjC,yEAAyE;QACzE,6BAA6B;QAC7B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;YACvE,mBAAmB;YACnB,UAAU,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,IAAI,YAAY,GAAG,KAAK,CAAC;IAEzB,MAAM,OAAO,GAAc,QAAQ,CAAC,KAAK,CACvC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAC9B;QACE,UAAU,EAAE,IAAI;QAChB,qEAAqE;QACrE,4BAA4B;QAC5B,gBAAgB,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QAC9D,qEAAqE;QACrE,6CAA6C;QAC7C,aAAa,EAAE,IAAI;KACpB,CACF,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAQ,EAAE;QACzC,IAAI,YAAY;YAAE,OAAO;QACzB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE9B,KAAK,UAAU,YAAY,CAAC,KAAkB;QAC5C,IAAI,YAAY;YAAE,OAAO;QACzB,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACpB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;QACD,kEAAkE;QAClE,sEAAsE;QACtE,qEAAqE;QACrE,IAAI,IAAI,IAAI,KAAK,CAAC,UAAU;YAAE,OAAO;QAErC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC;YACvC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;YACvE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;YAExB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;gBACrC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS;gBACjC,KAAK,EAAE,GAAG;aACX,CAAC,CAAC;YACH,IAAI,YAAY;gBAAE,OAAO;YACzB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,GAAG,CAAC,OAAO,CAAC;oBACV,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;oBACvB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS;oBACjC,KAAK;iBACN,CAAC,CAAC;YACL,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED,OAAO;QACL,KAAK,CAAC,QAAQ;YACZ,YAAY,GAAG,IAAI,CAAC;YACpB,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YACtB,sEAAsE;YACtE,yEAAyE;YACzE,MAAM,OAAO,CAAC,UAAU,CACtB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CACvD,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"transcript-watcher.js","sourceRoot":"","sources":["../../src/trajectory/transcript-watcher.ts"],"names":[],"mappings":"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"}

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 {};