@masons/agent-network 0.6.19 → 0.6.21

package/dist/handoff.d.ts

@@ -1,8 +1,7 @@
 import { type KeyObject } from "node:crypto";
+export { SetupFlowError } from "./handoff-deadline.js";
 export declare const DEFAULT_IDP_BASE_URL = "https://preview.masons.ai";
 export declare const HANDOFF_TIMEOUT_MS: number;
-export declare class SetupFlowError extends Error {
-}
 export interface BridgeHandoffResult {
     token: string;
     agent: {

package/dist/handoff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handoff.d.ts","sourceRoot":"","sources":["../src/handoff.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,SAAS,EAEf,MAAM,aAAa,CAAC;AAerB,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAiBhE,eAAO,MAAM,kBAAkB,QAAgB,CAAC;AAKhD,qBAAa,cAAe,SAAQ,KAAK;CAAG;AAY5C,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1D;AAQD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAOhB,UAAU,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAsD/B;AAKD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAmC9B"}
+{"version":3,"file":"handoff.d.ts","sourceRoot":"","sources":["../src/handoff.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,SAAS,EAEf,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAavD,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAiBhE,eAAO,MAAM,kBAAkB,QAAiB,CAAC;AAejD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1D;AAQD,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAOhB,UAAU,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAMD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAsD/B;AAKD,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAwC9B"}

package/dist/handoff.js

@@ -1,11 +1,11 @@
 import { createDecipheriv, constants as cryptoConstants, generateKeyPairSync, privateDecrypt, } from "node:crypto";
+import { assertHandoffDeadlineActive, SetupFlowError, } from "./handoff-deadline.js";
 import { apiFetch, PlatformNetworkError } from "./platform-client.js";
+export { SetupFlowError } from "./handoff-deadline.js";
 export const DEFAULT_IDP_BASE_URL = "https://preview.masons.ai";
 const HANDLE_REGEX = /^[a-z][a-z0-9_-]{2,14}$/;
-export const HANDOFF_TIMEOUT_MS = 5 * 60 * 1000;
+export const HANDOFF_TIMEOUT_MS = 10 * 60 * 1000;
 const HANDOFF_POLL_INTERVAL_MS = 2000;
-export class SetupFlowError extends Error {
-}
 export async function beginBridgeHandoff(options) {
     const { publicKey, privateKey } = generateKeyPairSync("rsa", {
         modulusLength: 2048,
@@ -53,7 +53,7 @@ export async function beginBridgeHandoff(options) {
     };
 }
 export async function completeBridgeHandoff(session) {
-    const envelope = await pollForCompletion(session.apiBase, session.sessionId);
+    const envelope = await pollForCompletion(session.apiBase, session.sessionId, session.expiresAt);
     let payload;
     try {
         payload = decryptBridgeEnvelope(session.privateKey, envelope);
@@ -62,6 +62,7 @@ export async function completeBridgeHandoff(session) {
         const message = err instanceof Error ? err.message : "unknown error";
         throw new SetupFlowError(`Handoff received but could not be decrypted (${message}). The link may have been tampered with — re-run setup. If it keeps failing, your network may be inserting a TLS-terminating proxy that mangled the ciphertext.`);
     }
+    assertHandoffDeadlineActive(session.expiresAt);
     if (typeof payload.token !== "string" ||
         !payload.token.startsWith("masons_rt_v1_") ||
         typeof payload.agent?.handle !== "string" ||
@@ -79,10 +80,9 @@ export async function completeBridgeHandoff(session) {
         },
     };
 }
-async function pollForCompletion(apiBase, sessionId) {
-    const start = Date.now();
+async function pollForCompletion(apiBase, sessionId, expiresAt) {
     let lastNetworkError;
-    while (Date.now() - start < HANDOFF_TIMEOUT_MS) {
+    while (Date.now() < expiresAt) {
         let res;
         try {
             res = await apiFetch(`${apiBase}/v1/cli-handoff/${encodeURIComponent(sessionId)}/poll`, { method: "GET" });
@@ -90,28 +90,38 @@ async function pollForCompletion(apiBase, sessionId) {
         catch (err) {
             if (err instanceof PlatformNetworkError) {
                 lastNetworkError = err;
-                await sleep(HANDOFF_POLL_INTERVAL_MS);
+                await sleepBeforeNextPoll(expiresAt);
                 continue;
             }
             throw err;
         }
+        if (Date.now() >= expiresAt)
+            break;
         if (res.status === 404) {
             throw new SetupFlowError("Handoff session expired before the runtime key was delivered. Re-run setup.");
         }
         if (!res.ok) {
-            await sleep(HANDOFF_POLL_INTERVAL_MS);
+            await sleepBeforeNextPoll(expiresAt);
             continue;
         }
         const body = (await res.json());
+        if (Date.now() >= expiresAt)
+            break;
         if (body.status === "completed" && body.payload) {
             return body.payload;
         }
-        await sleep(HANDOFF_POLL_INTERVAL_MS);
+        await sleepBeforeNextPoll(expiresAt);
     }
     throw new SetupFlowError(lastNetworkError
         ? `Handoff timed out before the runtime key was delivered; the last poll could not reach ${apiBase} (${lastNetworkError.message}). Re-run setup; if you're behind a proxy that blocks long-running fetches, retry on a different network.`
         : "Handoff timed out before the runtime key was delivered. Re-run setup; if you're behind a proxy that blocks long-running fetches, retry on a different network.");
 }
+async function sleepBeforeNextPoll(expiresAt) {
+    const remainingMs = expiresAt - Date.now();
+    if (remainingMs <= 0)
+        return;
+    await sleep(Math.min(HANDOFF_POLL_INTERVAL_MS, remainingMs));
+}
 function decryptBridgeEnvelope(privateKey, envelope) {
     const wrappedKey = Buffer.from(envelope.wrapped_key, "base64url");
     const iv = Buffer.from(envelope.iv, "base64url");

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export { AUTHORIZED_TOKEN_TTL_MS, SETUP_CODE_CHARSET, SETUP_CODE_LENGTH, SETUP_CODE_TTL_MS, } from "./constants.js";
 export type { AgentNetworkAccount } from "./config-schema.js";
-export type { AddressedMessageEvent, DeliveryPendingEvent, DeliverySkipEvent, DeliveryStatusEvent, RegisterAckEvent, SendAckEvent, StructuredErrorEvent, } from "./types.js";
+export type { AddressedMessageEvent, DeliveryPendingEvent, DeliverySkipEvent, DeliveryStatusEvent, ObservedSendAckEvent, RegisterAckEvent, SendAckEvent, StructuredErrorEvent, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAIxB,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,GACrB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAIxB,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,oBAAoB,EACpB,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,GACrB,MAAM,YAAY,CAAC"}

package/dist/platform-client.d.ts

@@ -87,4 +87,5 @@ export declare function acceptRequest(cfg: PlatformClientConfig, runtimeKey: str
 export declare function declineRequest(cfg: PlatformClientConfig, runtimeKey: string, requestId: string): Promise<DeclineRequestResponse>;
 export declare function updateProfile(cfg: PlatformClientConfig, runtimeKey: string, params: UpdateProfileParams): Promise<UpdateProfileResponse>;
 export declare function listConnections(cfg: PlatformClientConfig, runtimeKey: string): Promise<ListConnectionsResponse>;
+export declare function getIdentity(cfg: PlatformClientConfig, runtimeKey: string): Promise<ConnectionNodeRef | null>;
 //# sourceMappingURL=platform-client.d.ts.map

package/dist/platform-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-client.d.ts","sourceRoot":"","sources":["../src/platform-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platform-client.d.ts","sourceRoot":"","sources":["../src/platform-client.ts"],"names":[],"mappings":"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"}

package/dist/platform-client.js

@@ -144,3 +144,15 @@ export async function listConnections(cfg, runtimeKey) {
         return handleError(res);
     return (await res.json());
 }
+export async function getIdentity(cfg, runtimeKey) {
+    const res = await apiFetch(`${baseUrl(cfg)}/me/identity`, {
+        headers: { Authorization: `Bearer ${runtimeKey}` },
+    });
+    if (!res.ok)
+        return handleError(res);
+    const body = (await res.json().catch(() => null));
+    if (!body || body.node === undefined) {
+        throw new PlatformApiError(res.status, "malformed_response", "identity response carried no `node` field");
+    }
+    return body.node;
+}

package/dist/plugin.d.ts

@@ -1,5 +1,6 @@
+import type { ConversationManager } from "./conversation-manager.js";
 import { evaluateServicesRetainedToolPolicy } from "./services-retained-tool-policy.js";
-export declare function buildInteractionContext(channelId: string | undefined, turnSender: string | null, turnSenderAddress: string | null, servicesRetained?: boolean): string | undefined;
+export declare function buildInteractionContext(messageProvider: string | undefined, turnSenderAddress: string | null, conversationManager?: ConversationManager | null): string | undefined;
 interface OpenClawPluginApi {
     runtime: unknown;
     registerChannel(opts: {

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAuBA,OAAO,EACL,kCAAkC,EAEnC,MAAM,oCAAoC,CAAC;AAgE5C,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,iBAAiB,EAAE,MAAM,GAAG,IAAI,EAChC,gBAAgB,UAAQ,GACvB,MAAM,GAAG,SAAS,CA+EpB;AAKD,UAAU,iBAAiB;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IACjD,YAAY,CACV,IAAI,EAAE,OAAO,EACb,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3C,IAAI,CAAC;IACR,yBAAyB,CAAC,MAAM,EAAE;QAChC,EAAE,EAAE,MAAM,CAAC;QACX,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,OAAO,kCAAkC,CAAC;KACrD,GAAG,IAAI,CAAC;IACT,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GAAG,IAAI,CAAC;CACnE;AAED,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAaI,iBAAiB;CAiZhC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAUrE,OAAO,EACL,kCAAkC,EAEnC,MAAM,oCAAoC,CAAC;AA8D5C,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,iBAAiB,EAAE,MAAM,GAAG,IAAI,EAChC,mBAAmB,GAAE,mBAAmB,GAAG,IAA+B,GACzE,MAAM,GAAG,SAAS,CA6EpB;AAKD,UAAU,iBAAiB;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IACjD,YAAY,CACV,IAAI,EAAE,OAAO,EACb,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3C,IAAI,CAAC;IACR,yBAAyB,CAAC,MAAM,EAAE;QAChC,EAAE,EAAE,MAAM,CAAC;QACX,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,OAAO,kCAAkC,CAAC;KACrD,GAAG,IAAI,CAAC;IACT,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GAAG,IAAI,CAAC;CACnE;AAqCD,QAAA,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAaI,iBAAiB;CA8ZhC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/plugin.js

@@ -2,14 +2,14 @@ import pluginManifest from "../openclaw.plugin.json" with { type: "json" };
 import { agentNetworkChannel, consumeIdentityLinkingNudge } from "./channel.js";
 import { login } from "./cli-setup.js";
 import { detectPendingState, getConversationManager, getDmScope, getStateCacheGeneration, initPluginRuntime, } from "./config.js";
+import { getInvocationConversationManager } from "./conversation-manager-context.js";
 import { getAgentIdentity } from "./environment-context.js";
 import { ownerNotesQueue } from "./owner-notes.js";
 import { consumeCurrentTurnIsOwner, consumeCurrentTurnOwnerSignal, } from "./owner-session-state.js";
-import { sentMessageBuffer } from "./sent-message-buffer.js";
 import { isServicesRetainedReplyContext } from "./services-retained-reply-context.js";
 import { evaluateServicesRetainedToolPolicy, SERVICES_RETAINED_TOOL_POLICY_ID, } from "./services-retained-tool-policy.js";
 import { registerTools } from "./tools.js";
-import { consumeCurrentTurnSender, consumeCurrentTurnSenderAddress, setCurrentTurnChannelId, setCurrentTurnIsOwnerForTools, setCurrentTurnOwnerSignalForTools, } from "./turn-context.js";
+import { setCurrentTurnChannelId, setCurrentTurnIsOwnerForTools, setCurrentTurnOwnerSignalForTools, } from "./turn-context.js";
 import { getUpdateInfo } from "./update-check.js";
 import { PLUGIN_VERSION } from "./version.js";
 function formatTimeAgo(timestamp) {
@@ -40,8 +40,8 @@ function drainAndFormatNotes(reportInstruction) {
         reportInstruction);
 }
 const MAX_INTERACTIONS = 5;
-export function buildInteractionContext(channelId, turnSender, turnSenderAddress, servicesRetained = false) {
-    const cm = getConversationManager();
+export function buildInteractionContext(messageProvider, turnSenderAddress, conversationManager = getConversationManager()) {
+    const cm = conversationManager;
     if (!cm)
         return undefined;
     const conversations = cm.listConversations();
@@ -60,22 +60,18 @@ export function buildInteractionContext(channelId, turnSender, turnSenderAddress
         const when = formatTimeAgo(c.lastMessageAt);
         return `• ${who} — ${initiated} — last activity ${when}`;
     });
-    const isNetworkTurn = channelId === "agent-network";
-    if (isNetworkTurn && turnSender) {
-        const senderConvo = turnSenderAddress
-            ? conversations.find((c) => c.address === turnSenderAddress)
-            : undefined;
+    const isNetworkTurn = messageProvider === "agent-network";
+    if (isNetworkTurn && turnSenderAddress) {
+        const senderConvo = conversations.find((c) => c.address === turnSenderAddress);
         const initiated = senderConvo?.initiatedBy === "local"
             ? "You initiated this interaction."
             : "They initiated this interaction.";
-        const from = turnSenderAddress && turnSenderAddress !== turnSender
-            ? `${turnSender} (${turnSenderAddress})`
-            : turnSender;
+        const from = senderConvo && senderConvo.contact !== turnSenderAddress
+            ? `${senderConvo.contact} (${turnSenderAddress})`
+            : turnSenderAddress;
         return (`${header}\n${lines.join("\n")}\n` +
             `[This turn] From ${from}. ${initiated}\n` +
-            (servicesRetained
-                ? "Your text reply uses the Services-retained reply authority for this message. "
-                : "Your text reply goes to this sender. ") +
+            "Your text reply goes to this sender. " +
             "To report to your owner: masons_note_for_owner.");
     }
     if (isNetworkTurn) {
@@ -88,6 +84,24 @@ export function buildInteractionContext(channelId, turnSender, turnSenderAddress
         : "[Active interactions on the network]";
     return `${ownerHeader}\n${lines.join("\n")}`;
 }
+function resolveHookProvider(ctx) {
+    return ctx?.messageProvider ?? ctx?.channel;
+}
+function resolveHookSender(ctx, servicesRetained) {
+    if (servicesRetained || resolveHookProvider(ctx) !== "agent-network") {
+        return null;
+    }
+    const senderId = ctx?.senderId;
+    return typeof senderId === "string" && senderId.length > 0 ? senderId : null;
+}
+function renderPeer(address, conversationManager) {
+    const conversation = conversationManager
+        .listConversations()
+        .find((entry) => entry.address === address);
+    return conversation && conversation.contact !== address
+        ? `${conversation.contact} (${address})`
+        : address;
+}
 const plugin = {
     id: "agent-network",
     version: PLUGIN_VERSION,
@@ -130,7 +144,8 @@ const plugin = {
             "masons_note_for_owner(content, from?) — save a note for your owner's next turn. " +
             "Other network tools: masons_list_requests, masons_send_connection_request, " +
             "masons_accept_request, masons_decline_request, masons_list_connections, " +
-            "masons_end_conversation (rare one-shot close signal only). " +
+            "masons_end_conversation (rare one-shot close signal only), " +
+            "masons_status (your canonical identity and participation status). " +
             "Always try these tools first for network operations. " +
             "If a tool call fails, report the error to your user — do not silently work around it. " +
             "You interact with multiple entities simultaneously — your owner and agents on the network. " +
@@ -147,13 +162,15 @@ const plugin = {
             "";
         api.on("before_prompt_build", async (_event, ctx) => {
             const hookCtx = ctx;
-            const channelId = hookCtx?.channelId;
+            const messageProvider = resolveHookProvider(hookCtx);
+            const invocationConversationManager = getInvocationConversationManager();
             const turnIsOwner = consumeCurrentTurnIsOwner();
             const turnOwnerSignal = consumeCurrentTurnOwnerSignal();
-            const turnSender = consumeCurrentTurnSender();
-            const turnSenderAddress = consumeCurrentTurnSenderAddress();
             const servicesRetainedReply = isServicesRetainedReplyContext();
-            setCurrentTurnChannelId(channelId ?? null);
+            const turnSenderAddress = invocationConversationManager
+                ? resolveHookSender(hookCtx, servicesRetainedReply)
+                : null;
+            setCurrentTurnChannelId(messageProvider ?? null);
             setCurrentTurnIsOwnerForTools(turnIsOwner);
             setCurrentTurnOwnerSignalForTools(turnOwnerSignal);
             const currentGeneration = getStateCacheGeneration();
@@ -203,7 +220,7 @@ const plugin = {
                 state.hasCredentials &&
                 !state.needsProfile &&
                 !state.pendingTarget) {
-                if (channelId === "agent-network") {
+                if (messageProvider === "agent-network") {
                     if (turnIsOwner) {
                         dynamicContext =
                             "[Agent Network — Owner via Passport] Your owner (Principal) is talking to you " +
@@ -226,12 +243,12 @@ const plugin = {
                                 "on the agent network. Your text reply will be sent to that sender — " +
                                 "your owner (Principal) will NOT see it. To report something to your owner, " +
                                 "call masons_note_for_owner.";
-                        const interactionCtx = buildInteractionContext(channelId, turnSender, turnSenderAddress, servicesRetainedReply);
+                        const interactionCtx = buildInteractionContext(messageProvider, turnSenderAddress, invocationConversationManager);
                         if (interactionCtx) {
                             dynamicContext += `\n\n${interactionCtx}`;
                         }
-                        if (turnSender) {
-                            const sentMsgs = sentMessageBuffer.getRecent(turnSender);
+                        if (turnSenderAddress && invocationConversationManager) {
+                            const sentMsgs = invocationConversationManager?.getRecentOutboundContext(turnSenderAddress) ?? [];
                             if (sentMsgs.length > 0) {
                                 const lines = sentMsgs.map((m) => {
                                     const preview = m.content.length > 500
@@ -240,7 +257,7 @@ const plugin = {
                                     return `• (${formatTimeAgo(m.timestamp)}): "${preview}"`;
                                 });
                                 dynamicContext +=
-                                    `\n\n[Your recent messages to ${turnSender}]\n` +
+                                    `\n\n[Your recent messages to ${renderPeer(turnSenderAddress, invocationConversationManager)}]\n` +
                                         lines.join("\n");
                             }
                         }
@@ -261,7 +278,7 @@ const plugin = {
                             ? `${dynamicContext}\n\n${nudge}`
                             : nudge;
                     }
-                    const interactionCtx = buildInteractionContext(channelId, null, null);
+                    const interactionCtx = buildInteractionContext(messageProvider, null);
                     if (interactionCtx) {
                         dynamicContext = dynamicContext
                             ? `${dynamicContext}\n\n${interactionCtx}`
@@ -287,10 +304,12 @@ const plugin = {
             if (state.hasCredentials) {
                 const envAgent = getAgentIdentity();
                 if (envAgent) {
-                    let identityLine = `[Identity] You are @${envAgent.handle}`;
-                    if (envAgent.name)
-                        identityLine += ` (${envAgent.name})`;
-                    identityLine += " on the agent network.";
+                    const registered = envAgent.name
+                        ? `@${envAgent.handle}(${envAgent.name})`
+                        : `@${envAgent.handle}`;
+                    const identityLine = `[Identity] The Gateway registered this connection as ${registered}. ` +
+                        "This is connection-level context, not your canonical network identity — " +
+                        "for the canonical answer, call masons_status.";
                     dynamicContext = dynamicContext
                         ? `${identityLine}\n\n${dynamicContext}`
                         : identityLine;

package/dist/sent-message-buffer.d.ts

@@ -7,9 +7,8 @@ export declare class SentMessageBuffer {
     static readonly MAX_PER_CONTACT = 5;
     static readonly TTL_MS: number;
     static readonly MAX_CONTENT_LENGTH = 1000;
-    record(contact: string, content: string): void;
-    getRecent(contact: string): SentMessage[];
+    record(peerAddress: string, content: string): void;
+    getRecent(peerAddress: string): SentMessage[];
     clear(): void;
 }
-export declare const sentMessageBuffer: SentMessageBuffer;
 //# sourceMappingURL=sent-message-buffer.d.ts.map

package/dist/sent-message-buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sent-message-buffer.d.ts","sourceRoot":"","sources":["../src/sent-message-buffer.ts"],"names":[],"mappings":"AAuBA,MAAM,WAAW,WAAW;IAE1B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;CACnB;AAMD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAoC;IAGnD,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK;IAEpC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAsB;IAE5C,MAAM,CAAC,QAAQ,CAAC,kBAAkB,QAAQ;IAM1C,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAiC9C,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,EAAE;IAuBzC,KAAK,IAAI,IAAI;CAGd;AAMD,eAAO,MAAM,iBAAiB,mBAA0B,CAAC"}
+{"version":3,"file":"sent-message-buffer.d.ts","sourceRoot":"","sources":["../src/sent-message-buffer.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,WAAW;IAE1B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;CACnB;AAMD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAoC;IAGnD,MAAM,CAAC,QAAQ,CAAC,eAAe,KAAK;IAEpC,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAsB;IAE5C,MAAM,CAAC,QAAQ,CAAC,kBAAkB,QAAQ;IAM1C,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAgClD,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,EAAE;IAsB7C,KAAK,IAAI,IAAI;CAGd"}

package/dist/sent-message-buffer.js

@@ -3,13 +3,12 @@ export class SentMessageBuffer {
     static MAX_PER_CONTACT = 5;
     static TTL_MS = 2 * 60 * 60 * 1000;
     static MAX_CONTENT_LENGTH = 1000;
-    record(contact, content) {
+    record(peerAddress, content) {
         const now = Date.now();
-        const key = contact.toLowerCase();
-        let list = this.entries.get(key);
+        let list = this.entries.get(peerAddress);
         if (!list) {
             list = [];
-            this.entries.set(key, list);
+            this.entries.set(peerAddress, list);
         }
         const cutoff = now - SentMessageBuffer.TTL_MS;
         const fresh = list.filter((m) => m.timestamp > cutoff);
@@ -20,21 +19,20 @@ export class SentMessageBuffer {
             ? `${content.slice(0, SentMessageBuffer.MAX_CONTENT_LENGTH)}...`
             : content;
         fresh.push({ content: stored, timestamp: now });
-        this.entries.set(key, fresh);
+        this.entries.set(peerAddress, fresh);
     }
-    getRecent(contact) {
-        const key = contact.toLowerCase();
-        const list = this.entries.get(key);
+    getRecent(peerAddress) {
+        const list = this.entries.get(peerAddress);
         if (!list)
             return [];
         const cutoff = Date.now() - SentMessageBuffer.TTL_MS;
         const fresh = list.filter((m) => m.timestamp > cutoff);
         if (fresh.length !== list.length) {
             if (fresh.length === 0) {
-                this.entries.delete(key);
+                this.entries.delete(peerAddress);
             }
             else {
-                this.entries.set(key, fresh);
+                this.entries.set(peerAddress, fresh);
             }
         }
         return fresh;
@@ -43,4 +41,3 @@ export class SentMessageBuffer {
         this.entries.clear();
     }
 }
-export const sentMessageBuffer = new SentMessageBuffer();

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAwEA,UAAU,WAAW;IACnB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChD;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,CACP,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,WAAW,CAAC,CAAC;CAC3B;AAED,UAAU,WAAW;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,KAAK,WAAW,GAAG,CAAC,GAAG,EAAE,WAAW,KAAK,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;AAE3E,UAAU,OAAO;IACf,YAAY,CACV,IAAI,EAAE,cAAc,GAAG,WAAW,EAWlC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAC7D,IAAI,CAAC;CACT;AAoDD,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAwSD,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CA22BhD"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AA2EA,UAAU,WAAW;IACnB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChD;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,CACP,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,WAAW,CAAC,CAAC;CAC3B;AAED,UAAU,WAAW;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,KAAK,WAAW,GAAG,CAAC,GAAG,EAAE,WAAW,KAAK,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC;AAE3E,UAAU,OAAO;IACf,YAAY,CACV,IAAI,EAAE,cAAc,GAAG,WAAW,EAWlC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAC7D,IAAI,CAAC;CACT;AAoDD,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAoZD,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAm5BhD"}

package/dist/tools.js

@@ -1,12 +1,10 @@
 import { Type } from "@sinclair/typebox";
 import { getOwnerPassportAddress } from "./channel.js";
 import { _resetChannelSetupForTesting, consumeChannelSetupStatus, getDefaultChannelSetupOptions, startOrGetChannelSetup, } from "./channel-setup.js";
-import { clearTargetHandle, extractNetworkConfig, getDmScope, getPendingTarget, isProfileNeeded, markProfileComplete, removeIdentityLinks, requireApiKey, requireConversationManager, requirePlatformConfig, writeIdentityLinks, } from "./config.js";
+import { clearTargetHandle, extractNetworkConfig, getConnectorClient, getDmScope, getPendingTarget, hasApiKey, isProfileNeeded, markProfileComplete, removeIdentityLinks, requireApiKey, requireConversationManager, requirePlatformConfig, writeIdentityLinks, } from "./config.js";
 import { getOwnerHandle } from "./environment-context.js";
-import { extractHandleFromAddress } from "./handle-utils.js";
 import { ownerNotesQueue } from "./owner-notes.js";
-import { acceptRequest, declineRequest, listConnections, listRequests, PlatformApiError, PlatformNetworkError, requestConnection, updateProfile, } from "./platform-client.js";
-import { sentMessageBuffer } from "./sent-message-buffer.js";
+import { acceptRequest, declineRequest, getIdentity, listConnections, listRequests, PlatformApiError, PlatformNetworkError, requestConnection, updateProfile, } from "./platform-client.js";
 import { isServicesRetainedReplyContext } from "./services-retained-reply-context.js";
 import { getCurrentTurnChannelId, getCurrentTurnIsOwnerNonConsuming, getCurrentTurnOwnerSignal, } from "./turn-context.js";
 import { getLatestPublishedVersion, getPluginVersion, getUpdateInfo, } from "./update-check.js";
@@ -63,6 +61,76 @@ function formatConnectionResult(requestIds, status) {
     }
     return `Connection request sent. Status: ${status}. The other agent's owner will be notified.`;
 }
+function formatIdentityNode(node) {
+    const handlePart = node.handle ? `@${node.handle} — ` : "";
+    const canonical = `Identity: ${formatKindLabel(node.kind)}${handlePart}${node.mstpAddress}`;
+    if (!node.displayName)
+        return canonical;
+    return `${canonical}\nDisplay name (presentation supplied by the identity endpoint): ${node.displayName}`;
+}
+const IDENTITY_NO_FALLBACK = "This is not an answer — do not assume any locally-cached handle or name is this Runtime's identity.";
+function formatIdentityError(err) {
+    if (err instanceof PlatformApiError) {
+        if (err.status === 404) {
+            return err.code === "not_found"
+                ? "Identity: the Node's backing entity is missing or deleted."
+                : `Identity: unavailable — the identity endpoint is not available at this host (HTTP 404). ${IDENTITY_NO_FALLBACK}`;
+        }
+        if (err.status === 401) {
+            return "Identity: the runtime key is not valid — the network rejected it. The owner can re-authenticate via masons_setup.";
+        }
+        if (err.status === 403) {
+            return "Identity: refused (HTTP 403) — this runtime key is not permitted to read this Runtime's identity. That is a credential-class refusal, not a transient outage: retrying will not change it.";
+        }
+        return `Identity: unavailable right now (HTTP ${err.status}: ${err.code}). ${IDENTITY_NO_FALLBACK}`;
+    }
+    if (err instanceof PlatformNetworkError) {
+        return `Identity: unavailable right now. ${networkErrorText(err)} ${IDENTITY_NO_FALLBACK}`;
+    }
+    throw err;
+}
+function formatRegistration(outcome) {
+    switch (outcome.state) {
+        case "accepted":
+            return "accepted";
+        case "refused":
+            return `refused: ${outcome.reason}`;
+        case "replaced":
+            return "replaced by another Runtime (will not retry)";
+        case "none":
+            return "none";
+    }
+}
+function formatReadinessSection() {
+    const credentialsLine = hasApiKey()
+        ? "Credentials: configured"
+        : "Credentials: not configured";
+    const client = getConnectorClient();
+    const channel = client ? client.getChannelState() : "not established";
+    const registration = formatRegistration(client ? client.getRegistration() : { state: "none" });
+    return [
+        credentialsLine,
+        `Gateway channel: ${channel}`,
+        `Registration (this connection): ${registration}`,
+    ].join("\n");
+}
+async function resolveIdentitySection() {
+    if (!hasApiKey()) {
+        return "Identity: no runtime key configured — cannot ask the network who this Runtime is. Run masons_setup first.";
+    }
+    const cfg = requirePlatformConfig();
+    const apiKey = requireApiKey();
+    try {
+        const node = await getIdentity(cfg, apiKey);
+        if (node === null) {
+            return "Identity: this Runtime's principal holds no active Node on the network.";
+        }
+        return formatIdentityNode(node);
+    }
+    catch (err) {
+        return formatIdentityError(err);
+    }
+}
 function resolveSetupAuthority() {
     const channelId = getCurrentTurnChannelId();
     if (channelId !== "agent-network") {
@@ -573,6 +641,18 @@ export function registerTools(api) {
             return textResult(`${result.total} connection(s):\n\n${lines.join("\n")}\n\nUse masons_send_message with a handle or address to send a message.`);
         }),
     });
+    api.registerTool({
+        name: "masons_status",
+        description: [
+            "Report this Runtime's canonical identity and participation status on the agent network.",
+            "Use when the owner asks 'who are you on the network', 'what's your identity', 'are you connected', or 'are you ready'.",
+            "",
+            "Identity comes ONLY from the platform's own identity endpoint — never from local config, cached REGISTER_ACK context, a pending connection target, or any peer/connection handle. If the identity endpoint is unavailable, this tool reports that plainly instead of guessing.",
+            "Readiness reports separate facts — credentials configured, live Gateway channel state, and the current connection's registration outcome — without collapsing them into one 'online' verdict.",
+        ].join("\n"),
+        parameters: Type.Object({}),
+        execute: withUpdateNotice(async () => textResult([await resolveIdentitySection(), "", formatReadinessSection()].join("\n"))),
+    });
     api.registerTool({
         name: "masons_send_message",
         description: "Send a message to a remote agent on the agent network. This is agent-to-agent communication — separate from your owner's conversation. Sessions are managed automatically — just provide the contact handle or address.",
@@ -591,11 +671,25 @@ export function registerTools(api) {
             const cm = requireConversationManager();
             const to = params.to;
             const content = params.content;
-            const handle = extractHandleFromAddress(to);
             const result = await cm.send(to, content);
             if (result.status === "sent") {
-                sentMessageBuffer.record(handle, content);
-                return textResult("Message sent.");
+                if (result.addressedTarget?.basis === "resolved") {
+                    cm.recordOutboundContext(result.addressedTarget.address, content);
+                }
+                const reference = result.messageRef
+                    ? ` Message reference: ${JSON.stringify(result.messageRef)}.`
+                    : "";
+                if (result.acknowledgementStatus === "stored") {
+                    return textResult(`Message durably accepted for delivery.${reference}`);
+                }
+                if (result.acknowledgementStatus === "delivered") {
+                    return textResult(`Message handed to the recipient Node; presentation is not confirmed.${reference}`);
+                }
+                return textResult(`Message accepted with acknowledgement status ${JSON.stringify(result.acknowledgementStatus)}.${reference}`);
+            }
+            if (result.status === "unknown") {
+                console.warn(`[agent-network:tools] masons_send_message OUTCOME UNKNOWN to=${to} messageId=${result.messageId} reason=${result.reason}`);
+                return textResult(result.error);
             }
             console.warn(`[agent-network:tools] masons_send_message FAILED to=${to} code=${result.errorCode ?? "(none)"} error=${result.error ?? "(none)"}`);
             return textResult(result.error ??

package/dist/turn-context.d.ts

@@ -1,11 +1,7 @@
 import type { OwnerSignal } from "./owner-session-state.js";
-export declare function setCurrentTurnSender(contact: string | null): void;
-export declare function setCurrentTurnSenderAddress(address: string | null): void;
 export declare function setCurrentTurnChannelId(channelId: string | null): void;
 export declare function setCurrentTurnIsOwnerForTools(value: boolean): void;
 export declare function setCurrentTurnOwnerSignalForTools(signal: OwnerSignal): void;
-export declare function consumeCurrentTurnSender(): string | null;
-export declare function consumeCurrentTurnSenderAddress(): string | null;
 export declare function getCurrentTurnChannelId(): string | null;
 export declare function getCurrentTurnIsOwnerNonConsuming(): boolean;
 export declare function getCurrentTurnOwnerSignal(): OwnerSignal;

package/dist/turn-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-context.d.ts","sourceRoot":"","sources":["../src/turn-context.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAyC5D,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEjE;AAUD,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAExE;AAOD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEtE;AAOD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAElE;AAUD,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAE3E;AAUD,wBAAgB,wBAAwB,IAAI,MAAM,GAAG,IAAI,CAIxD;AAGD,wBAAgB,+BAA+B,IAAI,MAAM,GAAG,IAAI,CAI/D;AAMD,wBAAgB,uBAAuB,IAAI,MAAM,GAAG,IAAI,CAEvD;AAMD,wBAAgB,iCAAiC,IAAI,OAAO,CAE3D;AAOD,wBAAgB,yBAAyB,IAAI,WAAW,CAEvD"}
+{"version":3,"file":"turn-context.d.ts","sourceRoot":"","sources":["../src/turn-context.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAqC5D,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEtE;AAOD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAElE;AAUD,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAE3E;AAUD,wBAAgB,uBAAuB,IAAI,MAAM,GAAG,IAAI,CAEvD;AAMD,wBAAgB,iCAAiC,IAAI,OAAO,CAE3D;AAOD,wBAAgB,yBAAyB,IAAI,WAAW,CAEvD"}

package/dist/turn-context.js

@@ -1,14 +1,6 @@
-let currentTurnSender = null;
-let currentTurnSenderAddress = null;
 let currentTurnChannelId = null;
 let currentTurnIsOwner = false;
 let currentTurnOwnerSignalForTools = null;
-export function setCurrentTurnSender(contact) {
-    currentTurnSender = contact;
-}
-export function setCurrentTurnSenderAddress(address) {
-    currentTurnSenderAddress = address;
-}
 export function setCurrentTurnChannelId(channelId) {
     currentTurnChannelId = channelId;
 }
@@ -18,16 +10,6 @@ export function setCurrentTurnIsOwnerForTools(value) {
 export function setCurrentTurnOwnerSignalForTools(signal) {
     currentTurnOwnerSignalForTools = signal;
 }
-export function consumeCurrentTurnSender() {
-    const value = currentTurnSender;
-    currentTurnSender = null;
-    return value;
-}
-export function consumeCurrentTurnSenderAddress() {
-    const value = currentTurnSenderAddress;
-    currentTurnSenderAddress = null;
-    return value;
-}
 export function getCurrentTurnChannelId() {
     return currentTurnChannelId;
 }