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

package/dist/api/gather-status.js

@@ -6,16 +6,26 @@ import { base, baseSepolia } from 'viem/chains';
 import { FleetStateStore } from '../earning/store.js';
 import { getChainConfig } from '../earning/contracts.js';
 import { JINN_STAKING_ABI } from '../earning/jinn-rewards.js';
+import { displayFleetServiceIndex } from '../earning/fleet-display-index.js';
 import { assembleStatusV1, resolveMasterDailyEstimateWei, } from './status-build.js';
 import { listStolasClaimTargets } from '../earning/stolas-claim.js';
-import { gatherPortfolioV0Status } from './portfolio-v0-build.js';
+import { gatherPortfolioV0Status, DEFAULT_ENGINE_WORKING_DIR_ROOT, } from './portfolio-v0-build.js';
+const ERC20_BALANCE_OF_ABI = [
+    {
+        type: 'function',
+        name: 'balanceOf',
+        stateMutability: 'view',
+        inputs: [{ name: 'account', type: 'address' }],
+        outputs: [{ name: '', type: 'uint256' }],
+    },
+];
 function chainKey(network) {
     return network === 'testnet' ? 'base-sepolia' : 'base';
 }
 async function sumPendingStakingRewards(rpcUrl, network, fleet) {
     const targets = listStolasClaimTargets(fleet.services);
     if (targets.length === 0) {
-        return { sum: '0' };
+        return { sum: '0', pendingByService: {} };
     }
     const chain = network === 'testnet' ? baseSepolia : base;
     const client = createPublicClient({
@@ -23,6 +33,7 @@ async function sumPendingStakingRewards(rpcUrl, network, fleet) {
         transport: http(rpcUrl),
     });
     let total = 0n;
+    const pendingByService = {};
     let nextCheckpointAt;
     try {
         for (const t of targets) {
@@ -33,6 +44,10 @@ async function sumPendingStakingRewards(rpcUrl, network, fleet) {
                 args: [BigInt(t.serviceId)],
             });
             total += pending;
+            const svc = fleet.services.find((s) => s.service_id === t.serviceId);
+            if (svc) {
+                pendingByService[displayFleetServiceIndex(svc)] = pending.toString();
+            }
         }
         // All staked services in a Phase 1b fleet share the same staking proxy;
         // a single read of the earliest checkpoint timestamp is sufficient.
@@ -51,30 +66,146 @@ async function sumPendingStakingRewards(rpcUrl, network, fleet) {
             // rewards-build keeps nextCheckpointAt as null in that case.
         }
         return nextCheckpointAt
-            ? { sum: total.toString(), nextCheckpointAt }
-            : { sum: total.toString() };
+            ? { sum: total.toString(), pendingByService, nextCheckpointAt }
+            : { sum: total.toString(), pendingByService };
     }
     catch (e) {
         return { error: e instanceof Error ? e.message : String(e) };
     }
 }
+function hasUsefulCacheValues(entry, isAgentRole) {
+    if (isAgentRole)
+        return entry.nativeWei != null;
+    return entry.nativeWei != null || entry.bondWei != null;
+}
+async function gatherServiceBalances(store, rpcClient, fleet, chainCfg) {
+    const ttlMs = 30_000;
+    const now = Date.now();
+    const cache = new Map(store.getBalanceCache().map((e) => [e.role, e]));
+    const out = {};
+    const errorsByDisplay = {};
+    async function getCachedOrFetch(role, address, isAgentRole, fetcher) {
+        const cached = cache.get(role);
+        if (cached && cached.address.toLowerCase() === address.toLowerCase()) {
+            const age = now - Date.parse(cached.fetchedAt);
+            const canUseTtl = Number.isFinite(age) && age <= ttlMs && (!cached.error || hasUsefulCacheValues(cached, isAgentRole));
+            if (canUseTtl)
+                return cached;
+        }
+        try {
+            const fresh = await fetcher();
+            const entry = {
+                role,
+                address,
+                nativeWei: fresh.nativeWei ?? null,
+                bondWei: fresh.bondWei ?? null,
+                assetExtraJson: fresh.assetExtraJson ?? null,
+                fetchedAt: new Date(now).toISOString(),
+                error: null,
+            };
+            store.upsertBalanceCache(entry);
+            cache.set(role, entry);
+            return entry;
+        }
+        catch (error) {
+            const errMsg = error instanceof Error ? error.message : String(error);
+            const keepTs = cached &&
+                hasUsefulCacheValues(cached, isAgentRole) &&
+                cached.fetchedAt;
+            const entry = {
+                role,
+                address,
+                nativeWei: cached?.nativeWei ?? null,
+                bondWei: cached?.bondWei ?? null,
+                assetExtraJson: cached?.assetExtraJson ?? null,
+                fetchedAt: (keepTs ? keepTs : new Date(now).toISOString()),
+                error: errMsg,
+            };
+            store.upsertBalanceCache(entry);
+            cache.set(role, entry);
+            return entry;
+        }
+    }
+    await Promise.all(fleet.services.map(async (svc) => {
+        const displayIndex = displayFleetServiceIndex(svc);
+        const agentAddr = svc.agent_address;
+        const safeAddr = svc.safe_address;
+        if (!agentAddr && !safeAddr)
+            return;
+        const agentRole = `service.${displayIndex}.agent`;
+        const safeRole = `service.${displayIndex}.multisig`;
+        const [agent, safe] = await Promise.all([
+            agentAddr
+                ? getCachedOrFetch(agentRole, agentAddr, true, async () => {
+                    const native = await rpcClient.getBalance({ address: agentAddr });
+                    return { nativeWei: native.toString() };
+                })
+                : Promise.resolve({
+                    role: agentRole, address: '0x', nativeWei: '0', bondWei: '0', fetchedAt: new Date(now).toISOString(),
+                }),
+            safeAddr
+                ? getCachedOrFetch(safeRole, safeAddr, false, async () => {
+                    const [native, bond] = await Promise.all([
+                        rpcClient.getBalance({ address: safeAddr }),
+                        rpcClient.readContract({
+                            address: chainCfg.olasToken,
+                            abi: ERC20_BALANCE_OF_ABI,
+                            functionName: 'balanceOf',
+                            args: [safeAddr],
+                        }),
+                    ]);
+                    return { nativeWei: native.toString(), bondWei: bond.toString() };
+                })
+                : Promise.resolve({
+                    role: safeRole, address: '0x', nativeWei: '0', bondWei: '0', fetchedAt: new Date(now).toISOString(),
+                }),
+        ]);
+        const agentWei = agent.nativeWei ?? '0';
+        const safeNWei = safe.nativeWei ?? '0';
+        const safeBWei = safe.bondWei ?? '0';
+        const rowErr = {};
+        if (agent.error)
+            rowErr.agent = agent.error;
+        if (safe.error)
+            rowErr.multisig = safe.error;
+        if (Object.keys(rowErr).length)
+            errorsByDisplay[displayIndex] = rowErr;
+        out[displayIndex] = {
+            agentNativeWei: agentWei,
+            safeNativeWei: safeNWei,
+            safeBondWei: safeBWei,
+        };
+    }));
+    return { byDisplay: out, errorsByDisplay };
+}
 /** Collect status inputs without assembling the legacy mega-response. */
 export async function gatherGatheredStatusRaw(store, status) {
     const shutdownState = store.getShutdownState();
-    const activityCounts = store.getOwnActivityCounts();
-    const recentActivity = store.getRecentOwnActivity(12);
+    const daemonStartedAt = store.getDaemonStartedAt();
+    const activityCounts = store.getActivityCountsByKind();
+    const recentActivity = store.getRecentActivityEvents(12).map((row) => ({
+        id: row.id,
+        ts: row.ts,
+        kind: row.kind,
+        requestId: row.requestId,
+        serviceIndex: row.serviceIndex,
+        txHash: row.txHash,
+        specKind: row.specKind,
+        outcome: row.outcome,
+    }));
     const lastRewardClaimTickAt = store.getConfigValue('last_reward_claim_tick_at');
     const daily = resolveMasterDailyEstimateWei(status?.masterEthDailyEstimateWei, status?.pollIntervalMs ?? 5000);
     // portfolio.v0 lifecycle data — best-effort, never throws
     let portfolioV0;
     try {
-        portfolioV0 = gatherPortfolioV0Status(store);
+        portfolioV0 = gatherPortfolioV0Status(store, status?.engine?.workingDirRoot ?? DEFAULT_ENGINE_WORKING_DIR_ROOT);
     }
     catch {
         portfolioV0 = undefined;
     }
     const baseRaw = {
         shutdownState,
+        daemonStartedAt,
         dbPath: store.path,
         earningDir: status?.earningDir,
         activityCounts,
@@ -87,6 +218,9 @@ export async function gatherGatheredStatusRaw(store, status) {
         pollIntervalMs: status?.pollIntervalMs ?? 5000,
         masterDailyEstimateWei: daily.toString(),
         portfolioV0,
+        serviceBalances: {},
+        pendingByService: {},
+        claimedByService: store.getClaimedRewardsByService(),
     };
     if (!status) {
         return { ...baseRaw, hintsScope: 'sqlite_only' };
@@ -154,6 +288,7 @@ export async function gatherGatheredStatusRaw(store, status) {
         const pr = await sumPendingStakingRewards(status.rpcUrl, status.network, fleet);
         if ('sum' in pr) {
             raw.pendingStakingRewardsWei = pr.sum;
+            raw.pendingByService = pr.pendingByService;
             if (pr.nextCheckpointAt)
                 raw.nextCheckpointAt = pr.nextCheckpointAt;
         }
@@ -161,6 +296,22 @@ export async function gatherGatheredStatusRaw(store, status) {
             raw.pendingRewardsError = pr.error;
         }
     }
+    if (fleet) {
+        const per = {};
+        for (const svc of fleet.services) {
+            const di = displayFleetServiceIndex(svc);
+            per[di] = {
+                counts: store.getActivityCountsForService(di),
+                lastEventAt: store.getLastEventAtForService(di),
+            };
+        }
+        raw.perServiceActivity = per;
+        const bal = await gatherServiceBalances(store, client, fleet, chainCfg);
+        raw.serviceBalances = bal.byDisplay;
+        if (Object.keys(bal.errorsByDisplay).length > 0) {
+            raw.serviceBalanceErrors = bal.errorsByDisplay;
+        }
+    }
     return raw;
 }
 export async function gatherStatusForApi(store, status) {

package/dist/api/gather-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"gather-status.js","sourceRoot":"","sources":["../../src/api/gather-status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gather-status.js","sourceRoot":"","sources":["../../src/api/gather-status.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAC;AAInE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EACL,gBAAgB,EAIhB,6BAA6B,GAC9B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EACL,uBAAuB,EACvB,+BAA+B,GAChC,MAAM,yBAAyB,CAAC;AAGjC,MAAM,oBAAoB,GAAG;IAC3B;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,WAAW;QACjB,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC9C,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;CACO,CAAC;AAkBX,SAAS,QAAQ,CAAC,OAA8B;IAC9C,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;AACzD,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,MAAc,EACd,OAA8B,EAC9B,KAAiB;IAEjB,MAAM,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IACzD,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAChC,KAAK;QACL,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC;KACxB,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,MAAM,gBAAgB,GAA2B,EAAE,CAAC;IACpD,IAAI,gBAAoC,CAAC;IACzC,IAAI,CAAC;QACH,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC;gBACxC,OAAO,EAAE,CAAC,CAAC,YAA6B;gBACxC,GAAG,EAAE,gBAAgB;gBACrB,YAAY,EAAE,wBAAwB;gBACtC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aAC5B,CAAC,CAAC;YACH,KAAK,IAAI,OAAO,CAAC;YACjB,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;YACrE,IAAI,GAAG,EAAE,CAAC;gBACR,gBAAgB,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvE,CAAC;QACH,CAAC;QACD,wEAAwE;QACxE,oEAAoE;QACpE,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC;gBACvC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAE,CAAC,YAA6B;gBAClD,GAAG,EAAE,gBAAgB;gBACrB,YAAY,EAAE,kCAAkC;aACjD,CAAC,CAAC;YACH,IAAI,MAAM,GAAG,EAAE,EAAE,CAAC;gBAChB,gBAAgB,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YACnE,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;YACvE,6DAA6D;QAC/D,CAAC;QACD,OAAO,gBAAgB;YACrB,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,EAAE;YAC/D,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,CAAC;IAClD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAwB,EAAE,WAAoB;IAC1E,IAAI,WAAW;QAAE,OAAO,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC;IAChD,OAAO,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC;AAC1D,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,KAAY,EACZ,SAA2B,EAC3B,KAAiB,EACjB,QAA2C;IAQ3C,MAAM,KAAK,GAAG,MAAM,CAAC;IACrB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,GAAG,GAGL,EAAE,CAAC;IACP,MAAM,eAAe,GAA6C,EAAE,CAAC;IAErE,KAAK,UAAU,gBAAgB,CAC7B,IAAY,EACZ,OAAe,EACf,WAAoB,EACpB,OAAyF;QAEzF,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YACrE,MAAM,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM,SAAS,GACb,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;YACvG,IAAI,SAAS;gBAAE,OAAO,MAAM,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,OAAO,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAsB;gBAC/B,IAAI;gBACJ,OAAO;gBACP,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;gBAClC,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI;gBAC9B,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI;gBAC5C,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;gBACtC,KAAK,EAAE,IAAI;aACZ,CAAC;YACF,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAChC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtE,MAAM,MAAM,GACV,MAAM;gBACN,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC;gBACzC,MAAM,CAAC,SAAS,CAAC;YACnB,MAAM,KAAK,GAAsB;gBAC/B,IAAI;gBACJ,OAAO;gBACP,SAAS,EAAE,MAAM,EAAE,SAAS,IAAI,IAAI;gBACpC,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,IAAI;gBAChC,cAAc,EAAE,MAAM,EAAE,cAAc,IAAI,IAAI;gBAC9C,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAW;gBACpE,KAAK,EAAE,MAAM;aACd,CAAC;YACF,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAChC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAC/B,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC;QACpC,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC;QAClC,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEpC,MAAM,SAAS,GAAG,WAAW,YAAY,QAAQ,CAAC;QAClD,MAAM,QAAQ,GAAG,WAAW,YAAY,WAAW,CAAC;QACpD,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtC,SAAS;gBACP,CAAC,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE;oBACtD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,SAA0B,EAAE,CAAC,CAAC;oBACnF,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAC1C,CAAC,CAAC;gBACJ,CAAC,CAAC,OAAO,CAAC,OAAO,CAAoB;oBACjC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;iBACrG,CAAC;YACN,QAAQ;gBACN,CAAC,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE;oBACrD,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACvC,SAAS,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,QAAyB,EAAE,CAAC;wBAC5D,SAAS,CAAC,YAAY,CAAC;4BACrB,OAAO,EAAE,QAAQ,CAAC,SAA0B;4BAC5C,GAAG,EAAE,oBAAoB;4BACzB,YAAY,EAAE,WAAW;4BACzB,IAAI,EAAE,CAAC,QAAyB,CAAC;yBAClC,CAAC;qBACH,CAAC,CAAC;oBACH,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpE,CAAC,CAAC;gBACJ,CAAC,CAAC,OAAO,CAAC,OAAO,CAAoB;oBACjC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;iBACpG,CAAC;SACP,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,IAAI,GAAG,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC;QACrC,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,IAAI,KAAK,CAAC,KAAK;YAAE,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAC5C,IAAI,IAAI,CAAC,KAAK;YAAE,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7C,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM;YAAE,eAAe,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;QACvE,GAAG,CAAC,YAAY,CAAC,GAAG;YAClB,cAAc,EAAE,QAAQ;YACxB,aAAa,EAAE,QAAQ;YACvB,WAAW,EAAE,QAAQ;SACtB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC;AAC7C,CAAC;AAED,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,KAAY,EACZ,MAAsC;IAEtC,MAAM,aAAa,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC/C,MAAM,eAAe,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;IACnD,MAAM,cAAc,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;IACvD,MAAM,cAAc,GAAG,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACrE,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC,CAAC,CAAC;IACJ,MAAM,qBAAqB,GAAG,KAAK,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,6BAA6B,CACzC,MAAM,EAAE,yBAAyB,EACjC,MAAM,EAAE,cAAc,IAAI,IAAI,CAC/B,CAAC;IAEF,0DAA0D;IAC1D,IAAI,WAAmE,CAAC;IACxE,IAAI,CAAC;QACH,WAAW,GAAG,uBAAuB,CACnC,KAAK,EACL,MAAM,EAAE,MAAM,EAAE,cAAc,IAAI,+BAA+B,CAClE,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,OAAO,GAAsB;QACjC,aAAa;QACb,eAAe;QACf,MAAM,EAAE,KAAK,CAAC,IAAI;QAClB,UAAU,EAAE,MAAM,EAAE,UAAU;QAC9B,cAAc;QACd,cAAc;QACd,qBAAqB;QACrB,qBAAqB,EAAE,MAAM,EAAE,qBAAqB,IAAI,CAAC;QACzD,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;QACjB,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;QACzB,cAAc,EAAE,MAAM,EAAE,cAAc,IAAI,IAAI;QAC9C,sBAAsB,EAAE,KAAK,CAAC,QAAQ,EAAE;QACxC,WAAW;QACX,eAAe,EAAE,EAAE;QACnB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,KAAK,CAAC,0BAA0B,EAAE;KACrD,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;IACnD,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAC;IAEnD,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,cAAc,CAAC,EAAE,EAAE;QAClC,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;QACvD,4BAA4B,EAAE,MAAM,CAAC,4BAA4B;QACjE,yBAAyB,EAAE,MAAM,CAAC,yBAAyB;QAC3D,2BAA2B,EAAE,MAAM,CAAC,2BAA2B;QAC/D,kCAAkC,EAAE,MAAM,CAAC,kCAAkC;KAC9E,CAAC,CAAC;IAEH,MAAM,GAAG,GAAsB;QAC7B,GAAG,OAAO;QACV,KAAK;QACL,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE;QACpC,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE;QACjD,MAAM,EAAE;YACN,OAAO,EAAE,KAAK,EAAE,cAAc,IAAI,IAAI;SACvC;QACD,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;KACpD,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAChC,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;KAC/B,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,MAAM,CAAC,cAAc,EAAE;YACvB,MAAM,CAAC,UAAU,EAAE;SACpB,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,GAAG;YACR,EAAE,EAAE,IAAI;YACR,OAAO;YACP,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;SACpC,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,GAAG,GAAG;YACR,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;SAClD,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,EAAE,cAAc,EAAE,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC;gBAClC,OAAO,EAAE,KAAK,CAAC,cAA+B;aAC/C,CAAC,CAAC;YACH,GAAG,CAAC,MAAM,GAAG;gBACX,OAAO,EAAE,KAAK,CAAC,cAAc;gBAC7B,UAAU,EAAE,GAAG,CAAC,QAAQ,EAAE;aAC3B,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,GAAG,CAAC,MAAM,GAAG;gBACX,OAAO,EAAE,KAAK,CAAC,cAAc;gBAC7B,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;aAClD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChF,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;YAChB,GAAG,CAAC,wBAAwB,GAAG,EAAE,CAAC,GAAG,CAAC;YACtC,GAAG,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC;YAC3C,IAAI,EAAE,CAAC,gBAAgB;gBAAE,GAAG,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,mBAAmB,GAAG,EAAE,CAAC,KAAK,CAAC;QACrC,CAAC;IACH,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,GAAG,GAGL,EAAE,CAAC;QACP,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,EAAE,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;YACzC,GAAG,CAAC,EAAE,CAAC,GAAG;gBACR,MAAM,EAAE,KAAK,CAAC,2BAA2B,CAAC,EAAE,CAAC;gBAC7C,WAAW,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAAC;aAChD,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,kBAAkB,GAAG,GAAG,CAAC;QAC7B,MAAM,GAAG,GAAG,MAAM,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxE,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC;QACpC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChD,GAAG,CAAC,oBAAoB,GAAG,GAAG,CAAC,eAAe,CAAC;QACjD,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAAY,EACZ,MAAsC;IAEtC,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACzD,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAC/B,CAAC"}

package/dist/api/history-build.d.ts

@@ -5,6 +5,7 @@
  */
 import type { GatheredStatusRaw } from './status-build.js';
 type EventKind = 'intent_posted' | 'request_claimed' | 'delivery_submitted' | 'evaluation_submitted' | 'reward_claimed' | 'other';
+type ActivitySourceRow = GatheredStatusRaw['recentActivity'][number];
 export interface HistoryEvent {
     id: string;
     at: string;
@@ -28,5 +29,8 @@ export interface HistoryOptions {
     since?: string;
     cursor?: string;
 }
-export declare function assembleHistoryV1(raw: GatheredStatusRaw, opts: HistoryOptions): HistoryV1Response;
+/**
+ * @param activityFromStore When set (e.g. from `jinn history`), pre-filtered rows with correct limit/cursor; {@link opts} filter fields are not re-applied.
+ */
+export declare function assembleHistoryV1(raw: GatheredStatusRaw, opts: HistoryOptions, activityFromStore?: ActivitySourceRow[]): HistoryV1Response;
 export {};

package/dist/api/history-build.js

@@ -3,39 +3,64 @@
  *
  * Contract: spec/2026-04-14-client-surface.md §4.4.
  */
-/** own_activity roles → spec §3.3 event kinds */
-const ROLE_TO_KIND = {
-    created: 'intent_posted',
-    claimed: 'request_claimed',
-    delivered: 'delivery_submitted',
-    evaluated: 'evaluation_submitted',
-};
-const REF_MS = Date.UTC(2026, 3, 14, 12, 0, 0);
-function syntheticAt(i) {
-    return new Date(REF_MS - i * 60 * 60 * 1000).toISOString();
+function toEventKind(kind) {
+    switch (kind) {
+        case 'created':
+            return 'intent_posted';
+        case 'claimed':
+            return 'request_claimed';
+        case 'delivered':
+            return 'delivery_submitted';
+        case 'evaluated':
+            return 'evaluation_submitted';
+        case 'intent_posted':
+        case 'request_claimed':
+        case 'delivery_submitted':
+        case 'evaluation_submitted':
+        case 'reward_claimed':
+            return kind;
+        default:
+            return 'other';
+    }
 }
-export function assembleHistoryV1(raw, opts) {
+/**
+ * @param activityFromStore When set (e.g. from `jinn history`), pre-filtered rows with correct limit/cursor; {@link opts} filter fields are not re-applied.
+ */
+export function assembleHistoryV1(raw, opts, activityFromStore) {
     const limit = Math.min(Math.max(opts.limit, 1), 500);
     const generatedAt = new Date().toISOString();
-    let rows = raw.recentActivity.map((e, i) => ({
-        ...e,
-        at: syntheticAt(i),
-    }));
-    if (opts.since) {
-        const sinceTs = new Date(opts.since).getTime();
-        rows = rows.filter(e => !Number.isNaN(sinceTs) && new Date(e.at).getTime() >= sinceTs);
+    let source;
+    if (activityFromStore) {
+        source = activityFromStore;
+    }
+    else {
+        let rows = raw.recentActivity;
+        if (opts.since) {
+            const sinceTs = new Date(opts.since).getTime();
+            rows = rows.filter((e) => e.ts != null
+                && !Number.isNaN(sinceTs)
+                && new Date(e.ts).getTime() >= sinceTs);
+        }
+        if (opts.cursor) {
+            const cursorTs = new Date(opts.cursor).getTime();
+            rows = rows.filter((e) => e.ts != null
+                && !Number.isNaN(cursorTs)
+                && new Date(e.ts).getTime() < cursorTs);
+        }
+        source = rows;
     }
-    const events = rows.slice(0, limit).map((e, i) => {
-        const kind = ROLE_TO_KIND[e.role] ?? 'other';
+    const withTs = source.filter((e) => e.ts != null);
+    const events = withTs.slice(0, limit).map((e, i) => {
+        const kind = toEventKind(e.kind);
         return {
-            id: `evt_${String(i).padStart(5, '0')}`,
-            at: e.at,
-            serviceIndex: 0,
+            id: `evt_${String(e.id ?? i).padStart(5, '0')}`,
+            at: e.ts,
+            serviceIndex: e.serviceIndex ?? 0,
             kind,
-            ...(kind === 'other' ? { subkind: e.role } : {}),
+            ...(kind === 'other' ? { subkind: e.kind } : {}),
             intentId: e.requestId ?? null,
-            txHash: null,
-            outcome: 'ok',
+            txHash: e.txHash ?? null,
+            outcome: e.outcome === 'failed' ? 'failed' : 'ok',
         };
     });
     return {

package/dist/api/history-build.js.map

@@ -1 +1 @@
-{"version":3,"file":"history-build.js","sourceRoot":"","sources":["../../src/api/history-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAoCH,iDAAiD;AACjD,MAAM,YAAY,GAA8B;IAC9C,OAAO,EAAE,eAAe;IACxB,OAAO,EAAE,iBAAiB;IAC1B,SAAS,EAAE,oBAAoB;IAC/B,SAAS,EAAE,sBAAsB;CAClC,CAAC;AAEF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/C,SAAS,WAAW,CAAC,CAAS;IAC5B,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAsB,EAAE,IAAoB;IAC5E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAE7C,IAAI,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,GAAG,CAAC;QACJ,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;KACnB,CAAC,CAAC,CAAC;IAEJ,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC/C,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,MAAM,GAAmB,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC/D,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC;QAC7C,OAAO;YACL,EAAE,EAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;YACvC,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,YAAY,EAAE,CAAC;YACf,IAAI;YACJ,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,QAAQ,EAAE,CAAC,CAAC,SAAS,IAAI,IAAI;YAC7B,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,IAAa;SACvB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,WAAW;QACX,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;QAChF,MAAM;KACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"history-build.js","sourceRoot":"","sources":["../../src/api/history-build.ts"],"names":[],"mappings":"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"}

package/dist/api/portfolio-v0-build.d.ts

@@ -9,6 +9,8 @@
  * hit the network — all data comes from SQLite.
  */
 import type { Store } from '../store/store.js';
+/** Default per-intent engine work root; kept in sync with `config.engine.workingDirRoot`. */
+export declare const DEFAULT_ENGINE_WORKING_DIR_ROOT: string;
 export interface InFlightIntentSummary {
     requestId: string;
     state: string;
@@ -78,4 +80,4 @@ export interface PortfolioV0Status {
  * restoration_intents table does not exist yet (table created on first Store
  * construction, so this is always present when the daemon is running).
  */
-export declare function gatherPortfolioV0Status(store: Store): PortfolioV0Status;
+export declare function gatherPortfolioV0Status(store: Store, workingDirRoot?: string): PortfolioV0Status;

package/dist/api/portfolio-v0-build.js

@@ -9,9 +9,11 @@
  * hit the network — all data comes from SQLite.
  */
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { IntentPersistence } from '../restorer/engine/persistence.js';
-const WORKING_DIR_ROOT = '/tmp/jinn-engine-working';
+/** Default per-intent engine work root; kept in sync with `config.engine.workingDirRoot`. */
+export const DEFAULT_ENGINE_WORKING_DIR_ROOT = join(homedir(), '.jinn-client', 'engine', 'work');
 const RECENT_CLAUDE_OUTCOMES_LIMIT = 10;
 // ── Internal helpers ──────────────────────────────────────────────────────────
 const RECENT_VERDICTS_LIMIT = 10;
@@ -48,7 +50,7 @@ function toVerdict(intent) {
  * restoration_intents table does not exist yet (table created on first Store
  * construction, so this is always present when the daemon is running).
  */
-export function gatherPortfolioV0Status(store) {
+export function gatherPortfolioV0Status(store, workingDirRoot = DEFAULT_ENGINE_WORKING_DIR_ROOT) {
     const persistence = new IntentPersistence(store.db);
     // In-flight: all non-terminal intents
     const inFlight = persistence.getInFlight().map(toInFlight);
@@ -76,27 +78,27 @@ export function gatherPortfolioV0Status(store) {
         // searchArtifacts should never throw, but guard defensively
         recentSnapshots = [];
     }
-    const recentClaudeOutcomes = gatherRecentClaudeOutcomes();
+    const recentClaudeOutcomes = gatherRecentClaudeOutcomes(workingDirRoot);
     return { inFlight, recentVerdicts, recentSnapshots, recentClaudeOutcomes };
 }
 /**
- * Scan the session outcome files under `/tmp/jinn-engine-working/*\/sessions/*\/outcome.json`
- * and return the most recent N. Swallows all filesystem errors so a missing or
- * malformed working dir never breaks the status endpoint.
+ * Scan session outcome files: each intent dir under `workingDirRoot` may contain
+ * `sessions/<id>/outcome.json`. Return the most recent N. Swallows all filesystem
+ * errors so a missing or malformed working dir never breaks the status endpoint.
  */
-function gatherRecentClaudeOutcomes() {
-    if (!existsSync(WORKING_DIR_ROOT))
+function gatherRecentClaudeOutcomes(workingDirRoot) {
+    if (!existsSync(workingDirRoot))
         return [];
     const outcomes = [];
     let intentDirs;
     try {
-        intentDirs = readdirSync(WORKING_DIR_ROOT);
+        intentDirs = readdirSync(workingDirRoot);
     }
     catch {
         return [];
     }
     for (const intentDir of intentDirs) {
-        const sessionsDir = join(WORKING_DIR_ROOT, intentDir, 'sessions');
+        const sessionsDir = join(workingDirRoot, intentDir, 'sessions');
         if (!existsSync(sessionsDir))
             continue;
         let sessionDirs;

package/dist/api/portfolio-v0-build.js.map

@@ -1 +1 @@
-{"version":3,"file":"portfolio-v0-build.js","sourceRoot":"","sources":["../../src/api/portfolio-v0-build.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAGtE,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AACpD,MAAM,4BAA4B,GAAG,EAAE,CAAC;AAyExC,iFAAiF;AAEjF,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAEjC,SAAS,UAAU,CAAC,MAAuB;IACzC,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,SAAS,EAAE,MAAM,CAAC,aAAa;KAChC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,MAAuB;IACxC,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,KAAK,EAAE,MAAM,CAAC,KAA8B;QAC5C,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;KACtC,CAAC;AACJ,CAAC;AAED,iFAAiF;AAEjF;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAY;IAClD,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpD,sCAAsC;IACtC,MAAM,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAE3D,2EAA2E;IAC3E,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,MAAM,CAAC,CAAC,IAAI,CAC/C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc,CAC9C,CAAC;IACF,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAElF,mEAAmE;IACnE,IAAI,eAAe,GAAsB,EAAE,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,KAAK,CAAC,eAAe,CAAC;YAC9C,IAAI,EAAE,CAAC,iBAAiB,CAAC;YACzB,KAAK,EAAE,sBAAsB;SAC9B,CAAC,CAAC;QACH,eAAe,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9C,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,SAAS,EAAE,CAAC,CAAC,UAAU;YACvB,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,SAAS,EAAE,CAAC,CAAC,UAAU;SACxB,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,MAAM,CAAC;QACP,4DAA4D;QAC5D,eAAe,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,MAAM,oBAAoB,GAAG,0BAA0B,EAAE,CAAC;IAE1D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,CAAC;AAC7E,CAAC;AAED;;;;GAIG;AACH,SAAS,0BAA0B;IACjC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAAE,OAAO,EAAE,CAAC;IAC7C,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAE5C,IAAI,UAAoB,CAAC;IACzB,IAAI,CAAC;QACH,UAAU,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,SAAS;QACvC,IAAI,WAAqB,CAAC;QAC1B,IAAI,CAAC;YACH,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;YAClE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAAE,SAAS;YACvC,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAkC,CAAC;gBAChE,IACE,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;oBACpC,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;oBACpC,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;oBACpC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAClC,CAAC;oBACD,QAAQ,CAAC,IAAI,CAAC;wBACZ,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC;wBACpE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,KAAK;wBAChC,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,IAAI,CAAC;wBACtD,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;wBACnC,GAAG,CAAC,MAAM,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC7F,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,iCAAiC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,4BAA4B,CAAC,CAAC;AACzD,CAAC"}
+{"version":3,"file":"portfolio-v0-build.js","sourceRoot":"","sources":["../../src/api/portfolio-v0-build.ts"],"names":[],"mappings":"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"}

package/dist/api/rewards-build.js

@@ -13,21 +13,37 @@ const STAKED_LIKE_STEPS = new Set([
 export function assembleRewardsV1(raw) {
     const total = raw.pendingStakingRewardsWei ?? '0';
     const list = raw.fleet?.services ?? [];
-    const firstStakedIdx = list.findIndex(s => STAKED_LIKE_STEPS.has(s.step));
-    const rewardIdx = firstStakedIdx >= 0 ? firstStakedIdx : 0;
-    const services = list.map((svc, i) => {
+    const pendingByService = raw.pendingByService ?? {};
+    const claimedByService = raw.claimedByService ?? {};
+    const pendingByKeys = Object.keys(pendingByService);
+    let legacyPendingIndex = null;
+    if (pendingByKeys.length === 0 && list.length > 0) {
+        try {
+            if (total !== '0' && BigInt(total) > 0n) {
+                const s = list.find(svc => STAKED_LIKE_STEPS.has(svc.step)) ?? list[0];
+                if (s)
+                    legacyPendingIndex = displayFleetServiceIndex(s);
+            }
+        }
+        catch {
+            /* ignore */
+        }
+    }
+    const services = list.map((svc) => {
+        const index = displayFleetServiceIndex(svc);
         const stakedLike = STAKED_LIKE_STEPS.has(svc.step);
-        const pending = firstStakedIdx < 0
-            ? i === 0
-                ? total
-                : '0'
-            : stakedLike && i === rewardIdx
-                ? total
-                : '0';
+        const claimed = claimedByService[index]?.total ?? '0';
         return {
-            index: displayFleetServiceIndex(svc),
-            pending,
-            claimed: '0',
+            index,
+            pending: stakedLike
+                ? (pendingByService[index] ??
+                    (list.length === 1
+                        ? total
+                        : legacyPendingIndex === index
+                            ? total
+                            : '0'))
+                : '0',
+            claimed,
             asset: 'reward',
         };
     });

package/dist/api/rewards-build.js.map

@@ -1 +1 @@
-{"version":3,"file":"rewards-build.js","sourceRoot":"","sources":["../../src/api/rewards-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,QAAQ;IACR,eAAe;IACf,UAAU;IACV,gBAAgB;CACjB,CAAC,CAAC;AAiBH,MAAM,UAAU,iBAAiB,CAAC,GAAsB;IACtD,MAAM,KAAK,GAAG,GAAG,CAAC,wBAAwB,IAAI,GAAG,CAAC;IAClD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,CAAC;IACvC,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,MAAM,SAAS,GAAG,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QACnC,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,OAAO,GACX,cAAc,GAAG,CAAC;YAChB,CAAC,CAAC,CAAC,KAAK,CAAC;gBACP,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,GAAG;YACP,CAAC,CAAC,UAAU,IAAI,CAAC,KAAK,SAAS;gBAC7B,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,GAAG,CAAC;QACZ,OAAO;YACL,KAAK,EAAE,wBAAwB,CAAC,GAAG,CAAC;YACpC,OAAO;YACP,OAAO,EAAE,GAAG;YACZ,KAAK,EAAE,QAAiB;SACzB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACrC,WAAW,EAAE,GAAG,CAAC,qBAAqB;QACtC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,IAAI;QAC9C,QAAQ;KACT,CAAC;AACJ,CAAC"}
+{"version":3,"file":"rewards-build.js","sourceRoot":"","sources":["../../src/api/rewards-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,QAAQ;IACR,eAAe;IACf,UAAU;IACV,gBAAgB;CACjB,CAAC,CAAC;AAiBH,MAAM,UAAU,iBAAiB,CAAC,GAAsB;IACtD,MAAM,KAAK,GAAG,GAAG,CAAC,wBAAwB,IAAI,GAAG,CAAC;IAClD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,CAAC;IACvC,MAAM,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;IACpD,MAAM,gBAAgB,GAAG,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;IACpD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACpD,IAAI,kBAAkB,GAAkB,IAAI,CAAC;IAC7C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,IAAI,CAAC;YACH,IAAI,KAAK,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC;gBACxC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;gBACvE,IAAI,CAAC;oBAAE,kBAAkB,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,MAAM,KAAK,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,GAAG,CAAC;QACtD,OAAO;YACL,KAAK;YACL,OAAO,EAAE,UAAU;gBACjB,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC;oBACtB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;wBAChB,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,kBAAkB,KAAK,KAAK;4BAC5B,CAAC,CAAC,KAAK;4BACP,CAAC,CAAC,GAAG,CAAC,CAAC;gBACf,CAAC,CAAC,GAAG;YACP,OAAO;YACP,KAAK,EAAE,QAAiB;SACzB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACrC,WAAW,EAAE,GAAG,CAAC,qBAAqB;QACtC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,IAAI,IAAI;QAC9C,QAAQ;KACT,CAAC;AACJ,CAAC"}

package/dist/api/status-build.d.ts

@@ -4,16 +4,27 @@
 import type { FleetState } from '../earning/types.js';
 import type { PortfolioV0Status } from './portfolio-v0-build.js';
 export type StatusHintsScope = 'full' | 'sqlite_only';
+export interface ServiceBalanceErrorEntry {
+    agent?: string;
+    multisig?: string;
+}
 export interface GatheredStatusRaw {
     /** sqlite_only: only SQLite-backed fields (e2e / API without fleet context). */
     hintsScope?: StatusHintsScope;
     shutdownState: string | null;
+    daemonStartedAt?: string | null;
     dbPath: string;
     earningDir?: string;
     activityCounts: Record<string, number>;
     recentActivity: Array<{
-        requestId: string;
-        role: string;
+        id: number;
+        ts: string | null;
+        kind: string;
+        requestId: string | null;
+        serviceIndex: number | null;
+        txHash: string | null;
+        specKind: string | null;
+        outcome: string | null;
     }>;
     lastRewardClaimTickAt: string | null;
     rewardClaimIntervalMs: number;
@@ -39,11 +50,29 @@ export interface GatheredStatusRaw {
     minMasterEthWei?: string;
     /** portfolio.v0 lifecycle data — populated by gather-status from the SQLite store. */
     portfolioV0?: PortfolioV0Status;
+    serviceBalances?: Record<number, {
+        agentNativeWei: string;
+        safeNativeWei: string;
+        safeBondWei: string;
+    }>;
+    /** Last balance fetch error per service (display index). Present when a fetch failed. */
+    serviceBalanceErrors?: Record<number, ServiceBalanceErrorEntry>;
+    perServiceActivity?: Record<number, {
+        counts: Record<string, number>;
+        lastEventAt: string | null;
+    }>;
+    pendingByService?: Record<number, string>;
+    claimedByService?: Record<number, {
+        total: string;
+        lastAt: string;
+        lastTxHash: string;
+    }>;
 }
 export interface StatusV1Response {
     statusMode: 'full' | 'sqlite_only';
     daemon: {
         shutdownState: string | null;
+        startedAt: string | null;
         dbPath: string;
         timestamp: string;
     };
@@ -66,10 +95,7 @@ export interface StatusV1Response {
     };
     activity: {
         counts: Record<string, number>;
-        recent: Array<{
-            requestId: string;
-            role: string;
-        }>;
+        recent: GatheredStatusRaw['recentActivity'];
     };
     rewards: {
         claimLoopIntervalMs: number;