daycare-cli 2026.2.27 → 2026.2.28

package/dist/engine/modules/tools/friendRemoveToolBuild.js

@@ -1,53 +1,50 @@
 import { Type } from "@sinclair/typebox";
 import { messageBuildSystemText } from "../../messages/messageBuildSystemText.js";
 const schema = Type.Object({
-    usertag: Type.String({ minLength: 1 })
+    nametag: Type.String({ minLength: 1 })
 }, { additionalProperties: false });
 const resultSchema = Type.Object({
     summary: Type.String(),
     status: Type.String(),
-    usertag: Type.String()
+    nametag: Type.String()
 }, { additionalProperties: false });
 const returns = {
     schema: resultSchema,
     toLLMText: (result) => result.summary
 };
 /**
- * Removes, rejects, or cancels a friend relationship by usertag.
- * Expects: caller is a frontend user with a generated usertag.
+ * Removes, rejects, or cancels a friend relationship by nametag.
+ * Expects: caller is a frontend user with a generated nametag.
  */
 export function friendRemoveToolBuild() {
     return {
         tool: {
             name: "friend_remove",
-            description: "Unfriend, reject a request, or cancel a pending request by usertag.",
+            description: "Unfriend, reject a request, or cancel a pending request by nametag.",
             parameters: schema
         },
         returns,
         visibleByDefault: (context) => context.descriptor.type === "user",
         execute: async (args, toolContext, toolCall) => {
             const payload = args;
-            const targetUsertag = usertagNormalize(payload.usertag);
+            const targetNametag = nametagNormalize(payload.nametag);
             const users = toolContext.agentSystem.storage.users;
             const connections = toolContext.agentSystem.storage.connections;
             const me = await users.findById(toolContext.ctx.userId);
             if (!me) {
                 throw new Error("Current user not found.");
             }
-            const myUsertag = me.usertag?.trim() ?? "";
-            if (!myUsertag) {
-                throw new Error("Current user does not have a usertag.");
-            }
-            const target = await users.findByUsertag(targetUsertag);
+            const myNametag = me.nametag;
+            const target = await users.findByNametag(targetNametag);
             if (!target) {
-                throw new Error(`User not found for usertag: ${targetUsertag}`);
+                throw new Error(`User not found for nametag: ${targetNametag}`);
             }
             if (target.id === me.id) {
                 throw new Error("Cannot remove yourself.");
             }
             const connection = await connections.find(me.id, target.id);
             if (!connection) {
-                throw new Error(`No relationship with ${targetUsertag}.`);
+                throw new Error(`No relationship with ${targetNametag}.`);
             }
             const state = sideStateForUser(connection, me.id);
             if (target.parentUserId) {
@@ -56,62 +53,62 @@ export function friendRemoveToolBuild() {
                     await connectionDeleteIfEmpty(connections, target.id, me.id, updated);
                     const owner = await users.findById(target.parentUserId);
                     if (owner) {
-                        const origin = `friend:${myUsertag}`;
+                        const origin = `friend:${myNametag}`;
                         await toolContext.agentSystem.postToUserAgents(owner.id, {
                             type: "system_message",
                             origin,
-                            text: messageBuildSystemText(`${myUsertag} removed access to subuser "${target.name ?? target.id}" (${targetUsertag}).`, origin)
+                            text: messageBuildSystemText(`${myNametag} removed access to subuser "${target.name ?? target.id}" (${targetNametag}).`, origin)
                         });
                     }
-                    return success("removed_share", targetUsertag, toolCall);
+                    return success("removed_share", targetNametag, toolCall);
                 }
                 if (!state.myRequested && state.otherRequested) {
                     const updated = await connections.clearSide(target.id, me.id);
                     await connectionDeleteIfEmpty(connections, target.id, me.id, updated);
-                    return success("rejected_share", targetUsertag, toolCall);
+                    return success("rejected_share", targetNametag, toolCall);
                 }
                 if (state.myRequested && !state.otherRequested) {
                     const updated = await connections.clearSide(me.id, target.id);
                     await connectionDeleteIfEmpty(connections, target.id, me.id, updated);
-                    return success("canceled_share", targetUsertag, toolCall);
+                    return success("canceled_share", targetNametag, toolCall);
                 }
-                throw new Error(`No relationship with ${targetUsertag}.`);
+                throw new Error(`No relationship with ${targetNametag}.`);
             }
             if (state.myRequested && state.otherRequested) {
                 await connections.clearSide(me.id, target.id);
                 await subuserShareCleanup(connections, me.id, target.id);
-                const origin = `friend:${myUsertag}`;
+                const origin = `friend:${myNametag}`;
                 await toolContext.agentSystem.postToUserAgents(target.id, {
                     type: "system_message",
                     origin,
-                    text: messageBuildSystemText(`${myUsertag} removed you as a friend.`, origin)
+                    text: messageBuildSystemText(`${myNametag} removed you as a friend.`, origin)
                 });
-                return success("unfriended", targetUsertag, toolCall);
+                return success("unfriended", targetNametag, toolCall);
             }
             if (!state.myRequested && state.otherRequested) {
                 await connections.clearSide(target.id, me.id);
-                return success("rejected", targetUsertag, toolCall);
+                return success("rejected", targetNametag, toolCall);
             }
             if (state.myRequested && !state.otherRequested) {
                 await connections.clearSide(me.id, target.id);
-                return success("canceled", targetUsertag, toolCall);
+                return success("canceled", targetNametag, toolCall);
             }
-            throw new Error(`No relationship with ${targetUsertag}.`);
+            throw new Error(`No relationship with ${targetNametag}.`);
         }
     };
 }
-function success(status, usertag, toolCall) {
+function success(status, nametag, toolCall) {
     const summary = status === "unfriended"
-        ? `Removed ${usertag} from friends.`
+        ? `Removed ${nametag} from friends.`
         : status === "rejected"
-            ? `Rejected friend request from ${usertag}.`
+            ? `Rejected friend request from ${nametag}.`
             : status === "removed_share"
-                ? `Removed shared access to ${usertag}.`
+                ? `Removed shared access to ${nametag}.`
                 : status === "rejected_share"
-                    ? `Rejected shared subuser offer from ${usertag}.`
+                    ? `Rejected shared subuser offer from ${nametag}.`
                     : status === "canceled_share"
-                        ? `Canceled pending shared subuser access to ${usertag}.`
-                        : `Canceled pending friend request to ${usertag}.`;
+                        ? `Canceled pending shared subuser access to ${nametag}.`
+                        : `Canceled pending friend request to ${nametag}.`;
     const toolMessage = {
         role: "toolResult",
         toolCallId: toolCall.id,
@@ -125,14 +122,14 @@ function success(status, usertag, toolCall) {
         typedResult: {
             summary,
             status,
-            usertag
+            nametag
         }
     };
 }
-function usertagNormalize(value) {
+function nametagNormalize(value) {
     const normalized = value.trim().toLowerCase();
     if (!normalized) {
-        throw new Error("usertag is required.");
+        throw new Error("nametag is required.");
     }
     return normalized;
 }

package/dist/engine/modules/tools/friendRemoveToolBuild.js.map

@@ -1 +1 @@
-{"version":3,"file":"friendRemoveToolBuild.js","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendRemoveToolBuild.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACtB;IACI,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;CACzC,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAClC,CAAC;AAIF,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAC5B;IACI,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;IACtB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;IACrB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;CACzB,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAClC,CAAC;AAIF,MAAM,OAAO,GAA2C;IACpD,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO;CACxC,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,qBAAqB;IACjC,OAAO;QACH,IAAI,EAAE;YACF,IAAI,EAAE,eAAe;YACrB,WAAW,EAAE,qEAAqE;YAClF,UAAU,EAAE,MAAM;SACrB;QACD,OAAO;QACP,gBAAgB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM;QACjE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE;YAC3C,MAAM,OAAO,GAAG,IAAwB,CAAC;YACzC,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACxD,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;YACpD,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC;YAEhE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxD,IAAI,CAAC,EAAE,EAAE,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC7D,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,+BAA+B,aAAa,EAAE,CAAC,CAAC;YACpE,CAAC;YACD,IAAI,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC/C,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,aAAa,GAAG,CAAC,CAAC;YAC9D,CAAC;YAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YAClD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACtB,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC5C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC9D,MAAM,uBAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBAEtE,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBACxD,IAAI,KAAK,EAAE,CAAC;wBACR,MAAM,MAAM,GAAG,UAAU,SAAS,EAAE,CAAC;wBACrC,MAAM,WAAW,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE;4BACrD,IAAI,EAAE,gBAAgB;4BACtB,MAAM;4BACN,IAAI,EAAE,sBAAsB,CACxB,GAAG,SAAS,+BAA+B,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,MAAM,aAAa,IAAI,EAC1F,MAAM,CACT;yBACJ,CAAC,CAAC;oBACP,CAAC;oBACD,OAAO,OAAO,CAAC,eAAe,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;gBAC7D,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC7C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBAC9D,MAAM,uBAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBACtE,OAAO,OAAO,CAAC,gBAAgB,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;gBAC9D,CAAC;gBACD,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC7C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC9D,MAAM,uBAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBACtE,OAAO,OAAO,CAAC,gBAAgB,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;gBAC9D,CAAC;gBAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,aAAa,GAAG,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC5C,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC9C,MAAM,mBAAmB,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;gBACzD,MAAM,MAAM,GAAG,UAAU,SAAS,EAAE,CAAC;gBACrC,MAAM,WAAW,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,EAAE;oBACtD,IAAI,EAAE,gBAAgB;oBACtB,MAAM;oBACN,IAAI,EAAE,sBAAsB,CAAC,GAAG,SAAS,2BAA2B,EAAE,MAAM,CAAC;iBAChF,CAAC,CAAC;gBACH,OAAO,OAAO,CAAC,YAAY,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;YAC1D,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC7C,MAAM,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC9C,OAAO,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC7C,MAAM,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC9C,OAAO,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;YACxD,CAAC;YAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,aAAa,GAAG,CAAC,CAAC;QAC9D,CAAC;KACJ,CAAC;AACN,CAAC;AAED,SAAS,OAAO,CAAC,MAAoC,EAAE,OAAe,EAAE,QAAsC;IAC1G,MAAM,OAAO,GACT,MAAM,KAAK,YAAY;QACnB,CAAC,CAAC,WAAW,OAAO,gBAAgB;QACpC,CAAC,CAAC,MAAM,KAAK,UAAU;YACrB,CAAC,CAAC,gCAAgC,OAAO,GAAG;YAC5C,CAAC,CAAC,MAAM,KAAK,eAAe;gBAC1B,CAAC,CAAC,4BAA4B,OAAO,GAAG;gBACxC,CAAC,CAAC,MAAM,KAAK,gBAAgB;oBAC3B,CAAC,CAAC,sCAAsC,OAAO,GAAG;oBAClD,CAAC,CAAC,MAAM,KAAK,gBAAgB;wBAC3B,CAAC,CAAC,6CAA6C,OAAO,GAAG;wBACzD,CAAC,CAAC,sCAAsC,OAAO,GAAG,CAAC;IACnE,MAAM,WAAW,GAAsB;QACnC,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE,QAAQ,CAAC,EAAE;QACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC1C,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACxB,CAAC;IACF,OAAO;QACH,WAAW;QACX,WAAW,EAAE;YACT,OAAO;YACP,MAAM;YACN,OAAO;SACV;KACJ,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACnC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CACrB,UAIC,EACD,MAAc;IAKd,IAAI,UAAU,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;QAChC,OAAO;YACH,WAAW,EAAE,UAAU,CAAC,UAAU;YAClC,cAAc,EAAE,UAAU,CAAC,UAAU;SACxC,CAAC;IACN,CAAC;IACD,OAAO;QACH,WAAW,EAAE,UAAU,CAAC,UAAU;QAClC,cAAc,EAAE,UAAU,CAAC,UAAU;KACxC,CAAC;AACN,CAAC;AAED,KAAK,UAAU,mBAAmB,CAC9B,WAMC,EACD,QAAgB,EAChB,YAAoB;IAEpB,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC3C,WAAW,CAAC,6BAA6B,CAAC,YAAY,EAAE,QAAQ,CAAC;QACjE,WAAW,CAAC,6BAA6B,CAAC,QAAQ,EAAE,YAAY,CAAC;KACpE,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,GAAG,CACpB,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC,CAChG,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACb,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACpC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO;QACX,CAAC;QACD,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,KAAK,UAAU,uBAAuB,CAClC,WAAuE,EACvE,GAAW,EACX,GAAW,EACX,UAGQ;IAER,IAAI,CAAC,UAAU,EAAE,CAAC;QACd,OAAO;IACX,CAAC;IACD,IAAI,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QACjD,OAAO;IACX,CAAC;IACD,MAAM,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"friendRemoveToolBuild.js","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendRemoveToolBuild.ts"],"names":[],"mappings":"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"}

package/dist/engine/modules/tools/friendRemoveToolBuild.spec.js

@@ -6,13 +6,13 @@ describe("friendRemoveToolBuild", () => {
     it("unfriends and notifies the other user", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             await storage.connections.upsertRequest(alice.id, bob.id, 100);
             await storage.connections.upsertRequest(bob.id, alice.id, 200);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendRemoveToolBuild();
-            const result = await tool.execute({ usertag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ nametag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("unfriended");
             expect(postToUserAgents).toHaveBeenCalledWith(bob.id, expect.objectContaining({ type: "system_message", origin: "friend:happy-penguin-42" }));
             const state = await storage.connections.find(alice.id, bob.id);
@@ -26,12 +26,12 @@ describe("friendRemoveToolBuild", () => {
     it("rejects a pending incoming request without notification", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             await storage.connections.upsertRequest(bob.id, alice.id, 100);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendRemoveToolBuild();
-            const result = await tool.execute({ usertag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ nametag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("rejected");
             expect(postToUserAgents).not.toHaveBeenCalled();
             const state = await storage.connections.find(alice.id, bob.id);
@@ -45,12 +45,12 @@ describe("friendRemoveToolBuild", () => {
     it("cancels an outgoing pending request", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             await storage.connections.upsertRequest(alice.id, bob.id, 100);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendRemoveToolBuild();
-            const result = await tool.execute({ usertag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ nametag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("canceled");
             expect(postToUserAgents).not.toHaveBeenCalled();
             const state = await storage.connections.find(alice.id, bob.id);
@@ -64,19 +64,19 @@ describe("friendRemoveToolBuild", () => {
     it("removes an active shared subuser and notifies the owner", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const owner = await storage.users.create({ id: "owner", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const owner = await storage.users.create({ id: "owner", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             const subuser = await storage.users.create({
                 id: "owner-sub-1",
                 parentUserId: owner.id,
                 name: "helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             await storage.connections.upsertRequest(subuser.id, bob.id, 100);
             await storage.connections.upsertRequest(bob.id, subuser.id, 200);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendRemoveToolBuild();
-            const result = await tool.execute({ usertag: "cool-cat-11" }, contextBuild(bob.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ nametag: "cool-cat-11" }, contextBuild(bob.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("removed_share");
             expect(postToUserAgents).toHaveBeenCalledWith(owner.id, expect.objectContaining({ type: "system_message", origin: "friend:swift-fox-42" }));
             const state = await storage.connections.find(subuser.id, bob.id);
@@ -96,18 +96,18 @@ describe("friendRemoveToolBuild", () => {
     it("rejects an incoming shared subuser offer without notification", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const owner = await storage.users.create({ id: "owner", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const owner = await storage.users.create({ id: "owner", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             const subuser = await storage.users.create({
                 id: "owner-sub-1",
                 parentUserId: owner.id,
                 name: "helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             await storage.connections.upsertRequest(subuser.id, bob.id, 100);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendRemoveToolBuild();
-            const result = await tool.execute({ usertag: "cool-cat-11" }, contextBuild(bob.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ nametag: "cool-cat-11" }, contextBuild(bob.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("rejected_share");
             expect(postToUserAgents).not.toHaveBeenCalled();
             expect(await storage.connections.find(subuser.id, bob.id)).toBeNull();
@@ -119,19 +119,19 @@ describe("friendRemoveToolBuild", () => {
     it("cascades subuser-share cleanup when unfriending a user", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             const aliceSub = await storage.users.create({
                 id: "alice-sub-1",
                 parentUserId: alice.id,
                 name: "a-helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             const bobSub = await storage.users.create({
                 id: "bob-sub-1",
                 parentUserId: bob.id,
                 name: "b-helper",
-                usertag: "smart-owl-22"
+                nametag: "smart-owl-22"
             });
             await storage.connections.upsertRequest(alice.id, bob.id, 100);
             await storage.connections.upsertRequest(bob.id, alice.id, 200);
@@ -141,7 +141,7 @@ describe("friendRemoveToolBuild", () => {
             await storage.connections.upsertRequest(alice.id, bobSub.id, 600);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendRemoveToolBuild();
-            const result = await tool.execute({ usertag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ nametag: "swift-fox-42" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("unfriended");
             expect(await storage.connections.find(aliceSub.id, bob.id)).toBeNull();
             expect(await storage.connections.find(bobSub.id, alice.id)).toBeNull();

package/dist/engine/modules/tools/friendSendToolBuild.d.ts

@@ -1,6 +1,6 @@
 import type { ToolDefinition } from "@/types";
 /**
- * Sends a direct message to a friend by usertag.
+ * Sends a direct message to a friend by nametag.
  * Expects: caller and target are connected with both request flags set.
  */
 export declare function friendSendToolBuild(): ToolDefinition;

package/dist/engine/modules/tools/friendSendToolBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"friendSendToolBuild.d.ts","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendSendToolBuild.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,SAAS,CAAC;AA8BlE;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,cAAc,CAqFpD"}
+{"version":3,"file":"friendSendToolBuild.d.ts","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendSendToolBuild.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,SAAS,CAAC;AA8BlE;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,cAAc,CAkFpD"}

package/dist/engine/modules/tools/friendSendToolBuild.js

@@ -3,33 +3,33 @@ import { xmlEscape } from "../../../util/xmlEscape.js";
 import { contextForAgent } from "../../agents/context.js";
 import { messageBuildSystemText } from "../../messages/messageBuildSystemText.js";
 const schema = Type.Object({
-    usertag: Type.String({ minLength: 1 }),
+    nametag: Type.String({ minLength: 1 }),
     message: Type.String({ minLength: 1 })
 }, { additionalProperties: false });
 const resultSchema = Type.Object({
     summary: Type.String(),
-    usertag: Type.String()
+    nametag: Type.String()
 }, { additionalProperties: false });
 const returns = {
     schema: resultSchema,
     toLLMText: (result) => result.summary
 };
 /**
- * Sends a direct message to a friend by usertag.
+ * Sends a direct message to a friend by nametag.
  * Expects: caller and target are connected with both request flags set.
  */
 export function friendSendToolBuild() {
     return {
         tool: {
             name: "friend_send",
-            description: "Send a direct message to a friend by usertag.",
+            description: "Send a direct message to a friend by nametag.",
             parameters: schema
         },
         returns,
         visibleByDefault: (context) => context.descriptor.type === "user",
         execute: async (args, toolContext, toolCall) => {
             const payload = args;
-            const targetUsertag = usertagNormalize(payload.usertag);
+            const targetNametag = nametagNormalize(payload.nametag);
             const message = payload.message.trim();
             if (!message) {
                 throw new Error("message is required.");
@@ -40,42 +40,39 @@ export function friendSendToolBuild() {
             if (!me) {
                 throw new Error("Current user not found.");
             }
-            const myUsertag = me.usertag?.trim() ?? "";
-            if (!myUsertag) {
-                throw new Error("Current user does not have a usertag.");
-            }
-            const target = await users.findByUsertag(targetUsertag);
+            const myNametag = me.nametag;
+            const target = await users.findByNametag(targetNametag);
             if (!target) {
-                throw new Error(`User not found for usertag: ${targetUsertag}`);
+                throw new Error(`User not found for nametag: ${targetNametag}`);
             }
             if (target.id === me.id) {
                 throw new Error("Cannot send to yourself.");
             }
             const connection = await connections.find(me.id, target.id);
-            const origin = `friend:${myUsertag}`;
+            const origin = `friend:${myNametag}`;
             const item = {
                 type: "system_message",
                 origin,
-                text: messageBuildSystemText(`Message from ${myUsertag}: ${xmlEscape(message)}`, origin)
+                text: messageBuildSystemText(`Message from ${myNametag}: ${xmlEscape(message)}`, origin)
             };
             if (target.parentUserId) {
                 if (!connection || !connection.requestedA || !connection.requestedB) {
-                    throw new Error(`No active shared access to ${targetUsertag}.`);
+                    throw new Error(`No active shared access to ${targetNametag}.`);
                 }
                 const agents = await toolContext.agentSystem.storage.agents.findMany();
                 const gateway = agents.find((agent) => agent.descriptor.type === "subuser" && agent.descriptor.id === target.id);
                 if (!gateway) {
-                    throw new Error(`Gateway agent not found for shared subuser ${targetUsertag}.`);
+                    throw new Error(`Gateway agent not found for shared subuser ${targetNametag}.`);
                 }
                 await toolContext.agentSystem.post(contextForAgent({ userId: target.id, agentId: gateway.id }), { agentId: gateway.id }, item);
             }
             else {
                 if (!connection || !connection.requestedA || !connection.requestedB) {
-                    throw new Error(`You are not friends with ${targetUsertag}.`);
+                    throw new Error(`You are not friends with ${targetNametag}.`);
                 }
                 await toolContext.agentSystem.postToUserAgents(target.id, item);
             }
-            const summary = `Sent message to ${targetUsertag}.`;
+            const summary = `Sent message to ${targetNametag}.`;
             const toolMessage = {
                 role: "toolResult",
                 toolCallId: toolCall.id,
@@ -88,16 +85,16 @@ export function friendSendToolBuild() {
                 toolMessage,
                 typedResult: {
                     summary,
-                    usertag: targetUsertag
+                    nametag: targetNametag
                 }
             };
         }
     };
 }
-function usertagNormalize(value) {
+function nametagNormalize(value) {
     const normalized = value.trim().toLowerCase();
     if (!normalized) {
-        throw new Error("usertag is required.");
+        throw new Error("nametag is required.");
     }
     return normalized;
 }

package/dist/engine/modules/tools/friendSendToolBuild.js.map

@@ -1 +1 @@
-{"version":3,"file":"friendSendToolBuild.js","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendSendToolBuild.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"friendSendToolBuild.js","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendSendToolBuild.ts"],"names":[],"mappings":"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"}

package/dist/engine/modules/tools/friendSendToolBuild.spec.js

@@ -6,13 +6,13 @@ describe("friendSendToolBuild", () => {
     it("sends a friend message to the target user's frontend agents", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             await storage.connections.upsertRequest(alice.id, bob.id, 100);
             await storage.connections.upsertRequest(bob.id, alice.id, 200);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendSendToolBuild();
-            const result = await tool.execute({ usertag: "swift-fox-42", message: "Hello <friend> & crew" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ nametag: "swift-fox-42", message: "Hello <friend> & crew" }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.summary).toContain("Sent message");
             expect(postToUserAgents).toHaveBeenCalledWith(bob.id, expect.objectContaining({
                 type: "system_message",
@@ -27,10 +27,10 @@ describe("friendSendToolBuild", () => {
     it("fails when users are not friends", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             const tool = friendSendToolBuild();
-            await expect(tool.execute({ usertag: "swift-fox-42", message: "Hello" }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("You are not friends");
+            await expect(tool.execute({ nametag: "swift-fox-42", message: "Hello" }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("You are not friends");
         }
         finally {
             storage.close();
@@ -39,13 +39,13 @@ describe("friendSendToolBuild", () => {
     it("sends to a shared subuser gateway agent", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             const subuser = await storage.users.create({
                 id: "alice-sub-1",
                 parentUserId: alice.id,
                 name: "helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             await storage.agents.create({
                 id: "subuser-gateway",
@@ -65,7 +65,7 @@ describe("friendSendToolBuild", () => {
             const postToUserAgents = vi.fn(async () => undefined);
             const post = vi.fn(async () => undefined);
             const tool = friendSendToolBuild();
-            const result = await tool.execute({ usertag: "cool-cat-11", message: "Hello helper" }, contextBuild(bob.id, storage, postToUserAgents, post), toolCall);
+            const result = await tool.execute({ nametag: "cool-cat-11", message: "Hello helper" }, contextBuild(bob.id, storage, postToUserAgents, post), toolCall);
             expect(result.typedResult.summary).toContain("Sent message");
             expect(post).toHaveBeenCalledWith(expect.objectContaining({ userId: "alice-sub-1" }), { agentId: "subuser-gateway" }, expect.objectContaining({
                 type: "system_message",
@@ -81,17 +81,17 @@ describe("friendSendToolBuild", () => {
     it("fails when subuser share is not active", async () => {
         const storage = Storage.open(":memory:");
         try {
-            const alice = await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            const bob = await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            const alice = await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            const bob = await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             const subuser = await storage.users.create({
                 id: "alice-sub-1",
                 parentUserId: alice.id,
                 name: "helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             await storage.connections.upsertRequest(subuser.id, bob.id, 100);
             const tool = friendSendToolBuild();
-            await expect(tool.execute({ usertag: "cool-cat-11", message: "Hello" }, contextBuild(bob.id, storage, vi.fn(async () => undefined), vi.fn(async () => undefined)), toolCall)).rejects.toThrow("No active shared access");
+            await expect(tool.execute({ nametag: "cool-cat-11", message: "Hello" }, contextBuild(bob.id, storage, vi.fn(async () => undefined), vi.fn(async () => undefined)), toolCall)).rejects.toThrow("No active shared access");
         }
         finally {
             storage.close();

package/dist/engine/modules/tools/friendShareSubuserToolBuild.d.ts

@@ -1,7 +1,7 @@
 import type { ToolDefinition } from "@/types";
 /**
  * Shares one of the caller-owned subusers with an existing friend.
- * Expects: caller owns subuserId and caller is already friends with friendUsertag.
+ * Expects: caller owns subuserId and caller is already friends with friendNametag.
  */
 export declare function friendShareSubuserToolBuild(): ToolDefinition;
 //# sourceMappingURL=friendShareSubuserToolBuild.d.ts.map

package/dist/engine/modules/tools/friendShareSubuserToolBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"friendShareSubuserToolBuild.d.ts","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendShareSubuserToolBuild.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,SAAS,CAAC;AA+BlE;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,cAAc,CAsG5D"}
+{"version":3,"file":"friendShareSubuserToolBuild.d.ts","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/friendShareSubuserToolBuild.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,SAAS,CAAC;AA+BlE;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,cAAc,CAgG5D"}