@ouro.bot/cli 0.1.0-alpha.670 → 0.1.0-alpha.671

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.671",
+      "changes": [
+        "Consolidate friend-domain record logic into @ouro.bot/friends: re-pin the git dependency and route save_friend_note, the friend update/link/unlink CLI commands, and A2A peer onboarding through the package's applyFriendNote/setFriendTrust/linkExternalId/unlinkExternalId/upsertAgentPeer helpers, removing the duplicated in-harness record-mutation logic while keeping the MCP tool wrappers, CLI framing, and A2A HTTP card-fetch glue."
+      ]
+    },
     {
       "version": "0.1.0-alpha.670",
       "changes": [

package/dist/a2a/onboarding.js

@@ -34,7 +34,6 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onboardA2APeer = onboardA2APeer;
-const node_crypto_1 = require("node:crypto");
 const path = __importStar(require("node:path"));
 const identity_1 = require("../heart/identity");
 const runtime_1 = require("../nerves/runtime");
@@ -52,60 +51,33 @@ function agentIdFor(_card, cardUrl) {
     return parsed.toString();
 }
 async function onboardA2APeer(options) {
+    // HTTP/URL glue stays harness-side: fetch the agent card, resolve its JSON-RPC
+    // endpoint, and derive the stable agentId. The record-shaping (mint/update the
+    // agent-peer friend) is delegated to @ouro.bot/friends' upsertAgentPeer.
     const card = await (0, client_1.fetchA2AAgentCard)(options.cardUrl, options.fetchImpl);
     const store = storeFor(options);
-    const now = new Date().toISOString();
     const externalId = agentIdFor(card, options.cardUrl);
     /* v8 ignore next -- fetchA2AAgentCard validates a usable endpoint or legacy url before returning a card @preserve */
     const endpointUrl = (0, client_1.endpointForCard)(card) ?? options.cardUrl;
     const protocolVersion = card.supportedInterfaces?.find((entry) => entry.url === endpointUrl)?.protocolVersion
         ?? card.protocolVersion;
-    const existing = await store.findByExternalId("a2a-agent", externalId);
     const name = options.name ?? card.name;
-    const trustLevel = options.trustLevel ?? existing?.trustLevel ?? "acquaintance";
-    const baseMeta = existing?.agentMeta ?? {
-        bundleName: name,
-        familiarity: 0,
-        sharedMissions: [],
-        outcomes: [],
-    };
-    const record = {
-        ...(existing ?? {
-            id: (0, node_crypto_1.randomUUID)(),
-            createdAt: now,
-            externalIds: [],
-            tenantMemberships: [],
-            toolPreferences: {},
-            notes: {},
-            totalTokens: 0,
-            schemaVersion: 1,
-        }),
+    const record = await (0, friends_1.upsertAgentPeer)(store, {
         name,
-        role: "agent-peer",
-        trustLevel,
-        kind: "agent",
-        agentMeta: {
-            ...baseMeta,
-            bundleName: baseMeta.bundleName || name,
-            a2a: {
-                cardUrl: options.cardUrl,
-                endpointUrl,
-                agentId: externalId,
-                protocolVersion,
-            },
+        agentId: externalId,
+        ...(options.trustLevel ? { trustLevel: options.trustLevel } : {}),
+        a2a: {
+            cardUrl: options.cardUrl,
+            endpointUrl,
+            agentId: externalId,
+            protocolVersion,
         },
-        externalIds: [
-            ...(existing?.externalIds.filter((id) => !(id.provider === "a2a-agent" && id.externalId === externalId)) ?? []),
-            { provider: "a2a-agent", externalId, linkedAt: now },
-        ],
-        updatedAt: now,
-    };
-    await store.put(record.id, record);
+    });
     (0, runtime_1.emitNervesEvent)({
         component: "friends",
         event: "friends.a2a_peer_onboarded",
         message: "onboarded A2A peer into friend model",
-        meta: { agentName: options.agentName, friendId: record.id, peerName: record.name, trustLevel },
+        meta: { agentName: options.agentName, friendId: record.id, peerName: record.name, trustLevel: record.trustLevel },
     });
     return record;
 }

package/dist/heart/daemon/cli-exec.js

@@ -5419,14 +5419,6 @@ async function performSystemSetup(deps) {
     await registerOuroBundleTypeNonBlocking(deps);
 }
 // ── Friend command execution ──
-const TRUST_RANK = { family: 4, friend: 3, acquaintance: 2, stranger: 1 };
-/* v8 ignore start -- defensive: ?? fallbacks are unreachable when inputs are valid TrustLevel values @preserve */
-function higherTrust(a, b) {
-    const rankA = TRUST_RANK[a ?? "stranger"] ?? 1;
-    const rankB = TRUST_RANK[b ?? "stranger"] ?? 1;
-    return rankA >= rankB ? (a ?? "stranger") : (b ?? "stranger");
-}
-/* v8 ignore stop */
 async function executeFriendCommand(command, store) {
     if (command.kind === "friend.list") {
         const listAll = store.listAll;
@@ -5467,65 +5459,32 @@ async function executeFriendCommand(command, store) {
         return `created: ${id} (${command.name}, ${trustLevel})`;
     }
     if (command.kind === "friend.update") {
-        const current = await store.get(command.friendId);
-        if (!current)
+        const result = await (0, friends_1.setFriendTrust)(store, command.friendId, command.trustLevel);
+        if (result.status === "not_found")
             return `friend not found: ${command.friendId}`;
-        const now = new Date().toISOString();
-        await store.put(command.friendId, {
-            ...current,
-            trustLevel: command.trustLevel,
-            role: command.trustLevel,
-            updatedAt: now,
-        });
         return `updated: ${command.friendId} → trust=${command.trustLevel}`;
     }
     if (command.kind === "friend.link") {
-        const current = await store.get(command.friendId);
-        if (!current)
+        const result = await (0, friends_1.linkExternalId)(store, command.friendId, {
+            provider: command.provider,
+            externalId: command.externalId,
+        });
+        if (result.status === "not_found")
             return `friend not found: ${command.friendId}`;
-        const alreadyLinked = current.externalIds.some((ext) => ext.provider === command.provider && ext.externalId === command.externalId);
-        if (alreadyLinked)
+        if (result.status === "noop")
             return `identity already linked: ${command.provider}:${command.externalId}`;
-        const now = new Date().toISOString();
-        const newExternalIds = [
-            ...current.externalIds,
-            { provider: command.provider, externalId: command.externalId, linkedAt: now },
-        ];
-        // Orphan cleanup: check if another friend has this externalId
-        const orphan = await store.findByExternalId(command.provider, command.externalId);
-        let mergeMessage = "";
-        let mergedNotes = { ...current.notes };
-        let mergedTrust = current.trustLevel;
-        let orphanExternalIds = [];
-        if (orphan && orphan.id !== command.friendId) {
-            // Merge orphan's notes (target's notes take priority)
-            mergedNotes = { ...orphan.notes, ...current.notes };
-            // Keep higher trust level
-            mergedTrust = higherTrust(current.trustLevel, orphan.trustLevel);
-            // Collect orphan's other externalIds (excluding the one being linked)
-            orphanExternalIds = orphan.externalIds.filter((ext) => !(ext.provider === command.provider && ext.externalId === command.externalId));
-            await store.delete(orphan.id);
-            mergeMessage = ` (merged orphan ${orphan.id})`;
-        }
-        await store.put(command.friendId, {
-            ...current,
-            externalIds: [...newExternalIds, ...orphanExternalIds],
-            notes: mergedNotes,
-            trustLevel: mergedTrust,
-            updatedAt: now,
-        });
+        const mergeMessage = result.status === "merged" ? " (merged orphan)" : "";
         return `linked ${command.provider}:${command.externalId} to ${command.friendId}${mergeMessage}`;
     }
     // command.kind === "friend.unlink"
-    const current = await store.get(command.friendId);
-    if (!current)
+    const result = await (0, friends_1.unlinkExternalId)(store, command.friendId, {
+        provider: command.provider,
+        externalId: command.externalId,
+    });
+    if (result.status === "not_found")
         return `friend not found: ${command.friendId}`;
-    const idx = current.externalIds.findIndex((ext) => ext.provider === command.provider && ext.externalId === command.externalId);
-    if (idx === -1)
+    if (result.status === "noop")
         return `identity not linked: ${command.provider}:${command.externalId}`;
-    const now = new Date().toISOString();
-    const filtered = current.externalIds.filter((_, i) => i !== idx);
-    await store.put(command.friendId, { ...current, externalIds: filtered, updatedAt: now });
     return `unlinked ${command.provider}:${command.externalId} from ${command.friendId}`;
 }
 async function executeA2ACommand(command, deps) {

package/dist/repertoire/tools-notes.js

@@ -40,6 +40,7 @@ const skills_1 = require("./skills");
 const config_1 = require("../heart/config");
 const runtime_1 = require("../nerves/runtime");
 const identity_1 = require("../heart/identity");
+const friends_1 = require("@ouro.bot/friends");
 const diary_1 = require("../mind/diary");
 const record_paths_1 = require("../mind/record-paths");
 const provenance_trust_1 = require("../mind/provenance-trust");
@@ -414,7 +415,8 @@ exports.notesToolDefinitions = [
             const friendId = ctx.context.friend?.id;
             if (!friendId)
                 return "i can't save notes -- no friend identity available";
-            // Validate parameters
+            // Validate parameters (input-shape guards stay harness-side so we keep the
+            // first-person tool wording; applyFriendNote does the record mutation).
             if (!a.content)
                 return "i need a content value to save";
             const validTypes = ["name", "tool_preference", "note"];
@@ -422,44 +424,33 @@ exports.notesToolDefinitions = [
                 return `i don't recognize type '${a.type}' -- use name, tool_preference, or note`;
             if ((a.type === "tool_preference" || a.type === "note") && !a.key)
                 return "i need a key for tool_preference or note type";
-            try {
-                // Read fresh record from disk
-                const record = await ctx.friendStore.get(friendId);
-                if (!record)
-                    return "i can't find the friend record on disk";
-                const isOverride = a.override === "true";
-                if (a.type === "name") {
-                    const updated = { ...record, name: a.content, updatedAt: new Date().toISOString() };
-                    await ctx.friendStore.put(friendId, updated);
-                    return `saved: name = ${a.content}`;
-                }
-                if (a.type === "tool_preference") {
-                    const existing = record.toolPreferences[a.key];
-                    if (existing && !isOverride) {
-                        return `i already have a preference for '${a.key}': "${existing}". if you want to replace it, call again with override: true. or merge both values into content and override.`;
-                    }
-                    const updated = { ...record, toolPreferences: { ...record.toolPreferences, [a.key]: a.content }, updatedAt: new Date().toISOString() };
-                    await ctx.friendStore.put(friendId, updated);
-                    return `saved: toolPreference ${a.key} = ${a.content}`;
-                }
-                // type === "note"
-                // Redirect "name" key to name field
-                if (a.key === "name") {
-                    const updated = { ...record, name: a.content, updatedAt: new Date().toISOString() };
-                    await ctx.friendStore.put(friendId, updated);
+            // Record-domain logic lives in @ouro.bot/friends; this wrapper maps the
+            // structured FriendOpResult back to the tool's first-person strings.
+            const result = await (0, friends_1.applyFriendNote)(ctx.friendStore, friendId, {
+                type: a.type,
+                ...(a.key !== undefined ? { key: a.key } : {}),
+                content: a.content,
+                override: a.override === "true",
+            });
+            switch (result.status) {
+                case "saved":
+                    if (a.type === "name")
+                        return `saved: name = ${a.content}`;
+                    if (a.type === "tool_preference")
+                        return `saved: toolPreference ${a.key} = ${a.content}`;
+                    return `saved: note ${a.key} = ${a.content}`;
+                case "redirected_to_name":
                     return `updated friend's name to '${a.content}' (stored as name, not a note)`;
-                }
-                const existing = record.notes[a.key];
-                if (existing && !isOverride) {
-                    return `i already have a note for '${a.key}': "${existing.value}". if you want to replace it, call again with override: true. or merge both values into content and override.`;
-                }
-                const updated = { ...record, notes: { ...record.notes, [a.key]: { value: a.content, savedAt: new Date().toISOString() } }, updatedAt: new Date().toISOString() };
-                await ctx.friendStore.put(friendId, updated);
-                return `saved: note ${a.key} = ${a.content}`;
-            }
-            catch (err) {
-                /* v8 ignore next -- defensive: non-Error branch for String(err) @preserve */
-                return `error saving note: ${err instanceof Error ? err.message : String(err)}`;
+                case "override_required":
+                    // result.message embeds the existing value; append the harness merge instruction.
+                    return `${result.message}. if you want to replace it, call again with override: true. or merge both values into content and override.`;
+                case "not_found":
+                    return "i can't find the friend record on disk";
+                /* v8 ignore next 2 -- invalid is pre-empted by the harness validation above; kept for exhaustiveness @preserve */
+                case "invalid":
+                    return result.message ?? "i can't save that note";
+                default:
+                    return `error saving note: ${result.message}`;
             }
         },
         summaryKeys: ["type", "key", "content"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.670",
+  "version": "0.1.0-alpha.671",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.78.0",
-    "@ouro.bot/friends": "git+https://github.com/ourostack/friends.git#0095316eed6876a27f36a26ddc47ad9da800a652",
+    "@ouro.bot/friends": "git+https://github.com/ourostack/friends.git#250d1a4bbbad5cd50687975afc463e60e3ff8366",
     "@azure/identity": "^4.13.0",
     "@azure/storage-blob": "^12.31.0",
     "@microsoft/teams.api": "2.0.11",