Changeset 3ffbedd in Klonkt

Timestamp:

07/24/2026 08:28:15 PM (7 weeks ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

fcd6964

Parents:

c502242

Message:

Guardianship: eerste guardian committeert op de enkele ward-accept

Het offer ís de instemming van de kandidaat. Een vrij account mag in één keer
een guardian aannemen: er is nog geen tweede guardian om mee te akkoorderen.
Pas als het een ward is, treedt de co-approval in werking.

Concreet: de kandidaat-accept wordt nu impliciet vastgelegd bij het offer, op
elke kopie (C2S bij het versturen, S2S bij ontvangst). Zo committeert de eerste
guardian zodra de ward accepteert; een tweede guardian erbij vereist nog steeds
dat een bestaande guardian mee-accepteert (§3.1.2). Geen aparte "voltooien"-stap
voor de kandidaat meer.

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

• Offer legt de kandidaat-accept vast (C2S + S2S)

test/guardianship.test.js

• eerste guardian: commit op enkele ward-accept; tweede: co-approval

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

Files:

• src/services/guardianship/handshake.js (modified) (2 diffs)
• test/guardianship.test.js (modified) (3 diffs)

src/services/guardianship/handshake.js

@@ -107 +107 @@
       wardHandle: deps.deriveHandle(rel.ward), candidateHandle: deps.deriveHandle(me),
     });
+    // The Offer IS the candidate's agreement to serve: record it as the
+    // candidate's accept. So a FREE ward commits on its own single accept (no
+    // second guardian to co-approve yet); once it IS a ward, adding another
+    // guardian still needs an existing guardian to co-accept.
+    offers.recordAccept(site.slug, offerId, me);
     // Addressed to the ward AND every existing guardian (§3.1.1).
     const recipients = [rel.ward, ...existing];
@@ -159 +164 @@
       wardHandle: deps.deriveHandle(rel.ward), candidateHandle: deps.deriveHandle(rel.candidate),
     });
+    // The Offer carries the candidate's agreement (see the C2S side): record it
+    // so this copy's tally matches — a free ward then commits on its own accept.
+    offers.recordAccept(site.slug, idOf(activity), rel.candidate);
     notify(site.slug, { kind: rel.ward === me ? 'offer_received' : 'offer_for_ward', ward: rel.ward, candidate: rel.candidate });
     return true;

test/guardianship.test.js

@@ -43 +43 @@
 const offerIdFrom = (r) => r.id;
 
-test('first guardian: candidate offers, ward accepts, candidate completes', async () => {
+test('first guardian: a free ward commits on its own single accept', async () => {
   const off = await G.handleGuardianshipOutbox(parent, {
     type: 'Offer', object: { type: 'Relationship', subject: KID, relationship: 'shaer:Guardian', object: ME },
@@ -50 +50 @@
   const id = offerIdFrom(off);
 
-  // The kid sees the offer and it needs its accept.
+  // The kid sees the offer needing its accept; the candidate already agreed
+  // (the Offer is the candidate's accept), so it just waits.
   const kidQ = G.offersCollection(`${KID}/queues/offers`, 'kid', KID).orderedItems;
   assert.equal(kidQ.length, 1);
   assert.equal(kidQ[0]['shaer:needsMyAccept'], true);
-  assert.equal(kidQ[0]['shaer:iAmCandidate'], false);
+  assert.deepEqual(kidQ[0]['shaer:acceptedBy'], [ME]);       // candidate accepted via the offer
+  const parentQ0 = G.offersCollection(`${ME}/queues/offers`, 'parent', ME).orderedItems;
+  assert.equal(parentQ0[0]['shaer:needsMyAccept'], false);   // candidate already agreed
 
-  // Not committed on a lone candidate — the ward has not accepted.
+  // Not committed until the ward agrees.
   assert.deepEqual(G.listGuardians('kid'), []);
 
-  // The kid accepts (C2S from the kid's own Klonkt). Not committed yet: the
-  // candidate must still agree to serve (§3.1.2).
-  await G.handleGuardianshipOutbox(kid, { type: 'Accept', object: id });
-  assert.deepEqual(G.listGuardians('kid'), []);
-  const parentQ = G.offersCollection(`${ME}/queues/offers`, 'parent', ME).orderedItems;
-  assert.equal(parentQ[0]['shaer:iAmCandidate'], true);
-  assert.equal(parentQ[0]['shaer:needsMyAccept'], true);   // candidate has not accepted
-
-  // The candidate accepts → tally complete → commit everywhere.
-  const done = await G.handleGuardianshipOutbox(parent, { type: 'Accept', object: id });
+  // The kid accepts → free ward, no existing guardian to co-approve → commit.
+  const done = await G.handleGuardianshipOutbox(kid, { type: 'Accept', object: id });
   assert.equal(done.committed, true);
   assert.deepEqual(G.listGuardians('kid').map((g) => g.other_uri), [ME]);
@@ -91 +86 @@
   assert.deepEqual(parentQ['shaer:existingGuardians'], [ME]);
 
-  // Kid accepts, then gran (candidate) accepts — still NOT committed, because
-  // the existing guardian (parent) has not co-accepted (§3.1.2).
-  await G.handleGuardianshipOutbox(kid, { type: 'Accept', object: id });
-  const early = await G.handleGuardianshipOutbox(gran, { type: 'Accept', object: id });
+  // The kid accepts, but now it IS a ward: NOT committed, because the existing
+  // guardian (parent) has not co-accepted (§3.1.2). The candidate (gran) already
+  // agreed via the offer, so no separate gran accept is needed.
+  const early = await G.handleGuardianshipOutbox(kid, { type: 'Accept', object: id });
   assert.equal(early.committed, false);
   assert.equal(G.listGuardians('kid').length, 1, 'still just the first guardian');