Changeset 1a2d8ac in Klonkt

Timestamp:

07/24/2026 05:36:42 PM (7 weeks ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

c26cc18

Parents:

e84ce32

git-author:

Robin Genis <roboburr@…> (07/24/2026 05:36:30 PM)

git-committer:

Robin Genis <roboburr@…> (07/24/2026 05:36:42 PM)

Message:

Offers-queue draagt de daemon-hulpvelden (accept-knop in de apps)

De Shaer-clients renderen hun accepteer-knop uit de shaer:-hulpvelden die
de test-daemon op elk offer-item zet (shaer:ward, candidate, needsMyAccept,
iAmCandidate, ...). Klonkt's offers-queue gaf een kale AS2-Offer, waardoor
de parser lege velden zag en de knop nooit verscheen. Nu draagt elk item
beide vormen: de AS2 Relationship én de hulpvelden. Klonkts flow is
één-fase (de Accept van de ward maakt het meteen echt), dus needsMyAccept
geldt de ward-kant en readyToCommit blijft false.

Changed files:
src/services/guardianship/queues.js

• offersCollection: shaer:ward/candidate/existingGuardians/acceptedBy/ needsMyAccept/readyToCommit/iAmCandidate per item

test/guardianship.test.js

• pint de hulpvelden op de kid-queue

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Files:

• src/services/guardianship/queues.js (modified) (1 diff)
• test/guardianship.test.js (modified) (1 diff)

src/services/guardianship/queues.js

@@ -16 +16 @@
 });
 
-/** Pending offers, reconstructed as Offer activities (either side). */
+/** Pending offers, reconstructed as Offer activities (either side). Each item
+ *  also carries the daemon-contract helper fields (shaer:ward, candidate,
+ *  needsMyAccept, iAmCandidate, …): the Shaer clients render their accept
+ *  button from those, so the shapes must match the test daemon exactly. */
 export function offersCollection(id, slug, me) {
-  const items = relations.listOffers(slug).map((r) => ({
-    id: r.offer_id || undefined,
-    type: 'Offer',
-    actor: r.role === 'guardian' ? me : r.other_uri,
-    object: {
-      type: 'Relationship',
-      subject: r.role === 'guardian' ? r.other_uri : me,
-      relationship: GUARDIAN_RELATIONSHIP_COMPACT,
-      object: r.role === 'guardian' ? me : r.other_uri,
-    },
-    'shaer:handle': r.other_handle || undefined,
-    published: r.created_at,
-  }));
+  const items = relations.listOffers(slug).map((r) => {
+    const ward = r.role === 'guardian' ? r.other_uri : me;
+    const candidate = r.role === 'guardian' ? me : r.other_uri;
+    return {
+      id: r.offer_id || `${me}/offers/pending-${r.id}`,
+      type: 'Offer',
+      actor: candidate,
+      object: {
+        type: 'Relationship',
+        subject: ward,
+        relationship: GUARDIAN_RELATIONSHIP_COMPACT,
+        object: candidate,
+      },
+      'shaer:ward': ward,
+      'shaer:candidate': candidate,
+      'shaer:existingGuardians': relations.listGuardians(slug).map((g) => g.other_uri),
+      'shaer:acceptedBy': [],
+      // Klonkt's flow is single-phase: the ward's Accept commits at once, so
+      // only the ward-side owner has an action here.
+      'shaer:needsMyAccept': r.role === 'ward',
+      'shaer:readyToCommit': false,
+      'shaer:iAmCandidate': r.role === 'guardian',
+      'shaer:handle': r.other_handle || undefined,
+      published: r.created_at,
+    };
+  });
   return collection(id, items);
 }

test/guardianship.test.js

@@ -77 +77 @@
   assert.equal(G.listOffers('kid').length, 1);
 
+  // The kid's offers queue carries the daemon-contract helper fields the
+  // Shaer clients render their accept button from.
+  const kidQ = G.offersCollection(`${KID}/queues/offers`, 'kid', KID);
+  assert.equal(kidQ.totalItems, 1);
+  assert.equal(kidQ.orderedItems[0]['shaer:needsMyAccept'], true);
+  assert.equal(kidQ.orderedItems[0]['shaer:iAmCandidate'], false);
+  assert.equal(kidQ.orderedItems[0]['shaer:ward'], KID);
+  assert.equal(kidQ.orderedItems[0]['shaer:candidate'], ME);
+
   // The kid accepts over C2S; the answer travels to the guardian.
   const r = await G.handleGuardianshipOutbox(kid, { type: 'Accept', object: offerId });