daycare-cli 2026.2.27 → 2026.2.28

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

@@ -1,15 +1,15 @@
 import { Type } from "@sinclair/typebox";
 import { messageBuildSystemText } from "../../messages/messageBuildSystemText.js";
 const schema = Type.Object({
-    friendUsertag: Type.String({ minLength: 1 }),
+    friendNametag: Type.String({ minLength: 1 }),
     subuserId: Type.String({ minLength: 1 })
 }, { additionalProperties: false });
 const resultSchema = Type.Object({
     summary: Type.String(),
     status: Type.String(),
-    friendUsertag: Type.String(),
+    friendNametag: Type.String(),
     subuserId: Type.String(),
-    subuserUsertag: Type.String()
+    subuserNametag: Type.String()
 }, { additionalProperties: false });
 const returns = {
     schema: resultSchema,
@@ -17,20 +17,20 @@ const returns = {
 };
 /**
  * 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 function friendShareSubuserToolBuild() {
     return {
         tool: {
             name: "friend_share_subuser",
-            description: "Share one of your subusers with a friend by usertag.",
+            description: "Share one of your subusers with a friend by nametag.",
             parameters: schema
         },
         returns,
         visibleByDefault: (context) => context.descriptor.type !== "subuser",
         execute: async (args, toolContext, toolCall) => {
             const payload = args;
-            const targetUsertag = usertagNormalize(payload.friendUsertag);
+            const targetNametag = nametagNormalize(payload.friendNametag);
             const subuserId = payload.subuserId.trim();
             if (!subuserId) {
                 throw new Error("subuserId is required.");
@@ -41,13 +41,10 @@ export function friendShareSubuserToolBuild() {
             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 friend = await users.findByUsertag(targetUsertag);
+            const myNametag = me.nametag;
+            const friend = await users.findByNametag(targetNametag);
             if (!friend) {
-                throw new Error(`User not found for usertag: ${targetUsertag}`);
+                throw new Error(`User not found for nametag: ${targetNametag}`);
             }
             if (friend.id === me.id) {
                 throw new Error("Cannot share a subuser with yourself.");
@@ -62,31 +59,28 @@ export function friendShareSubuserToolBuild() {
             if (subuser.parentUserId !== me.id) {
                 throw new Error("Subuser does not belong to the calling user.");
             }
-            const subuserUsertag = subuser.usertag?.trim() ?? "";
-            if (!subuserUsertag) {
-                throw new Error("Subuser does not have a usertag.");
-            }
+            const subuserNametag = subuser.nametag;
             const friendship = await connections.find(me.id, friend.id);
             if (!friendship || !friendship.requestedA || !friendship.requestedB) {
-                throw new Error(`You are not friends with ${targetUsertag}.`);
+                throw new Error(`You are not friends with ${targetNametag}.`);
             }
             const existingShare = await connections.find(subuser.id, friend.id);
             if (existingShare?.requestedA && existingShare.requestedB) {
-                throw new Error(`Subuser ${subuserId} is already shared with ${targetUsertag}.`);
+                throw new Error(`Subuser ${subuserId} is already shared with ${targetNametag}.`);
             }
             const shareSideState = sideStateForUser(existingShare, subuser.id);
             if (shareSideState.myRequested && !shareSideState.otherRequested) {
-                throw new Error(`A share request for subuser ${subuserId} is already pending with ${targetUsertag}.`);
+                throw new Error(`A share request for subuser ${subuserId} is already pending with ${targetNametag}.`);
             }
             await connections.upsertRequest(subuser.id, friend.id, Date.now());
-            const origin = `friend:${myUsertag}`;
+            const origin = `friend:${myNametag}`;
             const subuserName = subuser.name ?? subuser.id;
             await toolContext.agentSystem.postToUserAgents(friend.id, {
                 type: "system_message",
                 origin,
-                text: messageBuildSystemText(`${myUsertag} shared subuser "${subuserName}" (${subuserUsertag}) with you. Use friend_add("${subuserUsertag}") to accept.`, origin)
+                text: messageBuildSystemText(`${myNametag} shared subuser "${subuserName}" (${subuserNametag}) with you. Use friend_add("${subuserNametag}") to accept.`, origin)
             });
-            const summary = `Shared subuser ${subuserId} with ${targetUsertag}.`;
+            const summary = `Shared subuser ${subuserId} with ${targetNametag}.`;
             const toolMessage = {
                 role: "toolResult",
                 toolCallId: toolCall.id,
@@ -100,18 +94,18 @@ export function friendShareSubuserToolBuild() {
                 typedResult: {
                     summary,
                     status: "offered",
-                    friendUsertag: targetUsertag,
+                    friendNametag: targetNametag,
                     subuserId,
-                    subuserUsertag
+                    subuserNametag
                 }
             };
         }
     };
 }
-function usertagNormalize(value) {
+function nametagNormalize(value) {
     const normalized = value.trim().toLowerCase();
     if (!normalized) {
-        throw new Error("friendUsertag is required.");
+        throw new Error("friendNametag is required.");
     }
     return normalized;
 }

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

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

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

@@ -6,20 +6,20 @@ describe("friendShareSubuserToolBuild", () => {
     it("shares a subuser with an existing friend", 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" });
-            await storage.users.create({ id: "charlie", usertag: "brave-eagle-77" });
+            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.users.create({ id: "charlie", nametag: "brave-eagle-77" });
             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(alice.id, bob.id, 100);
             await storage.connections.upsertRequest(bob.id, alice.id, 200);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendShareSubuserToolBuild();
-            const result = await tool.execute({ friendUsertag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ friendNametag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("offered");
             expect(postToUserAgents).toHaveBeenCalledWith(bob.id, expect.objectContaining({
                 type: "system_message",
@@ -39,16 +39,16 @@ describe("friendShareSubuserToolBuild", () => {
     it("fails when owner and friend are not connected", 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 subuser = await storage.users.create({
                 id: "alice-sub-1",
                 parentUserId: alice.id,
                 name: "helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             const tool = friendShareSubuserToolBuild();
-            await expect(tool.execute({ friendUsertag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("You are not friends");
+            await expect(tool.execute({ friendNametag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("You are not friends");
         }
         finally {
             storage.close();
@@ -57,19 +57,19 @@ describe("friendShareSubuserToolBuild", () => {
     it("fails when caller does not own the subuser", 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" });
-            await storage.users.create({ id: "charlie", usertag: "brave-eagle-77" });
+            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.users.create({ id: "charlie", nametag: "brave-eagle-77" });
             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(alice.id, bob.id, 100);
             await storage.connections.upsertRequest(bob.id, alice.id, 200);
             const tool = friendShareSubuserToolBuild();
-            await expect(tool.execute({ friendUsertag: "brave-eagle-77", subuserId: subuser.id }, contextBuild(bob.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("Subuser does not belong to the calling user.");
+            await expect(tool.execute({ friendNametag: "brave-eagle-77", subuserId: subuser.id }, contextBuild(bob.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("Subuser does not belong to the calling user.");
         }
         finally {
             storage.close();
@@ -78,20 +78,20 @@ describe("friendShareSubuserToolBuild", () => {
     it("fails when share is already 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(alice.id, bob.id, 100);
             await storage.connections.upsertRequest(bob.id, alice.id, 200);
             await storage.connections.upsertRequest(subuser.id, bob.id, 300);
             await storage.connections.upsertRequest(bob.id, subuser.id, 400);
             const tool = friendShareSubuserToolBuild();
-            await expect(tool.execute({ friendUsertag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("already shared");
+            await expect(tool.execute({ friendNametag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("already shared");
         }
         finally {
             storage.close();

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

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

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

@@ -1,13 +1,13 @@
 import { Type } from "@sinclair/typebox";
 import { messageBuildSystemText } from "../../messages/messageBuildSystemText.js";
 const schema = Type.Object({
-    friendUsertag: Type.String({ minLength: 1 }),
+    friendNametag: Type.String({ minLength: 1 }),
     subuserId: Type.String({ minLength: 1 })
 }, { additionalProperties: false });
 const resultSchema = Type.Object({
     summary: Type.String(),
     status: Type.String(),
-    friendUsertag: Type.String(),
+    friendNametag: Type.String(),
     subuserId: Type.String()
 }, { additionalProperties: false });
 const returns = {
@@ -22,14 +22,14 @@ export function friendUnshareSubuserToolBuild() {
     return {
         tool: {
             name: "friend_unshare_subuser",
-            description: "Revoke a subuser share from a friend by usertag.",
+            description: "Revoke a subuser share from a friend by nametag.",
             parameters: schema
         },
         returns,
         visibleByDefault: (context) => context.descriptor.type !== "subuser",
         execute: async (args, toolContext, toolCall) => {
             const payload = args;
-            const targetUsertag = usertagNormalize(payload.friendUsertag);
+            const targetNametag = nametagNormalize(payload.friendNametag);
             const subuserId = payload.subuserId.trim();
             if (!subuserId) {
                 throw new Error("subuserId is required.");
@@ -40,13 +40,10 @@ export function friendUnshareSubuserToolBuild() {
             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 friend = await users.findByUsertag(targetUsertag);
+            const myNametag = me.nametag;
+            const friend = await users.findByNametag(targetNametag);
             if (!friend) {
-                throw new Error(`User not found for usertag: ${targetUsertag}`);
+                throw new Error(`User not found for nametag: ${targetNametag}`);
             }
             const subuser = await users.findById(subuserId);
             if (!subuser) {
@@ -57,25 +54,25 @@ export function friendUnshareSubuserToolBuild() {
             }
             const existing = await connections.find(subuser.id, friend.id);
             if (!existing) {
-                throw new Error(`No share exists for subuser ${subuserId} and ${targetUsertag}.`);
+                throw new Error(`No share exists for subuser ${subuserId} and ${targetNametag}.`);
             }
             const state = sideStateForUser(existing, subuser.id);
             if (!state.myRequested) {
-                throw new Error(`No share exists for subuser ${subuserId} and ${targetUsertag}.`);
+                throw new Error(`No share exists for subuser ${subuserId} and ${targetNametag}.`);
             }
             const updated = await connections.clearSide(subuser.id, friend.id);
             if (updated && !updated.requestedA && !updated.requestedB) {
                 await connections.delete(subuser.id, friend.id);
             }
-            const origin = `friend:${myUsertag}`;
+            const origin = `friend:${myNametag}`;
             const subuserName = subuser.name ?? subuser.id;
-            const subuserUsertag = subuser.usertag?.trim() ?? "unknown";
+            const subuserNametag = subuser.nametag;
             await toolContext.agentSystem.postToUserAgents(friend.id, {
                 type: "system_message",
                 origin,
-                text: messageBuildSystemText(`${myUsertag} revoked your access to subuser "${subuserName}" (${subuserUsertag}).`, origin)
+                text: messageBuildSystemText(`${myNametag} revoked your access to subuser "${subuserName}" (${subuserNametag}).`, origin)
             });
-            const summary = `Revoked subuser ${subuserId} share from ${targetUsertag}.`;
+            const summary = `Revoked subuser ${subuserId} share from ${targetNametag}.`;
             const toolMessage = {
                 role: "toolResult",
                 toolCallId: toolCall.id,
@@ -89,17 +86,17 @@ export function friendUnshareSubuserToolBuild() {
                 typedResult: {
                     summary,
                     status: "revoked",
-                    friendUsertag: targetUsertag,
+                    friendNametag: targetNametag,
                     subuserId
                 }
             };
         }
     };
 }
-function usertagNormalize(value) {
+function nametagNormalize(value) {
     const normalized = value.trim().toLowerCase();
     if (!normalized) {
-        throw new Error("friendUsertag is required.");
+        throw new Error("friendNametag is required.");
     }
     return normalized;
 }

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

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

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

@@ -6,19 +6,19 @@ describe("friendUnshareSubuserToolBuild", () => {
     it("revokes an active share and notifies the friend", 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);
             await storage.connections.upsertRequest(bob.id, subuser.id, 200);
             const postToUserAgents = vi.fn(async () => undefined);
             const tool = friendUnshareSubuserToolBuild();
-            const result = await tool.execute({ friendUsertag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ friendNametag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("revoked");
             expect(postToUserAgents).toHaveBeenCalledWith(bob.id, expect.objectContaining({
                 type: "system_message",
@@ -37,18 +37,18 @@ describe("friendUnshareSubuserToolBuild", () => {
     it("revokes a pending share offer and removes the empty row", 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 postToUserAgents = vi.fn(async () => undefined);
             const tool = friendUnshareSubuserToolBuild();
-            const result = await tool.execute({ friendUsertag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
+            const result = await tool.execute({ friendNametag: "swift-fox-42", subuserId: subuser.id }, contextBuild(alice.id, storage, postToUserAgents), toolCall);
             expect(result.typedResult.status).toBe("revoked");
             expect(await storage.connections.find(subuser.id, bob.id)).toBeNull();
             expect(postToUserAgents).toHaveBeenCalledWith(bob.id, expect.objectContaining({
@@ -63,16 +63,16 @@ describe("friendUnshareSubuserToolBuild", () => {
     it("fails when no share exists", 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" });
             await storage.users.create({
                 id: "alice-sub-1",
                 parentUserId: alice.id,
                 name: "helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             const tool = friendUnshareSubuserToolBuild();
-            await expect(tool.execute({ friendUsertag: "swift-fox-42", subuserId: "alice-sub-1" }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("No share exists");
+            await expect(tool.execute({ friendNametag: "swift-fox-42", subuserId: "alice-sub-1" }, contextBuild(alice.id, storage, vi.fn(async () => undefined)), toolCall)).rejects.toThrow("No share exists");
         }
         finally {
             storage.close();

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

@@ -270,8 +270,8 @@ async function listFriendLinesBuild(callerUserId, storage, agents) {
     })))
         .filter((entry) => !!entry)
         .sort((left, right) => {
-        const leftTag = left.usertag ?? left.id;
-        const rightTag = right.usertag ?? right.id;
+        const leftTag = left.nametag;
+        const rightTag = right.nametag;
         return leftTag.localeCompare(rightTag);
     });
     if (friendUsers.length === 0) {
@@ -286,7 +286,7 @@ async function listFriendLinesBuild(callerUserId, storage, agents) {
     const lines = [];
     for (let i = 0; i < friendUsers.length; i += 1) {
         const friend = friendUsers[i];
-        const friendTag = friend.usertag ?? friend.id;
+        const friendTag = friend.nametag;
         lines.push(friendTag);
         const [outgoing, incoming] = await Promise.all([
             storage.connections.findConnectionsWithSubusersOf(friend.id, callerUserId),
@@ -337,12 +337,12 @@ async function sharedSubuserLinesBuild(options) {
         }
         options.userCache.set(subuserId, subuser);
         const subuserName = subuser.name ?? subuser.id;
-        const subuserTag = subuser.usertag ?? "none";
+        const subuserTag = subuser.nametag;
         const gateway = options.gatewayBySubuserId.get(subuserId) ?? "none";
         const status = connection.requestedA && connection.requestedB ? "active" : "pending";
         const arrow = options.direction === "out" ? "→" : "←";
         const relation = options.direction === "out" ? "shared out" : "shared in";
-        lines.push(`  ${arrow} ${relation}: ${subuserName} (usertag=${subuserTag}) gateway=${gateway} status=${status}`);
+        lines.push(`  ${arrow} ${relation}: ${subuserName} (nametag=${subuserTag}) gateway=${gateway} status=${status}`);
     }
     return lines;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"topologyToolBuild.js","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/topologyToolBuild.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"topologyToolBuild.js","sourceRoot":"","sources":["../../../../sources/engine/modules/tools/topologyToolBuild.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAMhF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,CAAC;AAEhE,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CACpC;IACI,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;IACtB,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE;IACzB,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;IACxB,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE;IAC7B,uBAAuB,EAAE,IAAI,CAAC,MAAM,EAAE;IACtC,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE;IAC3B,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE;IAC1B,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE;CAC7B,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAClC,CAAC;AAaF,MAAM,eAAe,GAAuC;IACxD,MAAM,EAAE,oBAAoB;IAC5B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO;CACxC,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,YAAY,CACxB,KAAY,EACZ,OAAgB,EAChB,QAAgC,EAChC,OAA8B;IAE9B,OAAO;QACH,IAAI,EAAE;YACF,IAAI,EAAE,UAAU;YAChB,WAAW,EACP,yGAAyG;YAC7G,UAAU,EAAE,MAAM;SACrB;QACD,OAAO,EAAE,eAAe;QACxB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE;YAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3C,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC;YAC5C,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC;YAChD,IAAI,WAAW,GAAG,CAAC,CAAC;YAEpB,gDAAgD;YAChD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC9D,MAAM,SAAS,GAAG,UAAU,EAAE,YAAY,IAAI,IAAI,CAAC;YAEnD,MAAM,CAAC,eAAe,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACpF,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACzB,KAAK,CAAC,SAAS,EAAE;gBACjB,WAAW,CAAC,UAAU,CAAC,SAAS,EAAE;gBAClC,OAAO,CAAC,IAAI,EAAE;aACjB,CAAC,CAAC;YACH,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC9D,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;YAEvC,uCAAuC;YACvC,MAAM,mBAAmB,GAAG,SAAS;gBACjC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,YAAY,CAAC;gBACpE,CAAC,CAAC,eAAe,CAAC;YAEtB,MAAM,MAAM,GAAG,mBAAmB;iBAC7B,KAAK,EAAE;iBACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;iBACvD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACd,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;gBAC5B,KAAK,EAAE,oBAAoB,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC9C,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,aAAa;aACrC,CAAC,CAAC,CAAC;YAER,+DAA+D;YAC/D,MAAM,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAErG,MAAM,YAAY,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;iBAC5F,KAAK,EAAE;iBACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACtD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,KAAK;gBAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;gBAC7B,KAAK,EAAE,IAAI,CAAC,OAAO,KAAK,aAAa;aACxC,CAAC,CAAC,CAAC;YAER,MAAM,UAAU,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;iBACpG,KAAK,EAAE;iBACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACtD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;aAChG,CAAC,CAAC,CAAC;YAER,MAAM,0BAA0B,GAAG,mBAAmB;iBACjD,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,KAAK,YAAY,CAAC;iBAClE,KAAK,EAAE;iBACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBAClB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC/D,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;oBACf,OAAO,MAAM,CAAC;gBAClB,CAAC;gBACD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAClE,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;oBAChB,OAAO,OAAO,CAAC;gBACnB,CAAC;gBACD,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACrD,CAAC,CAAC;iBACD,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBACpB,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,MAAM;gBAC/B,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,OAAO;gBACjC,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,KAAK,EAAE,YAAY,CAAC,GAAG,CAAC,OAAO,KAAK,aAAa;aACpD,CAAC,CAAC,CAAC;YAER,mDAAmD;YACnD,MAAM,qBAAqB,GACvB,SAAS,IAAI,iBAAiB;gBAC1B,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzF,CAAC,CAAC,cAAc,CAAC;YAEzB,MAAM,eAAe,GAAG,qBAAqB;iBACxC,KAAK,EAAE;iBACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;iBAC1D,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACf,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,OAAO;qBACnB,KAAK,EAAE;qBACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;qBAClE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBACd,OAAO,EAAE,MAAM,CAAC,OAAO;oBACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC5B,CAAC,CAAC;aACV,CAAC,CAAC,CAAC;YAER,gFAAgF;YAChF,MAAM,sBAAsB,GAAG,SAAS;gBACpC,CAAC,CAAC,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,CAClC,eAAe,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CACpE;gBACH,CAAC,CAAC,eAAe,CAAC;YAEtB,MAAM,aAAa,GAAG,sBAAsB;iBACvC,KAAK,EAAE;iBACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;iBACvD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAChB,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,MAAM,EACF,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM;oBAC3B,CAAC,CAAC,QAAQ,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE;oBAChC,CAAC,CAAC,QAAQ,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE;gBACxC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;aACxC,CAAC,CAAC,CAAC;YAER,MAAM,QAAQ,GAAG;gBACb,cAAc,MAAM,CAAC,MAAM,GAAG;gBAC9B,GAAG,oBAAoB,CAAC,MAAM,CAAC;gBAC/B,EAAE;gBACF,kBAAkB,YAAY,CAAC,MAAM,GAAG;gBACxC,GAAG,kBAAkB,CAAC,YAAY,CAAC;gBACnC,EAAE;gBACF,uBAAuB,UAAU,CAAC,MAAM,GAAG;gBAC3C,GAAG,uBAAuB,CAAC,UAAU,CAAC;gBACtC,EAAE;gBACF,4BAA4B,0BAA0B,CAAC,MAAM,GAAG;gBAChE,GAAG,2BAA2B,CAAC,0BAA0B,CAAC;gBAC1D,EAAE;gBACF,gBAAgB,eAAe,CAAC,MAAM,GAAG;gBACzC,GAAG,qBAAqB,CAAC,eAAe,CAAC;gBACzC,EAAE;gBACF,wBAAwB,aAAa,CAAC,MAAM,GAAG;gBAC/C,GAAG,oBAAoB,CAAC,aAAa,CAAC;aACzC,CAAC;YAEF,uCAAuC;YACvC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;gBACtE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACtB,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;wBAC1C,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,UAAU,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAC3E,CAAC;wBACF,OAAO,CACH,GAAG,OAAO,CAAC,EAAE,UAAU,OAAO,CAAC,IAAI,IAAI,SAAS,IAAI;4BACpD,gBAAgB,OAAO,EAAE,EAAE,IAAI,MAAM,GAAG;4BACxC,aAAa,OAAO,EAAE,SAAS,IAAI,SAAS,EAAE,CACjD,CAAC;oBACN,CAAC,CAAC,CAAC;oBACH,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,gBAAgB,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,YAAY,CAAC,CAAC;gBAC3E,CAAC;gBAED,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,YAAY,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;gBAC1F,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC;gBACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,WAAW,GAAG,EAAE,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAC9E,CAAC;YAED,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEpC,MAAM,WAAW,GAAsB;gBACnC,IAAI,EAAE,YAAY;gBAClB,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,QAAQ,EAAE,QAAQ,CAAC,IAAI;gBACvB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;gBAC1C,OAAO,EAAE;oBACL,aAAa;oBACb,MAAM;oBACN,KAAK,EAAE,YAAY;oBACnB,UAAU;oBACV,mBAAmB,EAAE,0BAA0B;oBAC/C,QAAQ,EAAE,eAAe;oBACzB,OAAO,EAAE,aAAa;iBACzB;gBACD,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACxB,CAAC;YAEF,OAAO;gBACH,WAAW;gBACX,WAAW,EAAE;oBACT,OAAO;oBACP,UAAU,EAAE,MAAM,CAAC,MAAM;oBACzB,SAAS,EAAE,YAAY,CAAC,MAAM;oBAC9B,cAAc,EAAE,UAAU,CAAC,MAAM;oBACjC,uBAAuB,EAAE,0BAA0B,CAAC,MAAM;oBAC1D,YAAY,EAAE,eAAe,CAAC,MAAM;oBACpC,WAAW,EAAE,aAAa,CAAC,MAAM;oBACjC,WAAW;iBACd;aACJ,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CACzB,MAA6F;IAE7F,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CACb,CAAC,KAAK,EAAE,EAAE,CACN,GAAG,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,KAAK,eAAe,KAAK,CAAC,SAAS,EAAE,CACzH,CAAC;AACN,CAAC;AAED,SAAS,kBAAkB,CACvB,YAME;IAEF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,YAAY,CAAC,GAAG,CACnB,CAAC,IAAI,EAAE,EAAE,CACL,GAAG,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,cAAc,IAAI,CAAC,QAAQ,aAAa,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAClH,CAAC;AACN,CAAC;AAED,SAAS,uBAAuB,CAAC,UAA0E;IACvG,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,YAAY,IAAI,CAAC,SAAS,IAAI,OAAO,EAAE,CAAC,CAAC;AACtG,CAAC;AAED,SAAS,2BAA2B,CAChC,aAME;IAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,aAAa,CAAC,GAAG,CACpB,CAAC,YAAY,EAAE,EAAE,CACb,QAAQ,YAAY,CAAC,MAAM,UAAU,YAAY,CAAC,OAAO,YAAY,YAAY,CAAC,OAAO,WAAW,YAAY,CAAC,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACrK,CAAC;AACN,CAAC;AAED,SAAS,qBAAqB,CAC1B,QAKE;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,MAAM,OAAO,GACT,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YACxB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/F,OAAO,IAAI,OAAO,CAAC,IAAI,WAAW,OAAO,CAAC,MAAM,YAAY,OAAO,EAAE,CAAC;IAC1E,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oBAAoB,CACzB,SAOE;IAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,SAAS,CAAC,GAAG,CAChB,CAAC,QAAQ,EAAE,EAAE,CACT,GAAG,QAAQ,CAAC,EAAE,WAAW,QAAQ,CAAC,MAAM,WAAW,QAAQ,CAAC,MAAM,aAAa,QAAQ,CAAC,QAAQ,SAAS,QAAQ,CAAC,IAAI,kBAAkB,QAAQ,CAAC,aAAa,EAAE,CACvK,CAAC;AACN,CAAC;AAED,KAAK,UAAU,oBAAoB,CAC/B,YAAoB,EACpB,OAgBC,EACD,MAAwE;IAExE,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAC9E,MAAM,SAAS,GAAG,IAAI,GAAG,EAGtB,CAAC;IACJ,MAAM,WAAW,GAAG,CAChB,MAAM,OAAO,CAAC,GAAG,CACb,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACvC,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;QAC/F,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,MAAM,EAAE,CAAC;YACT,OAAO,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QAC/C,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CACL,CACJ;SACI,MAAM,CACH,CAAC,KAAK,EAA8F,EAAE,CAClG,CAAC,CAAC,KAAK,CACd;SACA,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC;QAC/B,OAAO,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEP,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO;YACH,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC,MAAM,CAAC;SAClB,CAAC;IACN,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAC9B,MAAM;SACD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,QAAQ,CAAC;SACjG,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACjE,CAAC;IAEF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC3C,OAAO,CAAC,WAAW,CAAC,6BAA6B,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC;YAC1E,OAAO,CAAC,WAAW,CAAC,6BAA6B,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAAC;SAC7E,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,MAAM,uBAAuB,CAAC;YAChD,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,MAAM,CAAC,EAAE;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS;YACT,kBAAkB;YAClB,SAAS,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,uBAAuB,CAAC;YAChD,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,YAAY;YACzB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS;YACT,kBAAkB;YAClB,SAAS,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACJ,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,EAAE,GAAG,aAAa,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,CAAC;IACL,CAAC;IAED,OAAO;QACH,KAAK,EAAE,WAAW,CAAC,MAAM;QACzB,KAAK;KACR,CAAC;AACN,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,OAWtC;IACG,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW;SAC7B,KAAK,EAAE;SACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAClB,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,aAAa,CAC1D,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CACpD,CACJ,CAAC;IAEN,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,qBAAqB,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,SAAS;QACb,CAAC;QACD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC;QAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,MAAM,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC;QACpE,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QACrF,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;QAC1E,KAAK,CAAC,IAAI,CACN,KAAK,KAAK,IAAI,QAAQ,KAAK,WAAW,aAAa,UAAU,aAAa,OAAO,WAAW,MAAM,EAAE,CACvG,CAAC;IACN,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,qBAAqB,CAAC,UAAgD,EAAE,WAAmB;IAChG,OAAO,UAAU,CAAC,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;AACxF,CAAC"}

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

@@ -279,25 +279,25 @@ describe("topologyTool", () => {
         const config = configResolve({ engine: { dataDir: dir } }, path.join(dir, "settings.json"));
         const storage = storageResolve(config);
         try {
-            await storage.users.create({ id: "alice", usertag: "happy-penguin-42" });
-            await storage.users.create({ id: "bob", usertag: "swift-fox-42" });
+            await storage.users.create({ id: "alice", nametag: "happy-penguin-42" });
+            await storage.users.create({ id: "bob", nametag: "swift-fox-42" });
             await storage.users.create({
                 id: "alice-sub-active",
                 parentUserId: "alice",
                 name: "helper",
-                usertag: "cool-cat-11"
+                nametag: "cool-cat-11"
             });
             await storage.users.create({
                 id: "alice-sub-pending",
                 parentUserId: "alice",
                 name: "assistant",
-                usertag: "lazy-dog-55"
+                nametag: "lazy-dog-55"
             });
             await storage.users.create({
                 id: "bob-sub-active",
                 parentUserId: "bob",
                 name: "bob-helper",
-                usertag: "smart-owl-22"
+                nametag: "smart-owl-22"
             });
             await storage.connections.upsertRequest("alice", "bob", 100);
             await storage.connections.upsertRequest("bob", "alice", 200);
@@ -357,9 +357,9 @@ describe("topologyTool", () => {
             const text = contentText(result.toolMessage.content);
             expect(text).toContain("## Friends (1)");
             expect(text).toContain("swift-fox-42");
-            expect(text).toContain("→ shared out: helper (usertag=cool-cat-11) gateway=gateway-alice-active status=active");
-            expect(text).toContain("→ shared out: assistant (usertag=lazy-dog-55) gateway=gateway-alice-pending status=pending");
-            expect(text).toContain("← shared in: bob-helper (usertag=smart-owl-22) gateway=gateway-bob-active status=active");
+            expect(text).toContain("→ shared out: helper (nametag=cool-cat-11) gateway=gateway-alice-active status=active");
+            expect(text).toContain("→ shared out: assistant (nametag=lazy-dog-55) gateway=gateway-alice-pending status=pending");
+            expect(text).toContain("← shared in: bob-helper (nametag=smart-owl-22) gateway=gateway-bob-active status=active");
             expect(result.typedResult.friendCount).toBe(1);
         }
         finally {