@jinn-network/client 0.1.6 → 0.1.7-canary.08ebd916

package/dist/spend/usage.js

@@ -0,0 +1,113 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { CLAUDE_CODE_HARNESS, CODEX_HARNESS, canonicalHarnessName } from '../harnesses/names.js';
+import { estimateModelCost } from '../harnesses/cost-estimates.js';
+import { priceTokens } from './pricing.js';
+/** USD attributed to a task whose model has no known price. */
+export const UNKNOWN_MODEL_FALLBACK_USD = 1.0;
+/** Parse Claude Code `--output-format stream-json` output for the terminal result. */
+export function parseClaudeCodeUsage(stdoutJsonl) {
+    let result = null;
+    for (const line of stdoutJsonl.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        let obj;
+        try {
+            obj = JSON.parse(trimmed);
+        }
+        catch {
+            continue;
+        }
+        if (obj['type'] === 'result' && typeof obj['total_cost_usd'] === 'number') {
+            const usage = obj['usage'];
+            result = {
+                costUsd: obj['total_cost_usd'],
+                inputTokens: typeof usage?.['input_tokens'] === 'number' ? usage['input_tokens'] : undefined,
+                outputTokens: typeof usage?.['output_tokens'] === 'number' ? usage['output_tokens'] : undefined,
+            };
+        }
+    }
+    return result;
+}
+/** Parse Codex `--json` output for the last turn.completed token usage. */
+export function parseCodexUsage(stdoutJsonl) {
+    let result = null;
+    for (const line of stdoutJsonl.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        let obj;
+        try {
+            obj = JSON.parse(trimmed);
+        }
+        catch {
+            continue;
+        }
+        if (obj['type'] === 'turn.completed' && obj['usage']) {
+            const usage = obj['usage'];
+            const inT = usage['input_tokens'];
+            const outT = usage['output_tokens'];
+            if (typeof inT === 'number' && typeof outT === 'number') {
+                result = { inputTokens: inT, outputTokens: outT };
+            }
+        }
+    }
+    return result;
+}
+function heuristicUsage(model) {
+    const est = model ? estimateModelCost(model) : null;
+    return {
+        model: model ?? 'unknown',
+        costUsd: est?.usd ?? UNKNOWN_MODEL_FALLBACK_USD,
+        estimated: true,
+    };
+}
+/**
+ * Determine the USD cost of a finished harness run. Reads the harness's own
+ * output file for observed usage; falls back to a heuristic on any failure.
+ * Always returns a HarnessUsage — never throws.
+ */
+export function harvestHarnessUsage(harness, workingDir, model) {
+    try {
+        const canonical = canonicalHarnessName(harness);
+        if (canonical === CLAUDE_CODE_HARNESS) {
+            const raw = readFileSync(join(workingDir, '.claude-code', 'stdout.jsonl'), 'utf8');
+            const parsed = parseClaudeCodeUsage(raw);
+            if (parsed) {
+                return {
+                    model: model ?? 'unknown',
+                    costUsd: parsed.costUsd,
+                    estimated: false,
+                    inputTokens: parsed.inputTokens,
+                    outputTokens: parsed.outputTokens,
+                };
+            }
+            return heuristicUsage(model);
+        }
+        if (canonical === CODEX_HARNESS) {
+            const raw = readFileSync(join(workingDir, '.codex-code', 'stdout.jsonl'), 'utf8');
+            const parsed = parseCodexUsage(raw);
+            // When there is no model id, parsed token counts cannot be priced —
+            // discard them and fall back to the heuristic (per spec).
+            if (parsed && model) {
+                const usd = priceTokens(model, parsed);
+                if (usd != null) {
+                    return {
+                        model,
+                        costUsd: usd,
+                        estimated: false,
+                        inputTokens: parsed.inputTokens,
+                        outputTokens: parsed.outputTokens,
+                    };
+                }
+            }
+            return heuristicUsage(model);
+        }
+        return heuristicUsage(model);
+    }
+    catch {
+        return heuristicUsage(model);
+    }
+}
+//# sourceMappingURL=usage.js.map

package/dist/spend/usage.js.map

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

package/dist/store/store.d.ts

@@ -1,5 +1,6 @@
 import Database from 'better-sqlite3';
 import type { EnvelopeProjection, EnvelopeProjectionQuery } from '../corpus/types.js';
+import type { TxSubmissionKey, TxSubmissionLedgerEntry } from '../tx-retry.js';
 export interface ActivityEventInput {
     ts: string | null;
     kind: string;
@@ -9,6 +10,9 @@ export interface ActivityEventInput {
     solverType?: string | null;
     outcome?: string | null;
     detail?: string | null;
+    credentialId?: string | null;
+    costUsdMicros?: number | null;
+    model?: string | null;
 }
 export interface ActivityEventRow {
     id: number;
@@ -20,6 +24,9 @@ export interface ActivityEventRow {
     solverType: string | null;
     outcome: string | null;
     detail: string | null;
+    credentialId: string | null;
+    costUsdMicros: number | null;
+    model: string | null;
 }
 export interface RewardClaimInput {
     ts: string;
@@ -147,6 +154,22 @@ export interface NetworkArtifactMetadataRow {
     lastUsedAt: string;
     peerCatalogId: string | null;
 }
+export interface Erc8004AnchorInput {
+    envelopeId: string;
+    envelopeCid: string;
+    contentKind: string;
+    metadataKey: string;
+    agentId: string;
+    chainId: number;
+    identityRegistryAddress: string;
+    txHash: string;
+    blockNumber: number | null;
+    payloadHex: string;
+    anchoredAt: number;
+}
+export interface Erc8004AnchorRow extends Erc8004AnchorInput {
+    id: number;
+}
 export type TaskPostingPolicyType = 'once_per_safe' | 'once_per_bucket' | 'interval';
 type LauncherTaskProjectionState = 'open' | 'claims-in-flight' | 'fully-claimed' | 'settled' | 'failed';
 export interface TaskPostRecord {
@@ -166,6 +189,15 @@ export declare class Store {
     /** Exposed for engine persistence layer — treat as package-internal. */
     readonly db: Database.Database;
     readonly path: string;
+    /**
+     * Legacy schemas predating Task-native IDs (#406) defined `desired_state_id`
+     * as `TEXT NOT NULL` on `artifacts`. Newer code only writes `task_id`, which
+     * makes inserts revert with "NOT NULL constraint failed: artifacts.desired_state_id"
+     * on databases created before the migration. We can't ALTER COLUMN to drop
+     * the constraint in SQLite without rebuilding the table, so we detect the
+     * legacy column on startup and mirror `task_id` into it from `insertArtifact`.
+     */
+    private hasLegacyDesiredStateId;
     constructor(dbPath: string);
     /** Older request-first DBs keyed artifacts by desired_state_id before Task-native IDs landed. */
     private ensureArtifactsTaskColumns;
@@ -175,6 +207,8 @@ export declare class Store {
     private ensureTaskPostsTaskCoordinatorColumns;
     /** Older local DBs may have the projection table from before Task grouping fields landed. */
     private ensureEnvelopeProjectionColumns;
+    /** Older local DBs predate the per-credential spend-ledger columns on activity_events. */
+    private ensureActivityEventCostColumns;
     /**
      * Task-native startup ignores the retired request-first `restoration_intents`
      * table. Keep a one-time local marker when old in-flight rows are present so
@@ -189,6 +223,11 @@ export declare class Store {
     getShutdownState(): string | null;
     setDaemonStartedAt(value: string): void;
     getDaemonStartedAt(): string | null;
+    recordTxSubmission(entry: TxSubmissionLedgerEntry): void;
+    getTxSubmission(key: TxSubmissionKey): TxSubmissionLedgerEntry | null;
+    markTxSubmissionResolved(key: TxSubmissionKey & {
+        resolvedAtMs: number;
+    }): void;
     /** Generic config row (e.g. last_reward_claim_tick_at). */
     getConfigValue(key: string): string | null;
     setConfigValue(key: string, value: string): void;
@@ -264,8 +303,28 @@ export declare class Store {
         since?: string;
         cursor?: string;
     }): ActivityEventRow[];
+    /**
+     * Total cost in micro-dollars recorded against a credential since the most
+     * recent UTC midnight. Backs the daily spend cap.
+     */
+    spentTodayMicros(credentialId: string, now?: Date): number;
     /** Newer events first, then ascending id for `jinn logs --follow` (oldest in batch printed first in caller). */
     getActivityEventsAfterId(afterId: number, limit: number): ActivityEventRow[];
+    /**
+     * Filtered, id-cursored page of activity events for the dedicated Events
+     * page. Newest-first.
+     *
+     * Cursors on `id` rather than `ts` so startup/shutdown rows with null
+     * timestamps remain reachable.
+     */
+    getActivityEventsPage(opts?: {
+        kinds?: string[];
+        outcome?: string;
+        requestId?: string;
+        beforeId?: number;
+        limit?: number;
+    }): ActivityEventRow[];
+    getActivityEventById(id: number): ActivityEventRow | null;
     getActivityCountsByKind(): Record<string, number>;
     getLastEventAtForService(serviceIndex: number): string | null;
     getActivityCountsForService(serviceIndex: number): Record<string, number>;
@@ -383,6 +442,8 @@ export declare class Store {
     }>;
     saveEnvelopeProjection(projection: EnvelopeProjection): void;
     queryEnvelopeProjections(query?: EnvelopeProjectionQuery): EnvelopeProjection[];
+    saveErc8004Anchor(input: Erc8004AnchorInput): void;
+    listErc8004AnchorsByEnvelopeCids(envelopeCids: readonly string[]): Erc8004AnchorRow[];
     close(): void;
 }
 export {};

package/dist/store/store.js

@@ -73,6 +73,26 @@ CREATE INDEX IF NOT EXISTS idx_activity_events_ts ON activity_events (ts DESC);
 CREATE INDEX IF NOT EXISTS idx_activity_events_req ON activity_events (request_id);
 CREATE INDEX IF NOT EXISTS idx_activity_events_service_idx ON activity_events (service_index);
 
+CREATE TABLE IF NOT EXISTS tx_submissions (
+  chain_id INTEGER NOT NULL,
+  from_address TEXT NOT NULL,
+  nonce INTEGER NOT NULL,
+  hash TEXT,
+  logical_tx TEXT,
+  submitted_at_ms INTEGER NOT NULL,
+  max_fee_per_gas TEXT,
+  max_priority_fee_per_gas TEXT,
+  gas_price TEXT,
+  to_address TEXT,
+  value_wei TEXT,
+  data TEXT,
+  resolved_at_ms INTEGER,
+  PRIMARY KEY (chain_id, from_address, nonce)
+);
+CREATE INDEX IF NOT EXISTS idx_tx_submissions_unresolved
+  ON tx_submissions (chain_id, from_address, nonce)
+  WHERE resolved_at_ms IS NULL;
+
 CREATE TABLE IF NOT EXISTS reward_claims (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   ts TEXT NOT NULL,
@@ -208,6 +228,23 @@ CREATE TABLE IF NOT EXISTS envelope_projection_metadata (
 CREATE INDEX IF NOT EXISTS idx_envelope_projection_metadata_key_value
   ON envelope_projection_metadata (key, value_text);
 
+CREATE TABLE IF NOT EXISTS erc8004_anchors (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  envelope_id TEXT NOT NULL,
+  envelope_cid TEXT NOT NULL,
+  content_kind TEXT NOT NULL,
+  metadata_key TEXT NOT NULL,
+  agent_id TEXT NOT NULL,
+  chain_id INTEGER NOT NULL,
+  identity_registry_address TEXT NOT NULL,
+  tx_hash TEXT NOT NULL,
+  block_number INTEGER,
+  payload_hex TEXT NOT NULL,
+  anchored_at INTEGER NOT NULL
+);
+CREATE INDEX IF NOT EXISTS idx_erc8004_anchors_envelope_cid ON erc8004_anchors(envelope_cid);
+CREATE INDEX IF NOT EXISTS idx_erc8004_anchors_envelope_id ON erc8004_anchors(envelope_id);
+
 CREATE TABLE IF NOT EXISTS task_post_locks (
   creator_safe_address TEXT NOT NULL,
   source_key TEXT NOT NULL,
@@ -256,6 +293,15 @@ export class Store {
     /** Exposed for engine persistence layer — treat as package-internal. */
     db;
     path;
+    /**
+     * Legacy schemas predating Task-native IDs (#406) defined `desired_state_id`
+     * as `TEXT NOT NULL` on `artifacts`. Newer code only writes `task_id`, which
+     * makes inserts revert with "NOT NULL constraint failed: artifacts.desired_state_id"
+     * on databases created before the migration. We can't ALTER COLUMN to drop
+     * the constraint in SQLite without rebuilding the table, so we detect the
+     * legacy column on startup and mirror `task_id` into it from `insertArtifact`.
+     */
+    hasLegacyDesiredStateId = false;
     constructor(dbPath) {
         this.path = dbPath;
         if (dbPath !== ':memory:') {
@@ -270,6 +316,7 @@ export class Store {
         this.ensureNetworkArtifactsPeerCatalogId();
         this.ensureTaskPostsTaskCoordinatorColumns();
         this.ensureEnvelopeProjectionColumns();
+        this.ensureActivityEventCostColumns();
         this.backfillActivityEvents();
         this.recordLegacyRestorationIntentsIgnored();
     }
@@ -277,9 +324,10 @@ export class Store {
     ensureArtifactsTaskColumns() {
         const cols = this.db.prepare(`PRAGMA table_info(artifacts)`).all();
         const names = new Set(cols.map((c) => c.name));
+        this.hasLegacyDesiredStateId = names.has('desired_state_id');
         if (!names.has('task_id')) {
             this.db.exec(`ALTER TABLE artifacts ADD COLUMN task_id TEXT`);
-            if (names.has('desired_state_id')) {
+            if (this.hasLegacyDesiredStateId) {
                 this.db.exec(`UPDATE artifacts SET task_id = desired_state_id WHERE task_id IS NULL`);
             }
         }
@@ -333,6 +381,19 @@ export class Store {
         this.db.exec(`CREATE INDEX IF NOT EXISTS idx_envelope_projections_solution_ref ON envelope_projections (solution_envelope_ref)`);
         this.db.exec(`CREATE INDEX IF NOT EXISTS idx_envelope_projections_generated ON envelope_projections (generated_at DESC)`);
     }
+    /** Older local DBs predate the per-credential spend-ledger columns on activity_events. */
+    ensureActivityEventCostColumns() {
+        const activityCols = new Set(this.db.prepare(`PRAGMA table_info(activity_events)`).all()
+            .map(c => c.name));
+        const addActivityColumn = (name, ddl) => {
+            if (!activityCols.has(name))
+                this.db.exec(`ALTER TABLE activity_events ADD COLUMN ${ddl}`);
+        };
+        addActivityColumn('credential_id', 'credential_id TEXT');
+        addActivityColumn('cost_usd_micros', 'cost_usd_micros INTEGER');
+        addActivityColumn('model', 'model TEXT');
+        this.db.exec(`CREATE INDEX IF NOT EXISTS idx_activity_events_credential ON activity_events (credential_id, ts)`);
+    }
     /**
      * Task-native startup ignores the retired request-first `restoration_intents`
      * table. Keep a one-time local marker when old in-flight rows are present so
@@ -405,6 +466,85 @@ export class Store {
         const row = this.db.prepare('SELECT value FROM config WHERE key = ?').get('daemon_started_at');
         return row?.value ?? null;
     }
+    recordTxSubmission(entry) {
+        this.db.prepare(`INSERT INTO tx_submissions
+         (chain_id, from_address, nonce, hash, logical_tx, submitted_at_ms,
+          max_fee_per_gas, max_priority_fee_per_gas, gas_price, to_address, value_wei, data, resolved_at_ms)
+       VALUES
+         (@chainId, @fromAddress, @nonce, @hash, @logicalTx, @submittedAtMs,
+          @maxFeePerGas, @maxPriorityFeePerGas, @gasPrice, @toAddress, @valueWei, @data, @resolvedAtMs)
+       ON CONFLICT(chain_id, from_address, nonce) DO UPDATE SET
+         hash = excluded.hash,
+         logical_tx = excluded.logical_tx,
+         submitted_at_ms = excluded.submitted_at_ms,
+         max_fee_per_gas = excluded.max_fee_per_gas,
+         max_priority_fee_per_gas = excluded.max_priority_fee_per_gas,
+         gas_price = excluded.gas_price,
+         to_address = excluded.to_address,
+         value_wei = excluded.value_wei,
+         data = excluded.data,
+         resolved_at_ms = excluded.resolved_at_ms`).run({
+            chainId: entry.chainId,
+            fromAddress: entry.from.toLowerCase(),
+            nonce: entry.nonce,
+            hash: entry.hash ?? null,
+            logicalTx: entry.logicalTx ?? null,
+            submittedAtMs: entry.submittedAtMs,
+            maxFeePerGas: entry.fees.maxFeePerGas?.toString() ?? null,
+            maxPriorityFeePerGas: entry.fees.maxPriorityFeePerGas?.toString() ?? null,
+            gasPrice: entry.fees.gasPrice?.toString() ?? null,
+            toAddress: entry.to?.toLowerCase() ?? null,
+            valueWei: entry.value?.toString() ?? null,
+            data: entry.data ?? null,
+            resolvedAtMs: entry.resolvedAtMs ?? null,
+        });
+    }
+    getTxSubmission(key) {
+        const row = this.db.prepare(`SELECT chain_id, from_address, nonce, hash, logical_tx, submitted_at_ms,
+              max_fee_per_gas, max_priority_fee_per_gas, gas_price,
+              to_address, value_wei, data, resolved_at_ms
+       FROM tx_submissions
+       WHERE chain_id = @chainId
+         AND from_address = @fromAddress
+         AND nonce = @nonce`).get({
+            chainId: key.chainId,
+            fromAddress: key.from.toLowerCase(),
+            nonce: key.nonce,
+        });
+        if (!row)
+            return null;
+        return {
+            chainId: row.chain_id,
+            from: row.from_address,
+            nonce: row.nonce,
+            hash: row.hash,
+            logicalTx: row.logical_tx ?? undefined,
+            submittedAtMs: row.submitted_at_ms,
+            fees: {
+                ...(row.max_fee_per_gas !== null ? { maxFeePerGas: BigInt(row.max_fee_per_gas) } : {}),
+                ...(row.max_priority_fee_per_gas !== null
+                    ? { maxPriorityFeePerGas: BigInt(row.max_priority_fee_per_gas) }
+                    : {}),
+                ...(row.gas_price !== null ? { gasPrice: BigInt(row.gas_price) } : {}),
+            },
+            to: row.to_address,
+            value: row.value_wei === null ? undefined : BigInt(row.value_wei),
+            data: row.data,
+            resolvedAtMs: row.resolved_at_ms,
+        };
+    }
+    markTxSubmissionResolved(key) {
+        this.db.prepare(`UPDATE tx_submissions
+       SET resolved_at_ms = @resolvedAtMs
+       WHERE chain_id = @chainId
+         AND from_address = @fromAddress
+         AND nonce = @nonce`).run({
+            chainId: key.chainId,
+            fromAddress: key.from.toLowerCase(),
+            nonce: key.nonce,
+            resolvedAtMs: key.resolvedAtMs,
+        });
+    }
     /** Generic config row (e.g. last_reward_claim_tick_at). */
     getConfigValue(key) {
         const row = this.db.prepare('SELECT value FROM config WHERE key = ?').get(key);
@@ -637,8 +777,12 @@ export class Store {
         return legacyRows.map(r => ({ requestId: r.request_id, role: r.role }));
     }
     recordActivityEvent(event) {
-        this.db.prepare(`INSERT INTO activity_events (ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail)
-       VALUES (@ts, @kind, @requestId, @serviceIndex, @txHash, @solverType, @outcome, @detail)`).run({
+        this.db.prepare(`INSERT INTO activity_events
+         (ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail,
+          credential_id, cost_usd_micros, model)
+       VALUES
+         (@ts, @kind, @requestId, @serviceIndex, @txHash, @solverType, @outcome, @detail,
+          @credentialId, @costUsdMicros, @model)`).run({
             ts: event.ts ?? null,
             kind: event.kind,
             requestId: event.requestId ?? null,
@@ -647,6 +791,9 @@ export class Store {
             solverType: event.solverType ?? null,
             outcome: event.outcome ?? null,
             detail: event.detail ?? null,
+            credentialId: event.credentialId ?? null,
+            costUsdMicros: event.costUsdMicros ?? null,
+            model: event.model ?? null,
         });
     }
     getRecentActivityEvents(limit, opts = {}) {
@@ -662,7 +809,8 @@ export class Store {
             params['cursor'] = opts.cursor;
         }
         const where = clauses.length > 0 ? `WHERE ${clauses.join(' AND ')}` : '';
-        const rows = this.db.prepare(`SELECT id, ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail
+        const rows = this.db.prepare(`SELECT id, ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail,
+              credential_id, cost_usd_micros, model
        FROM activity_events
        ${where}
        ORDER BY id DESC
@@ -677,13 +825,28 @@ export class Store {
             solverType: r.solver_type,
             outcome: r.outcome,
             detail: r.detail,
+            credentialId: r.credential_id,
+            costUsdMicros: r.cost_usd_micros,
+            model: r.model,
         }));
     }
+    /**
+     * Total cost in micro-dollars recorded against a credential since the most
+     * recent UTC midnight. Backs the daily spend cap.
+     */
+    spentTodayMicros(credentialId, now = new Date()) {
+        const midnight = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate())).toISOString();
+        const row = this.db.prepare(`SELECT COALESCE(SUM(cost_usd_micros), 0) AS total
+       FROM activity_events
+       WHERE credential_id = @cid AND ts IS NOT NULL AND ts >= @midnight`).get({ cid: credentialId, midnight });
+        return row.total;
+    }
     /** Newer events first, then ascending id for `jinn logs --follow` (oldest in batch printed first in caller). */
     getActivityEventsAfterId(afterId, limit) {
         const effectiveLimit = Math.max(0, Math.min(limit, 1000));
         const rows = this.db
-            .prepare(`SELECT id, ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail
+            .prepare(`SELECT id, ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail,
+                credential_id, cost_usd_micros, model
          FROM activity_events
          WHERE id > @afterId
          ORDER BY id ASC
@@ -699,8 +862,85 @@ export class Store {
             solverType: r.solver_type,
             outcome: r.outcome,
             detail: r.detail,
+            credentialId: r.credential_id,
+            costUsdMicros: r.cost_usd_micros,
+            model: r.model,
         }));
     }
+    /**
+     * Filtered, id-cursored page of activity events for the dedicated Events
+     * page. Newest-first.
+     *
+     * Cursors on `id` rather than `ts` so startup/shutdown rows with null
+     * timestamps remain reachable.
+     */
+    getActivityEventsPage(opts = {}) {
+        const effectiveLimit = Math.max(1, Math.min(opts.limit ?? 50, 200));
+        const clauses = [];
+        const params = { limit: effectiveLimit };
+        if (opts.kinds && opts.kinds.length > 0) {
+            const placeholders = opts.kinds.map((_, i) => `@kind${i}`);
+            clauses.push(`kind IN (${placeholders.join(', ')})`);
+            opts.kinds.forEach((k, i) => {
+                params[`kind${i}`] = k;
+            });
+        }
+        if (opts.outcome) {
+            clauses.push('outcome = @outcome');
+            params['outcome'] = opts.outcome;
+        }
+        if (opts.requestId) {
+            clauses.push('request_id = @requestId');
+            params['requestId'] = opts.requestId;
+        }
+        if (opts.beforeId !== undefined) {
+            clauses.push('id < @beforeId');
+            params['beforeId'] = opts.beforeId;
+        }
+        const where = clauses.length > 0 ? `WHERE ${clauses.join(' AND ')}` : '';
+        const rows = this.db.prepare(`SELECT id, ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail,
+              credential_id, cost_usd_micros, model
+       FROM activity_events
+       ${where}
+       ORDER BY id DESC
+       LIMIT @limit`).all(params);
+        return rows.map((r) => ({
+            id: r.id,
+            ts: r.ts,
+            kind: r.kind,
+            requestId: r.request_id,
+            serviceIndex: r.service_index,
+            txHash: r.tx_hash,
+            solverType: r.solver_type,
+            outcome: r.outcome,
+            detail: r.detail,
+            credentialId: r.credential_id,
+            costUsdMicros: r.cost_usd_micros,
+            model: r.model,
+        }));
+    }
+    getActivityEventById(id) {
+        const r = this.db.prepare(`SELECT id, ts, kind, request_id, service_index, tx_hash, solver_type, outcome, detail,
+              credential_id, cost_usd_micros, model
+       FROM activity_events
+       WHERE id = ?`).get(id);
+        if (!r)
+            return null;
+        return {
+            id: r.id,
+            ts: r.ts,
+            kind: r.kind,
+            requestId: r.request_id,
+            serviceIndex: r.service_index,
+            txHash: r.tx_hash,
+            solverType: r.solver_type,
+            outcome: r.outcome,
+            detail: r.detail,
+            credentialId: r.credential_id,
+            costUsdMicros: r.cost_usd_micros,
+            model: r.model,
+        };
+    }
     getActivityCountsByKind() {
         const rows = this.db.prepare(`SELECT kind, COUNT(*) as c FROM activity_events GROUP BY kind`).all();
         const out = {};
@@ -815,9 +1055,15 @@ export class Store {
         this.db.prepare('INSERT OR REPLACE INTO config (key, value) VALUES (?, ?)').run('last_processed_block', block.toString());
     }
     insertArtifact(artifact) {
+        const columns = ['id', 'task_id', 'request_id', 'title', 'content', 'tags', 'outcome'];
+        const values = ['@id', '@taskId', '@requestId', '@title', '@content', '@tags', '@outcome'];
+        if (this.hasLegacyDesiredStateId) {
+            columns.push('desired_state_id');
+            values.push('@taskId');
+        }
         this.db.prepare(`
-      INSERT OR REPLACE INTO artifacts (id, task_id, request_id, title, content, tags, outcome)
-      VALUES (@id, @taskId, @requestId, @title, @content, @tags, @outcome)
+      INSERT OR REPLACE INTO artifacts (${columns.join(', ')})
+      VALUES (${values.join(', ')})
     `).run({
             ...artifact,
             tags: JSON.stringify(artifact.tags),
@@ -1404,6 +1650,55 @@ export class Store {
        LIMIT @limit`).all(params);
         return rows.map(rowToEnvelopeProjection);
     }
+    saveErc8004Anchor(input) {
+        this.db.prepare(`INSERT INTO erc8004_anchors
+         (envelope_id, envelope_cid, content_kind, metadata_key, agent_id,
+          chain_id, identity_registry_address, tx_hash, block_number,
+          payload_hex, anchored_at)
+       VALUES
+         (@envelopeId, @envelopeCid, @contentKind, @metadataKey, @agentId,
+          @chainId, @identityRegistryAddress, @txHash, @blockNumber,
+          @payloadHex, @anchoredAt)`).run({
+            envelopeId: input.envelopeId,
+            envelopeCid: input.envelopeCid,
+            contentKind: input.contentKind,
+            metadataKey: input.metadataKey,
+            agentId: input.agentId,
+            chainId: input.chainId,
+            identityRegistryAddress: input.identityRegistryAddress,
+            txHash: input.txHash,
+            blockNumber: input.blockNumber,
+            payloadHex: input.payloadHex,
+            anchoredAt: input.anchoredAt,
+        });
+    }
+    listErc8004AnchorsByEnvelopeCids(envelopeCids) {
+        if (envelopeCids.length === 0)
+            return [];
+        const placeholders = envelopeCids.map((_, i) => `@cid${i}`).join(', ');
+        const params = {};
+        envelopeCids.forEach((cid, i) => { params[`cid${i}`] = cid; });
+        const rows = this.db.prepare(`SELECT id, envelope_id, envelope_cid, content_kind, metadata_key, agent_id,
+              chain_id, identity_registry_address, tx_hash, block_number,
+              payload_hex, anchored_at
+         FROM erc8004_anchors
+         WHERE envelope_cid IN (${placeholders})
+         ORDER BY anchored_at ASC, id ASC`).all(params);
+        return rows.map((r) => ({
+            id: r.id,
+            envelopeId: r.envelope_id,
+            envelopeCid: r.envelope_cid,
+            contentKind: r.content_kind,
+            metadataKey: r.metadata_key,
+            agentId: r.agent_id,
+            chainId: r.chain_id,
+            identityRegistryAddress: r.identity_registry_address,
+            txHash: r.tx_hash,
+            blockNumber: r.block_number,
+            payloadHex: r.payload_hex,
+            anchoredAt: r.anchored_at,
+        }));
+    }
     close() {
         this.db.close();
     }