@canonmsg/agent-sdk 1.1.0 → 1.1.2

package/dist/canon-agent.d.ts

@@ -62,7 +62,6 @@ export declare class CanonAgent {
      */
     reachOut(card: ContactCardPayload, options?: ReachOutOptions): Promise<ReachOutResult>;
     private executeReachOut;
-    private openConversationAndMaybeMessage;
     start(): Promise<void>;
     createConversation(options: CreateConversationOptions): Promise<{
         conversationId: string;

package/dist/canon-agent.js

@@ -1,4 +1,4 @@
-import { CanonClient, createRuntimeStatePublisher, FINAL_MESSAGE_HANDOFF_MS, initRTDBAuth, rtdbRead, rtdbWrite, mergeWorkSessionContexts, normalizeTurnMetadata, } from '@canonmsg/core';
+import { CanonClient, createRuntimeStatePublisher, FINAL_MESSAGE_HANDOFF_MS, initRTDBAuth, rtdbRead, rtdbWrite, mergeWorkSessionContexts, normalizeTurnMetadata, reachOutToCanonContact, } from '@canonmsg/core';
 import { randomUUID } from 'node:crypto';
 import { AuthManager } from './auth.js';
 import { Debouncer } from './debouncer.js';
@@ -150,9 +150,9 @@ export class CanonAgent {
     async reachOut(card, options) {
         const targetUserId = card.userId;
         // Include the opener/request payloads in the dedupe key so two concurrent
-        // calls with different `text` or `requestMessage` don't silently collapse
+        // calls with different `text`, `requestMessage`, or setup choices don't silently collapse
         // and lose the second caller's intended side effect.
-        const inFlightKey = `${targetUserId}\u0000${options?.text ?? ''}\u0000${options?.requestMessage ?? ''}`;
+        const inFlightKey = `${targetUserId}\u0000${options?.text ?? ''}\u0000${options?.requestMessage ?? ''}\u0000${JSON.stringify(options?.sessionConfig ?? null)}`;
         const inFlight = this.reachOutInFlight.get(inFlightKey);
         if (inFlight)
             return inFlight;
@@ -163,45 +163,12 @@ export class CanonAgent {
         return promise;
     }
     async executeReachOut(targetUserId, options) {
-        const { admission } = await this.apiClient.resolveAdmission(targetUserId);
-        if (admission.state === 'allowed' && admission.canMessage) {
-            return this.openConversationAndMaybeMessage(targetUserId, options);
-        }
-        if (admission.state === 'pending-outbound') {
-            return { status: 'pending', requestId: admission.pendingRequestId ?? null };
-        }
-        if (admission.state === 'request-required' && admission.canRequestContact) {
-            const result = await this.apiClient.createContactRequest(targetUserId, options?.requestMessage ?? null);
-            // The server may report 'open' if the target's policy flipped between
-            // the resolveAdmission call and the request. No request doc was
-            // written — fall through to the messaging path so the caller's intent
-            // ("reach this user") is honored end-to-end. Without this, the caller
-            // would get { status: 'requested' } despite no request existing.
-            if (result.status === 'open') {
-                return this.openConversationAndMaybeMessage(targetUserId, options);
-            }
-            // 'duplicate' means a pending request already existed; surface as
-            // 'pending'. 'created' is the normal "request just landed" path.
-            if (result.status === 'duplicate') {
-                return { status: 'pending', requestId: result.requestId };
-            }
-            return { status: 'requested', requestId: result.requestId };
-        }
-        if (admission.state === 'blocked') {
-            return { status: 'blocked', reason: 'blocked' };
-        }
-        return { status: 'unavailable', reason: admission.state };
-    }
-    async openConversationAndMaybeMessage(targetUserId, options) {
-        const { conversationId } = await this.apiClient.createConversation({
-            type: 'direct',
+        return reachOutToCanonContact(this.apiClient, {
             targetUserId,
+            text: options?.text ?? null,
+            requestMessage: options?.requestMessage ?? null,
+            sessionConfig: options?.sessionConfig ?? null,
         });
-        if (options?.text) {
-            const { messageId } = await this.apiClient.sendMessage(conversationId, options.text);
-            return { status: 'messaged', conversationId, messageId };
-        }
-        return { status: 'messaged', conversationId };
     }
     async start() {
         if (this.running)

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-export type { AddMemberResult, AgentClientType, CanonRuntimeDescriptor, CanonMessage, CanonConversation, CanonContact, CanonContactRequest, CanonResolveAdmissionResult, ContactAddedPayload, ContactRemovedPayload, ContactSource, AgentContext, ResolvedAdmissionState, ResolvedAdmissionTargetSummary, ResolvedTargetAdmissionPayload, CanonResolvedWorkSession, CanonWorkSession, CanonWorkSessionContext, CanonWorkSessionConversationRole, CanonWorkSessionDisclosureMode, CanonWorkSessionParticipant, CanonWorkSessionStatus, CreateWorkSessionOptions, SendLinkedMessageOptions, SendLinkedMessageResult, SendMessageOptions, CreateConversationOptions, TurnLifecycleState, UpdateWorkSessionConversationOptions, } from '@canonmsg/core';
-import type { AddMemberResult, CanonMessage, CanonConversation, CanonRuntimeActionDispatch, CreateWorkSessionOptions, SendMessageOptions, UpdateWorkSessionConversationOptions } from '@canonmsg/core';
+export type { AddMemberResult, AgentClientType, CanonRuntimeDescriptor, CanonMessage, CanonConversation, CanonContact, CanonContactRequest, CanonResolveAdmissionResult, ContactAddedPayload, ContactRemovedPayload, ContactSource, AgentContext, ResolvedAdmissionState, ResolvedAdmissionTargetSummary, ResolvedTargetAdmissionPayload, CanonResolvedWorkSession, CanonWorkSession, CanonWorkSessionContext, CanonWorkSessionConversationRole, CanonWorkSessionDisclosureMode, CanonWorkSessionParticipant, CanonWorkSessionStatus, CreateWorkSessionOptions, SendLinkedMessageOptions, SendLinkedMessageResult, SendMessageOptions, SessionConfig, CreateConversationOptions, TurnLifecycleState, UpdateWorkSessionConversationOptions, } from '@canonmsg/core';
+import type { AddMemberResult, CanonMessage, CanonConversation, CanonRuntimeActionDispatch, CreateWorkSessionOptions, SendMessageOptions, SessionConfig, UpdateWorkSessionConversationOptions } from '@canonmsg/core';
 import type { MaterializeMediaOptions, MaterializedCanonAttachment, ReplyWithFileOptions, UploadMediaFileOptions } from './media.js';
 export interface ProgressMessageOptions extends SendMessageOptions {
     /**
@@ -165,6 +165,9 @@ export type ReachOutResult = {
 } | {
     status: 'pending';
     requestId: string | null;
+} | {
+    status: 'setup_required';
+    reason: string;
 } | {
     status: 'blocked' | 'unavailable';
     reason: string;
@@ -172,6 +175,8 @@ export type ReachOutResult = {
 export interface ReachOutOptions {
     /** Optional first message to send when admission is `allowed`. */
     text?: string;
-    /** Optional message to attach to the contact request when admission is `request-required`. */
+    /** Optional contact-request note. Defaults to `text` when admission is `request-required`. */
     requestMessage?: string;
+    /** Explicit session setup to use when the contact-card target is an agent. */
+    sessionConfig?: SessionConfig | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/agent-sdk",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Canon Agent SDK — build AI agents that participate in Canon conversations",
   "type": "module",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@canonmsg/core": "^0.15.0"
+    "@canonmsg/core": "^0.15.4"
   },
   "publishConfig": {
     "access": "public"