@masons/agent-network 0.6.20 → 0.6.21

package/dist/conversation-manager-context.js

@@ -0,0 +1,8 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+const conversationManagerContext = new AsyncLocalStorage();
+export function runWithConversationManagerContext(manager, callback) {
+    return conversationManagerContext.run(manager, callback);
+}
+export function getInvocationConversationManager() {
+    return conversationManagerContext.getStore() ?? null;
+}

package/dist/conversation-manager.d.ts

@@ -1,9 +1,25 @@
-import { type ConnectorClient } from "./connector-client.js";
-export interface SendResult {
-    status: "sent" | "failed";
+import { type ConnectorClient, type SendOutcomeUnknownReason } from "./connector-client.js";
+import { type SentMessage } from "./sent-message-buffer.js";
+import type { SendAckEvent } from "./types.js";
+export type SendResult = {
+    status: "sent";
+    messageId: string;
+    acknowledgementStatus: string;
+    messageRef?: string;
+    addressedTarget?: NonNullable<SendAckEvent["addressedTarget"]>;
+} | {
+    status: "unknown";
+    messageId: string;
+    attempts: 1;
+    retryable: false;
+    reason: SendOutcomeUnknownReason;
+    error: string;
+    errorCode: "SEND_OUTCOME_UNKNOWN";
+} | {
+    status: "failed";
     error?: string;
     errorCode?: string;
-}
+};
 export interface ConversationEntry {
     contact: string;
     address: string;
@@ -28,11 +44,16 @@ export interface InboundEnvelope {
 export declare const REPLY_CORRELATION_MAX_AGE_MS: number;
 export declare class ConversationManager {
     private readonly client;
+    private readonly sentMessageBuffer;
     private readonly conversations;
+    private readonly conversationAliases;
     private readonly pendingOutreach;
     constructor(client: ConnectorClient);
+    recordOutboundContext(peerAddress: string, content: string): void;
+    getRecentOutboundContext(peerAddress: string): SentMessage[];
     send(contact: string, content: string, metadata?: Record<string, unknown>): Promise<SendResult>;
     registerInbound(contact: string, address: string): void;
+    refreshInboundPortrayal(contact: string, address: string): boolean;
     recordInboundEnvelope(address: string, envelope: Omit<InboundEnvelope, "receivedAt">): void;
     getContactByAddress(address: string): string | undefined;
     listConversations(): ConversationSummary[];
@@ -42,6 +63,10 @@ export declare class ConversationManager {
     resolveAddress(contact: string): string;
     private resolveContactForSend;
     extractHandle(address: string): string;
+    private resolveConversationAlias;
+    private recordConversationAlias;
+    private deleteConversationAliases;
+    private fileResolvedConversation;
     private ensureConversationEntry;
     _resetForTesting(): void;
 }

package/dist/conversation-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-manager.d.ts","sourceRoot":"","sources":["../src/conversation-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,uBAAuB,CAAC;AAa7E,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAchC,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;CACjC;AAuBD,MAAM,WAAW,eAAe;IAE9B,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AASD,eAAO,MAAM,4BAA4B,QAAc,CAAC;AA0CxD,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IAGzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;IAiBtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;gBAEzC,MAAM,EAAE,eAAe;IAsB7B,IAAI,CACR,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,OAAO,CAAC,UAAU,CAAC;IA0HtB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAYvD,qBAAqB,CACnB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,GAC5C,IAAI;IAmBP,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAkBxD,iBAAiB,IAAI,mBAAmB,EAAE;IAwB1C,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAiBzC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAoCzC,wBAAwB,IAAI,IAAI;IAuChC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAwBvC,OAAO,CAAC,qBAAqB;IAuC7B,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAQtC,OAAO,CAAC,uBAAuB;IAiC/B,gBAAgB,IAAI,IAAI;CAGzB"}
+{"version":3,"file":"conversation-manager.d.ts","sourceRoot":"","sources":["../src/conversation-manager.ts"],"names":[],"mappings":"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"}

package/dist/conversation-manager.js

@@ -1,6 +1,7 @@
 import createDebug from "debug";
-import { ConnectorError } from "./connector-client.js";
+import { ConnectorError, SendOutcomeUnknownError, } from "./connector-client.js";
 import { extractHandleFromAddress } from "./handle-utils.js";
+import { SentMessageBuffer } from "./sent-message-buffer.js";
 import { createReplyTraceMetadata, ensureTraceMetadata, } from "./trace-metadata.js";
 const dbg = createDebug("agent-network:conversation-manager");
 export const REPLY_CORRELATION_MAX_AGE_MS = 10 * 60_000;
@@ -19,17 +20,68 @@ function normalizeHandleContact(contact) {
     return contact.startsWith("@") ? contact.slice(1) : contact;
 }
 function isRoutableAddress(value) {
-    return (value.startsWith("mstps://") ||
-        value.startsWith("mstp://") ||
-        value.startsWith("passport:"));
+    return /^mstps?:\/\//i.test(value) || value.startsWith("passport:");
+}
+function isAddressedTargetAddress(value) {
+    for (let index = 0; index < value.length; index++) {
+        const codeUnit = value.charCodeAt(index);
+        if (codeUnit <= 0x1f || codeUnit === 0x7f)
+            return false;
+    }
+    if (!/^mstps?:\/\//i.test(value)) {
+        return false;
+    }
+    try {
+        const parsed = new URL(value);
+        return ((parsed.protocol === "mstp:" || parsed.protocol === "mstps:") &&
+            parsed.hostname.length > 0);
+    }
+    catch {
+        return false;
+    }
+}
+function isCanonicalResolvedNodeAddress(value) {
+    return /^mstps?:\/\/[a-z0-9.-]+(?::[0-9]+)?\/[a-z][a-z0-9_-]{2,14}$/.test(value);
+}
+function normalizedAddressedTarget(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value)) {
+        return undefined;
+    }
+    const candidate = value;
+    if (typeof candidate.address !== "string" ||
+        candidate.address.length === 0 ||
+        (candidate.basis !== "resolved" && candidate.basis !== "forwarded")) {
+        return undefined;
+    }
+    const validAddress = candidate.basis === "resolved"
+        ? isCanonicalResolvedNodeAddress(candidate.address)
+        : isAddressedTargetAddress(candidate.address);
+    if (!validAddress) {
+        return undefined;
+    }
+    return {
+        address: candidate.address,
+        basis: candidate.basis,
+    };
+}
+function normalizedMessageRef(value) {
+    return typeof value === "string" && value.length > 0 ? value : undefined;
 }
 export class ConversationManager {
     client;
+    sentMessageBuffer = new SentMessageBuffer();
     conversations = new Map();
+    conversationAliases = new Map();
     pendingOutreach = new Set();
     constructor(client) {
         this.client = client;
     }
+    recordOutboundContext(peerAddress, content) {
+        this.sentMessageBuffer.record(peerAddress, content);
+    }
+    getRecentOutboundContext(peerAddress) {
+        return this.sentMessageBuffer.getRecent(peerAddress);
+    }
     async send(contact, content, metadata) {
         const resolution = this.resolveContactForSend(contact);
         if (resolution.ambiguous) {
@@ -74,16 +126,45 @@ export class ConversationManager {
         }
         try {
             const ack = await this.client.send(address, content, "text", wireMetadata);
-            if (isRoutableAddress(address)) {
+            const addressedTarget = normalizedAddressedTarget(ack.addressedTarget);
+            const messageRef = normalizedMessageRef(ack.messageRef);
+            const resolvedAddress = addressedTarget?.basis === "resolved"
+                ? addressedTarget.address
+                : undefined;
+            if (resolvedAddress !== undefined) {
+                if (!isRoutableAddress(address)) {
+                    this.pendingOutreach.delete(normalizeHandleContact(address).toLowerCase());
+                }
+                this.fileResolvedConversation(address, resolvedAddress);
+            }
+            else if (isRoutableAddress(address)) {
                 this.ensureConversationEntry(this.extractHandle(address), address, "local");
             }
             else {
                 this.pendingOutreach.add(address.toLowerCase());
             }
             dbg("send contact=%s address=%s status=%s traceId=%s spanName=send", contact, address, ack.status, sendTraceId);
-            return { status: "sent" };
+            return {
+                status: "sent",
+                messageId: ack.messageId,
+                acknowledgementStatus: ack.status,
+                ...(messageRef !== undefined && { messageRef }),
+                ...(addressedTarget !== undefined && { addressedTarget }),
+            };
         }
         catch (err) {
+            if (err instanceof SendOutcomeUnknownError) {
+                dbg("send outcome unknown contact=%s messageId=%s reason=%s", contact, err.messageId, err.reason);
+                return {
+                    status: "unknown",
+                    messageId: err.messageId,
+                    attempts: err.attempts,
+                    retryable: err.retryable,
+                    reason: err.reason,
+                    error: err.message,
+                    errorCode: err.code,
+                };
+            }
             if (err instanceof ConnectorError) {
                 const message = formatErrorMessage(err.code, err.to ?? contact);
                 dbg("send failed contact=%s code=%s message=%s", contact, err.code, message);
@@ -98,8 +179,16 @@ export class ConversationManager {
         this.ensureConversationEntry(contact, address, "remote");
         dbg("registerInbound contact=%s address=%s", contact, address);
     }
+    refreshInboundPortrayal(contact, address) {
+        const entry = this.conversations.get(this.resolveConversationAlias(address));
+        if (!entry)
+            return false;
+        entry.contact = contact;
+        dbg("refreshInboundPortrayal contact=%s address=%s", contact, address);
+        return true;
+    }
     recordInboundEnvelope(address, envelope) {
-        const entry = this.conversations.get(address);
+        const entry = this.conversations.get(this.resolveConversationAlias(address));
         if (!entry) {
             dbg("recordInboundEnvelope no entry, skipped address=%s", address);
             return;
@@ -108,7 +197,7 @@ export class ConversationManager {
         dbg("recordInboundEnvelope address=%s messageId=%s correlationId=%s", address, envelope.messageId ?? "(absent)", envelope.correlationId ?? "(absent)");
     }
     getContactByAddress(address) {
-        const entry = this.conversations.get(address);
+        const entry = this.conversations.get(this.resolveConversationAlias(address));
         if (entry)
             return entry.contact;
         for (const [, e] of this.conversations) {
@@ -155,6 +244,7 @@ export class ConversationManager {
         for (const [address, entry] of this.conversations) {
             if (entry.ended) {
                 this.conversations.delete(address);
+                this.deleteConversationAliases(address);
                 count++;
             }
         }
@@ -167,7 +257,10 @@ export class ConversationManager {
     }
     resolveContactForSend(contact) {
         if (isRoutableAddress(contact)) {
-            return { address: contact, ambiguous: false };
+            return {
+                address: this.resolveConversationAlias(contact),
+                ambiguous: false,
+            };
         }
         const normalizedContact = normalizeHandleContact(contact);
         if (this.conversations.has(normalizedContact)) {
@@ -194,22 +287,77 @@ export class ConversationManager {
     extractHandle(address) {
         return extractHandleFromAddress(address);
     }
+    resolveConversationAlias(address) {
+        return this.conversationAliases.get(address) ?? address;
+    }
+    recordConversationAlias(aliasAddress, canonicalAddress) {
+        if (aliasAddress === canonicalAddress)
+            return;
+        this.conversationAliases.delete(canonicalAddress);
+        for (const [alias, target] of this.conversationAliases) {
+            if (target === aliasAddress) {
+                this.conversationAliases.set(alias, canonicalAddress);
+            }
+        }
+        this.conversationAliases.set(aliasAddress, canonicalAddress);
+    }
+    deleteConversationAliases(canonicalAddress) {
+        for (const [alias, target] of this.conversationAliases) {
+            if (target === canonicalAddress)
+                this.conversationAliases.delete(alias);
+        }
+    }
+    fileResolvedConversation(sentAddress, resolvedAddress) {
+        const prior = sentAddress !== resolvedAddress && isRoutableAddress(sentAddress)
+            ? this.conversations.get(sentAddress)
+            : undefined;
+        const canonical = this.conversations.get(resolvedAddress);
+        if (prior)
+            this.conversations.delete(sentAddress);
+        if (sentAddress !== resolvedAddress && isRoutableAddress(sentAddress)) {
+            this.recordConversationAlias(sentAddress, resolvedAddress);
+        }
+        if (!canonical && prior) {
+            this.conversations.set(resolvedAddress, {
+                ...prior,
+                address: resolvedAddress,
+                lastMessageAt: Date.now(),
+                ended: false,
+            });
+            return;
+        }
+        if (canonical) {
+            canonical.lastMessageAt = Date.now();
+            canonical.ended = false;
+            if (prior?.initiatedBy === "local")
+                canonical.initiatedBy = "local";
+            if (prior?.inboundEnvelope &&
+                (!canonical.inboundEnvelope ||
+                    prior.inboundEnvelope.receivedAt >
+                        canonical.inboundEnvelope.receivedAt)) {
+                canonical.inboundEnvelope = prior.inboundEnvelope;
+            }
+            return;
+        }
+        this.ensureConversationEntry(this.extractHandle(resolvedAddress), resolvedAddress, "local");
+    }
     ensureConversationEntry(contact, address, initiatedBy) {
-        if (!this.conversations.has(address)) {
-            const outreachKey = extractHandleFromAddress(address).toLowerCase();
+        const canonicalAddress = this.resolveConversationAlias(address);
+        if (!this.conversations.has(canonicalAddress)) {
+            const outreachKey = extractHandleFromAddress(canonicalAddress).toLowerCase();
             let origin = initiatedBy;
             if (origin === "remote" && this.pendingOutreach.delete(outreachKey)) {
                 origin = "local";
             }
-            this.conversations.set(address, {
+            this.conversations.set(canonicalAddress, {
                 contact,
-                address,
+                address: canonicalAddress,
                 lastMessageAt: Date.now(),
                 initiatedBy: origin,
             });
         }
         else {
-            const entry = this.conversations.get(address);
+            const entry = this.conversations.get(canonicalAddress);
             if (entry) {
                 entry.lastMessageAt = Date.now();
                 entry.ended = false;
@@ -218,5 +366,6 @@ export class ConversationManager {
     }
     _resetForTesting() {
         this.conversations.clear();
+        this.conversationAliases.clear();
     }
 }

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":"AAiBA,eAAO,MAAM,gBAAgB,0BAA0B,CAAC;AASxD,eAAO,MAAM,qBAAqB,iDACc,CAAC;AAEjD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB;AAMD,qBAAa,gBAAiB,SAAQ,KAAK;aAEvB,MAAM,EAAE,MAAM;aACd,IAAI,EAAE,MAAM;gBADZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EAC5B,OAAO,EAAE,MAAM;CAKlB;AAiBD,qBAAa,oBAAqB,SAAQ,KAAK;aAE3B,IAAI,EAAE,SAAS,GAAG,SAAS;aAE3B,MAAM,EAAE,MAAM;gBAFd,IAAI,EAAE,SAAS,GAAG,SAAS,EAE3B,MAAM,EAAE,MAAM;CAKjC;AAMD,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAQD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,UAAU,GAAG,UAAU,CAAC;IAEnC,QAAQ,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAEpC,MAAM,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE;QACX,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;KACzB,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,iBAAiB,GAAG,IAAI,CAAC;CACxC;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,KAAK,CAAC;QACjB,YAAY,EAAE,iBAAiB,CAAC;QAChC,MAAM,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM,CAAC;QACnD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;KAC1B,CAAC,CAAC;CACJ;AAyGD,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC,CAanB;AAYD,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,oBAAoB,EACzB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,CAAC,YAAY,GAAG,SAAS,CAAC,EAAE,CAAA;CAAE,GACvE,OAAO,CAAC,yBAAyB,CAAC,CAWpC;AAQD,wBAAsB,YAAY,CAChC,GAAG,EAAE,oBAAoB,EACzB,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,oBAAoB,CAAC,CAc/B;AAOD,wBAAsB,aAAa,CACjC,GAAG,EAAE,oBAAoB,EACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,qBAAqB,CAAC,CAUhC;AAOD,wBAAsB,cAAc,CAClC,GAAG,EAAE,oBAAoB,EACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,CAAC,CAUjC;AAQD,wBAAsB,aAAa,CACjC,GAAG,EAAE,oBAAoB,EACzB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAWhC;AAQD,wBAAsB,eAAe,CACnC,GAAG,EAAE,oBAAoB,EACzB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,uBAAuB,CAAC,CAMlC"}
+{"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"}