Fix admin claims query failures against persisted Neon claim tables

api/admin/claim.js

@@ -27,16 +27,8 @@ module.exports = async function handler(req, res) {
       return res.status(404).json({ ok: false, status: 'CLAIM_NOT_FOUND' });
     }
 
-    const agentsResult = await db.query(
-      `select ens, capability, canonical_parent, skill, skill_family, created_at
-       from claim_agents where claim_id = $1 order by created_at asc`,
-      [claimId]
-    );
-    const eventsResult = await db.query(
-      `select event_type, message, metadata_json, created_at
-       from claim_events where claim_id = $1 order by created_at asc`,
-      [claimId]
-    );
+    const agentsResult = await db.query('select * from claim_agents where claim_id = $1 order by capability asc', [claimId]);
+    const eventsResult = await db.query('select * from claim_events where claim_id = $1 order by created_at asc', [claimId]);
 
     return res.status(200).json({
       ok: true,
@@ -45,6 +37,7 @@ module.exports = async function handler(req, res) {
       events: eventsResult.rows
     });
   } catch (error) {
-    return res.status(500).json({ ok: false, status: 'ADMIN_CLAIM_QUERY_FAILED' });
+    console.error('ADMIN_CLAIM_QUERY_FAILED', { message: error.message, code: error.code });
+    return res.status(500).json({ ok: false, status: 'ADMIN_CLAIM_QUERY_FAILED', error: 'Failed to load claim.' });
   }
 };

api/admin/claims.js

@@ -23,34 +23,44 @@ module.exports = async function handler(req, res) {
 
   try {
     const result = await db.query(
-      `select claim_id, tenant, authenticated_address, activation_mode, pack_id, status, created_at
-       from claim_requests
-       order by created_at desc
+      `select
+         cr.claim_id,
+         cr.tenant,
+         cr.authenticated_address,
+         cr.activation_mode,
+         cr.pack_id,
+         cr.status,
+         cr.created_at,
+         count(ca.id)::int as agent_count
+       from claim_requests cr
+       left join claim_agents ca on ca.claim_id = cr.claim_id
+       group by
+         cr.claim_id,
+         cr.tenant,
+         cr.authenticated_address,
+         cr.activation_mode,
+         cr.pack_id,
+         cr.status,
+         cr.created_at
+       order by cr.created_at desc
        limit $1`,
       [limit]
     );
 
-    const claims = [];
-    for (const row of result.rows) {
-      const countResult = await db.query(
-        'select count(*)::int as agent_count from claim_agents where claim_id = $1',
-        [row.claim_id]
-      );
-      const agentCount = countResult.rows && countResult.rows[0] ? Number(countResult.rows[0].agent_count || 0) : 0;
-      claims.push({
-        claimId: row.claim_id,
-        tenant: row.tenant,
-        authenticatedAddress: row.authenticated_address,
-        activationMode: row.activation_mode,
-        packId: row.pack_id,
-        status: row.status,
-        agentCount,
-        createdAt: row.created_at
-      });
-    }
+    const claims = result.rows.map((row) => ({
+      claimId: row.claim_id,
+      tenant: row.tenant,
+      authenticatedAddress: row.authenticated_address,
+      activationMode: row.activation_mode,
+      packId: row.pack_id,
+      status: row.status,
+      agentCount: Number(row.agent_count || 0),
+      createdAt: row.created_at
+    }));
 
     return res.status(200).json({ ok: true, claims });
   } catch (error) {
-    return res.status(500).json({ ok: false, status: 'ADMIN_CLAIMS_QUERY_FAILED' });
+    console.error('ADMIN_CLAIMS_QUERY_FAILED', { message: error.message, code: error.code });
+    return res.status(500).json({ ok: false, status: 'ADMIN_CLAIMS_QUERY_FAILED', error: 'Failed to load claims.' });
   }
 };

tests/api-admin-claims.test.js

@@ -43,19 +43,32 @@ test('admin claims returns UNAUTHORIZED when auth missing', async () => {
 
 test('admin claims returns list when authorized', async () => {
   process.env.ADMIN_API_KEY = 'secret';
-  const calls = [];
-  const handler = load('../api/admin/claims', async (text, params) => {
-    calls.push(String(text));
-    if (String(text).includes('from claim_requests')) {
-      return { rows: [{ claim_id: 'clm_1', tenant: 'commandlayer', authenticated_address: '0x1', activation_mode: 'cl', pack_id: 'trust', status: 'created', created_at: '2026-05-23T00:00:00.000Z' }] };
-    }
-    return { rows: [{ agent_count: 2 }] };
-  });
+  const handler = load('../api/admin/claims', async () => ({
+    rows: [{
+      claim_id: 'clm_1',
+      tenant: 'commandlayer',
+      authenticated_address: '0x1',
+      activation_mode: 'cl',
+      pack_id: 'trust',
+      status: 'created',
+      agent_count: 2,
+      created_at: '2026-05-23T00:00:00.000Z'
+    }]
+  }));
   const res = makeRes();
   await handler({ method: 'GET', headers: { authorization: 'Bearer secret' }, query: {} }, res);
   assert.equal(res.statusCode, 200);
   assert.equal(res.body.ok, true);
-  assert.equal(res.body.claims[0].agentCount, 2);
+  assert.deepEqual(res.body.claims[0], {
+    claimId: 'clm_1',
+    tenant: 'commandlayer',
+    authenticatedAddress: '0x1',
+    activationMode: 'cl',
+    packId: 'trust',
+    status: 'created',
+    agentCount: 2,
+    createdAt: '2026-05-23T00:00:00.000Z'
+  });
 });
 
 test('admin claim detail returns agents and events when authorized', async () => {