@amalgm/channels 0.1.1 → 0.1.3

package/dist/src/inbox/service.js

@@ -0,0 +1,56 @@
+import { ChannelsError } from '../errors.js';
+import { identifier } from '../validation.js';
+export function createMachineInboxService(repository, events, options = {}) {
+    const now = options.now ?? (() => new Date());
+    return Object.freeze({
+        for(principal) {
+            const scopes = new Set(principal.scopes);
+            if (!scopes.has('channels:receive')) {
+                throw new ChannelsError('forbidden', 'Missing scope: channels:receive');
+            }
+            const userId = identifier(principal.userId, 'principal.userId');
+            const computerId = principal.computerId
+                ? identifier(principal.computerId, 'principal.computerId')
+                : null;
+            if (!computerId)
+                throw new ChannelsError('forbidden', 'Machine identity is required');
+            return Object.freeze({
+                claim(input = {}) {
+                    const leaseSeconds = integer(input.leaseSeconds ?? 60, 30, 900, 'leaseSeconds');
+                    return repository.claim(userId, computerId, 1, leaseSeconds);
+                },
+                accept(message) {
+                    return repository.accept(userId, computerId, lease(message), now());
+                },
+                release(message, error) {
+                    return repository.release(userId, computerId, lease(message), bounded(error, 'error', 1, 500), now());
+                },
+                events(signal) {
+                    return events(userId, computerId, signal);
+                },
+            });
+        },
+    });
+}
+function lease(value) {
+    return Object.freeze({
+        id: identifier(value.id, 'message.id'),
+        leaseToken: identifier(value.leaseToken, 'message.leaseToken'),
+    });
+}
+function integer(value, minimum, maximum, name) {
+    if (!Number.isInteger(value) || value < minimum || value > maximum) {
+        throw new ChannelsError('validation', `${name} must be an integer from ${minimum} to ${maximum}`);
+    }
+    return value;
+}
+function bounded(value, name, minimum, maximum) {
+    if (typeof value !== 'string')
+        throw new ChannelsError('validation', `${name} must be a string`);
+    const clean = value.replace(/[\r\n]+/g, ' ').trim();
+    if (clean.length < minimum || clean.length > maximum) {
+        throw new ChannelsError('validation', `${name} must be ${minimum}-${maximum} characters`);
+    }
+    return clean;
+}
+//# sourceMappingURL=service.js.map

package/dist/src/inbox/service.js.map

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

package/dist/src/index.d.ts

@@ -1,7 +1,18 @@
 export * from './contract.js';
 export * from './errors.js';
+export * from './api-error.js';
 export * from './validation.js';
 export * from './service.js';
 export * from './worker.js';
 export * from './http.js';
 export * from './client.js';
+export * from './command-surface.js';
+export * from './email/notification.js';
+export * from './email/thread-token.js';
+export * from './email/inbound.js';
+export * from './email/system.js';
+export * from './inbox/contract.js';
+export * from './inbox/service.js';
+export * from './inbox/client.js';
+export * from './inbox/runner.js';
+export * from './inbox/events.js';

package/dist/src/index.js

@@ -1,8 +1,19 @@
 export * from './contract.js';
 export * from './errors.js';
+export * from './api-error.js';
 export * from './validation.js';
 export * from './service.js';
 export * from './worker.js';
 export * from './http.js';
 export * from './client.js';
+export * from './command-surface.js';
+export * from './email/notification.js';
+export * from './email/thread-token.js';
+export * from './email/inbound.js';
+export * from './email/system.js';
+export * from './inbox/contract.js';
+export * from './inbox/service.js';
+export * from './inbox/client.js';
+export * from './inbox/runner.js';
+export * from './inbox/events.js';
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC"}

package/dist/src/mcp.js

@@ -1,66 +1,34 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod/v3';
+import { channelsCommandDefinitions, createChannelsCommands } from './command-surface.js';
 const outputSchema = { result: z.unknown() };
 export function createChannelsMcpServer(channels) {
     const server = new McpServer({ name: 'amalgm-channels-mcp-server', version: '0.1.0' });
-    server.registerTool('amalgm_channels_notify_user', {
-        title: 'Notify current user',
-        description: 'Queue one durable notification to the authenticated Amalgm user. The caller cannot select another recipient. Supply an idempotency key when retrying the same logical message.',
-        inputSchema: {
-            message: z.string().min(1).max(4_000).describe('Notification text.'),
-            title: z.string().min(1).max(160).optional().describe('Short notification title.'),
-            channel: z.enum(['auto', 'email']).optional().describe('Delivery preference. Auto currently resolves to email.'),
-            idempotency_key: z.string().min(1).max(200).optional().describe('Stable key for safe retries of this exact notification.'),
-        },
-        outputSchema,
-        annotations: {
-            readOnlyHint: false,
-            destructiveHint: false,
-            idempotentHint: true,
-            openWorldHint: true,
-        },
-    }, async ({ message, title, channel, idempotency_key }) => result(await channels.notify({
-        message,
-        ...(title === undefined ? {} : { title }),
-        ...(channel === undefined ? {} : { channel }),
-        ...(idempotency_key === undefined ? {} : { idempotencyKey: idempotency_key }),
-    })));
-    server.registerTool('amalgm_channels_list_deliveries', {
-        title: 'List notification deliveries',
-        description: 'List the authenticated user\'s durable notification delivery history.',
-        inputSchema: {
-            status: z.enum(['pending', 'sending', 'delivered', 'failed']).optional(),
-            limit: z.number().int().min(1).max(100).optional(),
-            offset: z.number().int().min(0).optional(),
-        },
-        outputSchema,
-        annotations: readOnly(),
-    }, async ({ status, limit, offset }) => result(await channels.list({
-        ...(status === undefined ? {} : { status }),
-        ...(limit === undefined ? {} : { limit }),
-        ...(offset === undefined ? {} : { offset }),
-    })));
-    server.registerTool('amalgm_channels_get_delivery', {
-        title: 'Get notification delivery',
-        description: 'Get one durable notification delivery by id for the authenticated user.',
-        inputSchema: { delivery_id: z.string().min(1).max(200) },
-        outputSchema,
-        annotations: readOnly(),
-    }, async ({ delivery_id }) => result(await channels.get(delivery_id)));
+    const commands = createChannelsCommands(channels);
+    for (const definition of channelsCommandDefinitions) {
+        server.registerTool(definition.mcpName, {
+            title: definition.title,
+            description: definition.description,
+            inputSchema: definition.inputShape,
+            outputSchema,
+            annotations: definition.annotations,
+        }, async (input, extra) => {
+            const trustedSessionId = sessionId(extra._meta);
+            return result(await commands.execute(definition.name, input, trustedSessionId ? { sessionId: trustedSessionId } : {}));
+        });
+    }
     return server;
 }
+function sessionId(meta) {
+    if (!meta || typeof meta !== 'object' || Array.isArray(meta))
+        return undefined;
+    const value = meta['amalgm/sessionId'];
+    return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
 function result(value) {
     return {
         content: [{ type: 'text', text: JSON.stringify(value) }],
         structuredContent: { result: value },
     };
 }
-function readOnly() {
-    return {
-        readOnlyHint: true,
-        destructiveHint: false,
-        idempotentHint: true,
-        openWorldHint: false,
-    };
-}
 //# sourceMappingURL=mcp.js.map

package/dist/src/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/mcp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEpE,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAE1F,MAAM,YAAY,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;AAE7C,MAAM,UAAU,uBAAuB,CAAC,QAAkB;IACxD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACvF,MAAM,QAAQ,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IAElD,KAAK,MAAM,UAAU,IAAI,0BAA0B,EAAE,CAAC;QACpD,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE;YACtC,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,WAAW,EAAE,UAAU,CAAC,UAAU;YAClC,YAAY;YACZ,WAAW,EAAE,UAAU,CAAC,WAAW;SACpC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACxB,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAChD,OAAO,MAAM,CAAC,MAAM,QAAQ,CAAC,OAAO,CAClC,UAAU,CAAC,IAAI,EACf,KAAK,EACL,gBAAgB,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CACxD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,SAAS,CAAC,IAAa;IAC9B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC/E,MAAM,KAAK,GAAI,IAAgC,CAAC,kBAAkB,CAAC,CAAC;IACpE,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9E,CAAC;AAED,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;KACrC,CAAC;AACJ,CAAC"}

package/dist/src/service.js

@@ -1,14 +1,18 @@
 import { ChannelsError } from './errors.js';
-import { deliveryQuery, identifier, notification } from './validation.js';
+import { deliveryQuery, identifier, sendMessage } from './validation.js';
 export function createChannelsService(repository) {
     return Object.freeze({
         for(principal) {
             const userId = identifier(principal.userId, 'principal.userId');
             const scopes = new Set(principal.scopes);
             return Object.freeze({
-                async notify(input) {
+                async send(input, context = {}) {
                     requireScope(scopes, 'channels:send');
-                    return repository.enqueue(userId, notification(input));
+                    return repository.enqueue(userId, principal.computerId, sendMessage(input), Object.freeze({
+                        ...(context.sessionId === undefined
+                            ? {}
+                            : { sessionId: identifier(context.sessionId, 'context.sessionId') }),
+                    }));
                 },
                 async list(query) {
                     requireScope(scopes, 'channels:read');

package/dist/src/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE1E,MAAM,UAAU,qBAAqB,CAAC,UAA8B;IAClE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,CAAC,SAA2B;YAC7B,MAAM,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,SAAS,CAAC,MAAM,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK,CAAC,MAAM,CAAC,KAAwC;oBACnD,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBACtC,OAAO,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;gBACzD,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,KAAuC;oBAChD,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBACtC,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;gBACvD,CAAC;gBACD,KAAK,CAAC,GAAG,CAAC,UAAkB;oBAC1B,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBACtC,OAAO,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;gBACtE,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,MAA2B,EAAE,QAAgB;IACjE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,aAAa,CAAC,WAAW,EAAE,kBAAkB,QAAQ,EAAE,CAAC,CAAC;AAChG,CAAC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEzE,MAAM,UAAU,qBAAqB,CAAC,UAA8B;IAClE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,CAAC,SAA2B;YAC7B,MAAM,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,SAAS,CAAC,MAAM,CAAC,CAAC;YACjD,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,KAAK,CAAC,IAAI,CAAC,KAAsC,EAAE,UAA8B,EAAE;oBACjF,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBACtC,OAAO,UAAU,CAAC,OAAO,CACvB,MAAM,EACN,SAAS,CAAC,UAAU,EACpB,WAAW,CAAC,KAAK,CAAC,EAClB,MAAM,CAAC,MAAM,CAAC;wBACZ,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS;4BACjC,CAAC,CAAC,EAAE;4BACJ,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,CAAC;qBACvE,CAAC,CACH,CAAC;gBACJ,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,KAAuC;oBAChD,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBACtC,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;gBACvD,CAAC;gBACD,KAAK,CAAC,GAAG,CAAC,UAAkB;oBAC1B,YAAY,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBACtC,OAAO,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;gBACtE,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,MAA2B,EAAE,QAAgB;IACjE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,aAAa,CAAC,WAAW,EAAE,kBAAkB,QAAQ,EAAE,CAAC,CAAC;AAChG,CAAC"}

package/dist/src/validation.d.ts

@@ -1,4 +1,4 @@
-import type { ListDeliveries, NormalizedListDeliveries, NotifyUserInput } from './contract.js';
-export declare function notification(input: NotifyUserInput): Required<NotifyUserInput>;
+import type { ListDeliveries, NormalizedListDeliveries, NormalizedSendMessage, SendMessageInput } from './contract.js';
+export declare function sendMessage(input: SendMessageInput): NormalizedSendMessage;
 export declare function deliveryQuery(input?: ListDeliveries): NormalizedListDeliveries;
 export declare function identifier(value: string, name: string): string;

package/dist/src/validation.js

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import { ChannelsError } from './errors.js';
-const statuses = new Set(['pending', 'sending', 'delivered', 'failed']);
-export function notification(input) {
+const statuses = new Set(['pending', 'sending', 'sent', 'delivered', 'failed']);
+export function sendMessage(input) {
     const message = bounded(input.message, 'message', 1, 4_000);
     const title = input.title === undefined
         ? 'Amalgm reminder'

package/dist/src/validation.js.map

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

package/dist/src/worker.d.ts

@@ -1,4 +1,5 @@
 import type { DeliveryRepository, EmailProvider, RecipientDirectory } from './contract.js';
+import type { EmailThreadAddressing } from './email/thread-token.js';
 export interface ChannelsWorkerOptions {
     readonly batchSize?: number;
     readonly leaseSeconds?: number;
@@ -10,6 +11,8 @@ export declare class ChannelsWorker {
     private readonly repository;
     private readonly directory;
     private readonly email;
-    constructor(repository: DeliveryRepository, directory: RecipientDirectory, email: EmailProvider, options?: ChannelsWorkerOptions);
+    private readonly addressing;
+    constructor(repository: DeliveryRepository, directory: RecipientDirectory, email: EmailProvider, addressing: EmailThreadAddressing, options?: ChannelsWorkerOptions);
     drainOnce(): Promise<number>;
+    nextWakeAt(): Promise<Date | null>;
 }

package/dist/src/worker.js

@@ -1,15 +1,18 @@
+import { renderNotificationEmail } from './email/notification.js';
 export class ChannelsWorker {
     repository;
     directory;
     email;
+    addressing;
     #batchSize;
     #leaseSeconds;
     #now;
     #log;
-    constructor(repository, directory, email, options = {}) {
+    constructor(repository, directory, email, addressing, options = {}) {
         this.repository = repository;
         this.directory = directory;
         this.email = email;
+        this.addressing = addressing;
         this.#batchSize = options.batchSize ?? 20;
         this.#leaseSeconds = options.leaseSeconds ?? 60;
         this.#now = options.now ?? (() => new Date());
@@ -23,14 +26,30 @@ export class ChannelsWorker {
     async #deliver(delivery) {
         try {
             const to = await this.directory.emailForUser(delivery.userId);
+            const replyTo = await this.addressing.replyAddress(delivery.thread.id);
+            const references = [...delivery.thread.references];
+            if (delivery.thread.replyToMessageId && !references.includes(delivery.thread.replyToMessageId)) {
+                references.push(delivery.thread.replyToMessageId);
+            }
             const result = await this.email.send({
                 to,
-                subject: delivery.title ?? 'Amalgm reminder',
+                subject: delivery.thread.subject,
                 text: delivery.message,
-                idempotencyKey: delivery.idempotencyKey,
+                html: renderNotificationEmail(delivery.message),
+                idempotencyKey: `channel-delivery:${delivery.id}`,
+                replyTo,
+                headers: {
+                    'Message-ID': delivery.thread.messageId,
+                    ...(delivery.thread.replyToMessageId
+                        ? { 'In-Reply-To': delivery.thread.replyToMessageId }
+                        : {}),
+                    ...(references.length ? { References: references.join(' ') } : {}),
+                },
+            });
+            const marked = await this.repository.markSent(delivery, result.providerId, this.#now());
+            this.#log(marked ? 'delivery.sent' : 'delivery.lease_lost', {
+                deliveryId: delivery.id, attempts: delivery.attempts,
             });
-            await this.repository.complete(delivery, result.providerId, this.#now());
-            this.#log('delivery.completed', { deliveryId: delivery.id, attempts: delivery.attempts });
         }
         catch (error) {
             const message = safeError(error);
@@ -38,6 +57,9 @@ export class ChannelsWorker {
             this.#log('delivery.failed', { deliveryId: delivery.id, error: message });
         }
     }
+    nextWakeAt() {
+        return this.repository.nextWorkAt();
+    }
 }
 function safeError(error) {
     const message = error instanceof Error ? error.message : 'Provider delivery failed';

package/dist/src/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/worker.ts"],"names":[],"mappings":"AAcA,MAAM,OAAO,cAAc;IAON;IACA;IACA;IARV,UAAU,CAAS;IACnB,aAAa,CAAS;IACtB,IAAI,CAAa;IACjB,IAAI,CAA4C;IAEzD,YACmB,UAA8B,EAC9B,SAA6B,EAC7B,KAAoB,EACrC,UAAiC,EAAE;QAHlB,eAAU,GAAV,UAAU,CAAoB;QAC9B,cAAS,GAAT,SAAS,CAAoB;QAC7B,UAAK,GAAL,KAAK,CAAe;QAGrC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;QAChD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACpF,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACzE,OAAO,UAAU,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAyB;QACtC,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACnC,EAAE;gBACF,OAAO,EAAE,QAAQ,CAAC,KAAK,IAAI,iBAAiB;gBAC5C,IAAI,EAAE,QAAQ,CAAC,OAAO;gBACtB,cAAc,EAAE,QAAQ,CAAC,cAAc;aACxC,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;CACF;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC;IACpF,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/worker.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@amalgm/channels",
-  "version": "0.1.1",
-  "description": "Amalgm's SDK and hosted service for durable user notification delivery.",
+  "version": "0.1.3",
+  "description": "Amalgm's SDK and hosted service for durable bidirectional user channels.",
   "type": "module",
   "license": "UNLICENSED",
   "repository": {
@@ -20,11 +20,18 @@
       "types": "./dist/src/mcp.d.ts",
       "import": "./dist/src/mcp.js"
     },
+    "./cli": {
+      "types": "./dist/src/cli.d.ts",
+      "import": "./dist/src/cli.js"
+    },
     "./host": {
       "types": "./dist/host/index.d.ts",
       "import": "./dist/host/index.js"
     }
   },
+  "bin": {
+    "amalgm-channels": "dist/src/cli-main.js"
+  },
   "files": [
     "dist",
     "supabase",
@@ -34,10 +41,10 @@
   ],
   "scripts": {
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\"",
-    "build": "npm run clean && tsc -p tsconfig.build.json",
+    "build": "npm run clean && tsc -p tsconfig.build.json && tsx scripts/mark-executables.ts",
     "check": "tsx scripts/check-tree.ts && tsc -p tsconfig.json --noEmit",
     "test": "tsx --test test/*.test.ts",
-    "verify": "npm run check && npm test && npm run build",
+    "verify": "npm run check && npm test && npm run build && tsx scripts/check-cli-artifact.ts",
     "prepack": "npm run build",
     "start": "node dist/host/main.js"
   },
@@ -45,7 +52,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@amalgm/core": "0.4.4",
+    "@amalgm/core": "0.4.6",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "@supabase/supabase-js": "2.57.4",
     "jose": "^6.1.0",

package/skills/channels/SKILL.md

@@ -1,29 +1,29 @@
 ---
 name: amalgm-channels
-description: Send a durable notification to the current Amalgm user or inspect their delivery history through the Channels tools.
+description: Deliberately send one discrete message to the current Amalgm user over a selected external channel.
 ---
 
 # Amalgm Channels
 
-Use Channels when the user asks to be notified, reminded, emailed, or contacted
-by an automation. Channels always addresses the authenticated current user. Do
-not ask for or pass their email address.
+Use Channels when the user asks to be notified, reminded, emailed, or contacted,
+or when an inbound channel message requires a deliberate reply. Channels always
+addresses the authenticated current user. Do not ask for or pass their email
+address.
 
 ## Send
 
-Call `amalgm_channels_notify_user` with concise `message` text. Add a short
-`title` when it improves recognition. Use `channel: auto` unless the user
-explicitly asks for email.
+Call the one tool, `amalgm_channels_send`, with concise `message` text and the
+selected `channel`. Email is currently the supported channel. Add a short
+`title` when it improves recognition.
+
+Ordinary assistant output is local and is never delivered through Channels.
+After finishing inbound work, explicitly call the send tool for each complete
+message that should reach the user. Never use it to stream progress fragments.
 
 When the notification belongs to an automation run, always pass that durable
 run id as `idempotency_key`. Retrying the same run will then return the original
 delivery instead of sending twice.
 
 The returned `pending` state means the message is durably queued, not yet
-delivered. Use `amalgm_channels_get_delivery` if confirmed delivery matters.
-
-## Inspect
-
-Use `amalgm_channels_list_deliveries` for history and status filtering. Delivery
-records expose content, attempts, safe provider status, and timestamps; they do
-not expose recipient coordinates or provider credentials.
+delivered. The tool cannot select another recipient, session, or provider
+credential.