@cogitator-ai/channels 0.2.4 → 0.3.0

package/dist/middleware/auto-extract.d.ts

@@ -24,12 +24,14 @@ export interface AutoExtractConfig {
         set(key: string, value: string): Promise<void>;
     };
     coreFactPatterns?: Record<string, RegExp>;
+    onError?: (error: Error) => void;
 }
 export declare class AutoExtractMiddleware implements GatewayMiddleware {
     private config;
     readonly name = "auto-extract";
     constructor(config: AutoExtractConfig);
     handle(msg: ChannelMessage, _ctx: MiddlewareContext, next: () => Promise<void>): Promise<void>;
+    private resolveNodeId;
     private extractAndStore;
 }
 export declare function autoExtract(config: AutoExtractConfig): GatewayMiddleware;

package/dist/middleware/auto-extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-extract.d.ts","sourceRoot":"","sources":["../../src/middleware/auto-extract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;IACH,SAAS,EAAE,KAAK,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QAAE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;IAC/D,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC3C;AAED,qBAAa,qBAAsB,YAAW,iBAAiB;IAGjD,OAAO,CAAC,MAAM;IAF1B,QAAQ,CAAC,IAAI,kBAAkB;gBAEX,MAAM,EAAE,iBAAiB;IAEvC,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,iBAAiB,EACvB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;YAUF,eAAe;CAwD9B;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAExE"}
+{"version":3,"file":"auto-extract.d.ts","sourceRoot":"","sources":["../../src/middleware/auto-extract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;IACH,SAAS,EAAE,KAAK,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QAAE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,CAAC;IAC/D,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAoCD,qBAAa,qBAAsB,YAAW,iBAAiB;IAGjD,OAAO,CAAC,MAAM;IAF1B,QAAQ,CAAC,IAAI,kBAAkB;gBAEX,MAAM,EAAE,iBAAiB;IAEvC,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,iBAAiB,EACvB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;YAYF,aAAa;YASb,eAAe;CAiF9B;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAExE"}

package/dist/middleware/auto-extract.js

@@ -1,3 +1,33 @@
+const ENTITY_TYPES = new Set([
+    'person',
+    'organization',
+    'location',
+    'concept',
+    'event',
+    'object',
+    'custom',
+]);
+const RELATION_TYPES = new Set([
+    'knows',
+    'works_at',
+    'located_in',
+    'part_of',
+    'related_to',
+    'created_by',
+    'belongs_to',
+    'associated_with',
+    'causes',
+    'precedes',
+    'custom',
+]);
+function toEntityType(type) {
+    const normalized = type.toLowerCase();
+    return ENTITY_TYPES.has(normalized) ? normalized : 'custom';
+}
+function toRelationType(type) {
+    const normalized = type.toLowerCase();
+    return RELATION_TYPES.has(normalized) ? normalized : 'custom';
+}
 export class AutoExtractMiddleware {
     config;
     name = 'auto-extract';
@@ -6,59 +36,93 @@ export class AutoExtractMiddleware {
     }
     async handle(msg, _ctx, next) {
         await next();
-        if (msg.text) {
+        if (msg.text?.trim()) {
             void this.extractAndStore(msg.text).catch((err) => {
-                console.error('[auto-extract] Error:', err);
+                const error = err instanceof Error ? err : new Error(String(err));
+                if (this.config.onError)
+                    this.config.onError(error);
+                else
+                    console.error('[auto-extract] Error:', error.message);
             });
         }
     }
+    async resolveNodeId(name, known) {
+        const cached = known.get(name.toLowerCase());
+        if (cached)
+            return cached;
+        const found = await this.config.graphAdapter.getNodeByName(this.config.agentId, name);
+        if (!found.success || !found.data)
+            return null;
+        known.set(name.toLowerCase(), found.data.id);
+        return found.data.id;
+    }
     async extractAndStore(text) {
         const { extractor, graphAdapter, agentId } = this.config;
         const result = await extractor.extract(text);
+        const known = new Map();
         for (const entity of result.entities) {
             const existing = await graphAdapter.getNodeByName(agentId, entity.name);
             if (existing.success && existing.data) {
+                known.set(entity.name.toLowerCase(), existing.data.id);
                 if (entity.confidence > existing.data.confidence) {
                     await graphAdapter.updateNode(existing.data.id, {
                         confidence: entity.confidence,
-                        description: entity.description,
+                        ...(entity.description ? { description: entity.description } : {}),
                     });
                 }
+                continue;
             }
-            else {
-                await graphAdapter.addNode({
-                    agentId,
-                    name: entity.name,
-                    type: entity.type,
-                    description: entity.description,
-                    confidence: entity.confidence,
-                    source: 'extracted',
-                    aliases: [],
-                    properties: {},
-                    metadata: {},
-                });
+            const rawType = entity.type;
+            const type = toEntityType(rawType);
+            const created = await graphAdapter.addNode({
+                agentId,
+                name: entity.name,
+                type,
+                description: entity.description,
+                confidence: entity.confidence,
+                source: 'extracted',
+                aliases: [],
+                properties: type === 'custom' && rawType ? { originalType: rawType } : {},
+                metadata: {},
+            });
+            if (created.success && created.data) {
+                known.set(entity.name.toLowerCase(), created.data.id);
             }
         }
         for (const relation of result.relations) {
-            const fromNode = await graphAdapter.getNodeByName(agentId, relation.from);
-            const toNode = await graphAdapter.getNodeByName(agentId, relation.to);
-            if (fromNode.success && fromNode.data && toNode.success && toNode.data) {
-                await graphAdapter.addEdge({
-                    agentId,
-                    sourceNodeId: fromNode.data.id,
-                    targetNodeId: toNode.data.id,
-                    type: relation.type,
-                    confidence: relation.confidence,
-                    source: 'extracted',
-                    weight: 1.0,
-                    bidirectional: false,
-                    properties: {},
-                    metadata: {},
-                });
+            const sourceNodeId = await this.resolveNodeId(relation.from, known);
+            const targetNodeId = await this.resolveNodeId(relation.to, known);
+            if (!sourceNodeId || !targetNodeId)
+                continue;
+            const type = toRelationType(relation.type);
+            const label = type === 'custom' ? relation.type : undefined;
+            const between = await graphAdapter.getEdgesBetween(sourceNodeId, targetNodeId);
+            const duplicate = between.success
+                ? between.data.find((edge) => edge.type === type && edge.label === label)
+                : undefined;
+            if (duplicate) {
+                if (relation.confidence > duplicate.confidence) {
+                    await graphAdapter.updateEdge(duplicate.id, { confidence: relation.confidence });
+                }
+                continue;
             }
+            await graphAdapter.addEdge({
+                agentId,
+                sourceNodeId,
+                targetNodeId,
+                type,
+                ...(label ? { label } : {}),
+                confidence: relation.confidence,
+                source: 'extracted',
+                weight: 1.0,
+                bidirectional: false,
+                properties: {},
+                metadata: {},
+            });
         }
         if (this.config.coreFacts && this.config.coreFactPatterns) {
             for (const [key, pattern] of Object.entries(this.config.coreFactPatterns)) {
+                pattern.lastIndex = 0;
                 const match = pattern.exec(text);
                 if (match?.[1]) {
                     await this.config.coreFacts.set(key, match[1].trim());

package/dist/middleware/auto-extract.js.map

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

package/dist/middleware/dm-policy.d.ts

@@ -10,6 +10,7 @@ export interface DmPolicyConfig {
     groupAllowlist?: string[];
     ownerIds?: Record<string, string>;
     onPairingRequest?: (userId: string, code: string) => void;
+    onStoreError?: (error: Error) => void;
 }
 export declare class DmPolicyMiddleware implements GatewayMiddleware {
     readonly name = "dm-policy";
@@ -23,6 +24,7 @@ export declare class DmPolicyMiddleware implements GatewayMiddleware {
     private readonly groupAllowlist;
     private readonly ownerKeys;
     private readonly onPairingRequest?;
+    private readonly onStoreError?;
     constructor(config: DmPolicyConfig);
     handle(msg: ChannelMessage, ctx: MiddlewareContext, next: () => Promise<void>): Promise<void>;
     isApproved(channelType: string, userId: string): boolean;
@@ -31,7 +33,6 @@ export declare class DmPolicyMiddleware implements GatewayMiddleware {
     private checkGroupAccess;
     private handlePairingRequest;
     private handleApproval;
-    private findPendingByUser;
     private loadStore;
     private saveStore;
 }

package/dist/middleware/dm-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dm-policy.d.ts","sourceRoot":"","sources":["../../src/middleware/dm-policy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGhG,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,UAAU,CAAC;AAEzE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAChD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3D;AAkBD,qBAAa,kBAAmB,YAAW,iBAAiB;IAC1D,QAAQ,CAAC,IAAI,eAAe;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAe;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAyC;gBAE/D,MAAM,EAAE,cAAc;IAyB5B,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;IA8ChB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAKxD,gBAAgB,IAAI,SAAS,MAAM,EAAE;IAIrC,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,gBAAgB;YAWV,oBAAoB;YA+BpB,cAAc;IAuB5B,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,SAAS;CAalB;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,iBAAiB,CAElE"}
+{"version":3,"file":"dm-policy.d.ts","sourceRoot":"","sources":["../../src/middleware/dm-policy.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAUhG,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,UAAU,CAAC;AAEzE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAChD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACvC;AAWD,qBAAa,kBAAmB,YAAW,iBAAiB;IAC1D,QAAQ,CAAC,IAAI,eAAe;IAC5B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAe;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAyC;IAC3E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAyB;gBAE3C,MAAM,EAAE,cAAc;IA0B5B,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;IA8ChB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAKxD,gBAAgB,IAAI,SAAS,MAAM,EAAE;IAIrC,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,gBAAgB;YAWV,oBAAoB;YAiCpB,cAAc;IAkB5B,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,SAAS;CAmBlB;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,iBAAiB,CAElE"}

package/dist/middleware/dm-policy.js

@@ -1,8 +1,7 @@
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'node:fs';
-import { dirname } from 'node:path';
-import { join } from 'node:path';
+import { readFileSync, writeFileSync, mkdirSync, existsSync, renameSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import { homedir } from 'node:os';
-import { customAlphabet } from 'nanoid';
+import { findPendingByUser, generatePairingCode, isPairCommand, parsePairCommand, prunePending, } from './pairing-codes.js';
 const DEFAULT_STORE_PATH = join(homedir(), '.cogitator', 'dm-allowlist.json');
 const DEFAULT_PAIRING_CODE_LENGTH = 6;
 const DEFAULT_PAIRING_EXPIRES_MS = 300_000;
@@ -18,6 +17,7 @@ export class DmPolicyMiddleware {
     groupAllowlist;
     ownerKeys = new Set();
     onPairingRequest;
+    onStoreError;
     constructor(config) {
         this.mode = config.mode;
         this.storePath = config.storePath ?? DEFAULT_STORE_PATH;
@@ -26,6 +26,7 @@ export class DmPolicyMiddleware {
         this.groupPolicy = config.groupPolicy ?? 'open';
         this.groupAllowlist = new Set(config.groupAllowlist ?? []);
         this.onPairingRequest = config.onPairingRequest;
+        this.onStoreError = config.onStoreError;
         if (config.ownerIds) {
             for (const [channelType, ownerId] of Object.entries(config.ownerIds)) {
                 this.ownerKeys.add(`${channelType}:${ownerId}`);
@@ -50,7 +51,7 @@ export class DmPolicyMiddleware {
             return;
         }
         if (isOwner) {
-            if (this.mode === 'pairing' && msg.text.startsWith('/pair ')) {
+            if (this.mode === 'pairing' && isPairCommand(msg.text)) {
                 await this.handleApproval(msg, ctx);
                 return;
             }
@@ -101,47 +102,37 @@ export class DmPolicyMiddleware {
         }
     }
     async handlePairingRequest(msg, ctx, userKey) {
-        const existing = this.findPendingByUser(userKey);
-        if (existing && existing.expiresAt > Date.now()) {
+        const now = Date.now();
+        prunePending(this.pending, now);
+        const existing = findPendingByUser(this.pending, userKey);
+        if (existing) {
             await ctx.channel.sendText(msg.channelId, `Waiting for approval. Your code: \`${existing.code}\``);
             return;
         }
-        const genCode = customAlphabet('ABCDEFGHJKLMNPQRSTUVWXYZ23456789');
-        const code = genCode(this.codeLength);
+        const code = generatePairingCode(this.codeLength);
         this.pending.set(code, {
             code,
             userId: msg.userId,
             channelType: msg.channelType,
-            expiresAt: Date.now() + this.expiresMs,
+            expiresAt: now + this.expiresMs,
         });
         this.onPairingRequest?.(msg.userId, code);
         await ctx.channel.sendText(msg.channelId, `Hi! Ask the bot owner to approve you with: \`/pair ${code}\``);
     }
     async handleApproval(msg, ctx) {
-        const code = msg.text.replace('/pair ', '').trim().toUpperCase();
-        const pairing = this.pending.get(code);
-        if (!pairing) {
+        prunePending(this.pending, Date.now());
+        const code = parsePairCommand(msg.text);
+        const pairing = code ? this.pending.get(code) : undefined;
+        if (!code || !pairing) {
             await ctx.channel.sendText(msg.channelId, 'Invalid or expired pairing code.');
             return;
         }
-        if (pairing.expiresAt < Date.now()) {
-            this.pending.delete(code);
-            await ctx.channel.sendText(msg.channelId, 'Pairing code expired.');
-            return;
-        }
         const userKey = `${pairing.channelType}:${pairing.userId}`;
         this.approved.add(userKey);
         this.pending.delete(code);
         this.saveStore();
         await ctx.channel.sendText(msg.channelId, `User approved (${userKey}).`);
     }
-    findPendingByUser(userKey) {
-        for (const p of this.pending.values()) {
-            if (`${p.channelType}:${p.userId}` === userKey)
-                return p;
-        }
-        return undefined;
-    }
     loadStore() {
         try {
             if (!existsSync(this.storePath))
@@ -166,9 +157,17 @@ export class DmPolicyMiddleware {
             if (!existsSync(dir)) {
                 mkdirSync(dir, { recursive: true });
             }
-            writeFileSync(this.storePath, JSON.stringify(store, null, 2));
+            const tmpPath = `${this.storePath}.${process.pid}.tmp`;
+            writeFileSync(tmpPath, JSON.stringify(store, null, 2));
+            renameSync(tmpPath, this.storePath);
+        }
+        catch (err) {
+            const error = err instanceof Error ? err : new Error(String(err));
+            if (this.onStoreError)
+                this.onStoreError(error);
+            else
+                console.error('[dm-policy] Failed to persist allowlist:', error.message);
         }
-        catch { }
     }
 }
 export function dmPolicy(config) {

package/dist/middleware/dm-policy.js.map

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

package/dist/middleware/owner-commands.d.ts

@@ -7,7 +7,7 @@ export interface OwnerCommandsConfig {
     onStatus?: () => string;
     onSessions?: () => string;
     onUsers?: () => string;
-    onCompact?: (target: string) => Promise<string>;
+    onCompact?: (target: string, threadId: string) => Promise<string>;
     onModel?: (model: string, forUser?: string) => string;
     onRestart?: () => Promise<void>;
 }

package/dist/middleware/owner-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"owner-commands.d.ts","sourceRoot":"","sources":["../../src/middleware/owner-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEhG,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,YAAY,GAAG,QAAQ,CAAC;AAE7D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AA4FD,qBAAa,uBAAwB,YAAW,iBAAiB;IAMnD,OAAO,CAAC,QAAQ,CAAC,MAAM;IALnC,QAAQ,CAAC,IAAI,oBAAoB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;gBAEhB,MAAM,EAAE,mBAAmB;IAkBlD,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;IA8BhB,OAAO,CAAC,YAAY;CAQrB;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,iBAAiB,CAE5E"}
+{"version":3,"file":"owner-commands.d.ts","sourceRoot":"","sources":["../../src/middleware/owner-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEhG,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,YAAY,GAAG,QAAQ,CAAC;AAE7D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AA4FD,qBAAa,uBAAwB,YAAW,iBAAiB;IAMnD,OAAO,CAAC,QAAQ,CAAC,MAAM;IALnC,QAAQ,CAAC,IAAI,oBAAoB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAc;IACxC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAc;gBAEhB,MAAM,EAAE,mBAAmB;IAkBlD,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;IA+BhB,OAAO,CAAC,YAAY;CAQrB;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,iBAAiB,CAE5E"}

package/dist/middleware/owner-commands.js

@@ -19,9 +19,9 @@ const COMMANDS = {
     },
     '/compact': {
         level: 'owner',
-        handler: async (args, _msg, _ctx, config) => {
+        handler: async (args, _msg, ctx, config) => {
             if (config.onCompact) {
-                return config.onCompact(args.trim() || 'current');
+                return config.onCompact(args.trim() || 'current', ctx.threadId);
             }
             return 'No compact handler configured';
         },
@@ -92,14 +92,15 @@ export class OwnerCommandsMiddleware {
         }
     }
     async handle(msg, ctx, next) {
-        if (!msg.text.startsWith('/')) {
+        const text = msg.text.trim();
+        if (!text.startsWith('/')) {
             await next();
             return;
         }
-        const spaceIndex = msg.text.indexOf(' ');
-        const command = spaceIndex === -1 ? msg.text : msg.text.slice(0, spaceIndex);
-        const args = spaceIndex === -1 ? '' : msg.text.slice(spaceIndex + 1);
-        const def = COMMANDS[command];
+        const match = /^(\/[^\s@]+)(?:@\S+)?(?:\s+([\s\S]*))?$/.exec(text);
+        const command = match ? match[1].toLowerCase() : text;
+        const args = match?.[2] ?? '';
+        const def = Object.hasOwn(COMMANDS, command) ? COMMANDS[command] : undefined;
         if (!def) {
             await next();
             return;

package/dist/middleware/owner-commands.js.map

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

package/dist/middleware/pairing-codes.d.ts

@@ -0,0 +1,12 @@
+export interface PendingPairing {
+    code: string;
+    userId: string;
+    channelType: string;
+    expiresAt: number;
+}
+export declare function generatePairingCode(length: number): string;
+export declare function parsePairCommand(text: string): string | null;
+export declare function isPairCommand(text: string): boolean;
+export declare function prunePending(pending: Map<string, PendingPairing>, now: number): void;
+export declare function findPendingByUser(pending: Map<string, PendingPairing>, userKey: string): PendingPairing | undefined;
+//# sourceMappingURL=pairing-codes.d.ts.map

package/dist/middleware/pairing-codes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pairing-codes.d.ts","sourceRoot":"","sources":["../../src/middleware/pairing-codes.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG5D;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAIpF;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,EACpC,OAAO,EAAE,MAAM,GACd,cAAc,GAAG,SAAS,CAK5B"}

package/dist/middleware/pairing-codes.js

@@ -0,0 +1,26 @@
+import { customAlphabet } from 'nanoid';
+const PAIRING_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
+export function generatePairingCode(length) {
+    return customAlphabet(PAIRING_ALPHABET, length)();
+}
+export function parsePairCommand(text) {
+    const match = /^\/pair(?:@\S+)?\s+(\S+)\s*$/i.exec(text.trim());
+    return match ? match[1].toUpperCase() : null;
+}
+export function isPairCommand(text) {
+    return /^\/pair(?:@\S+)?(?:\s|$)/i.test(text.trim());
+}
+export function prunePending(pending, now) {
+    for (const [code, entry] of pending) {
+        if (entry.expiresAt <= now)
+            pending.delete(code);
+    }
+}
+export function findPendingByUser(pending, userKey) {
+    for (const p of pending.values()) {
+        if (`${p.channelType}:${p.userId}` === userKey)
+            return p;
+    }
+    return undefined;
+}
+//# sourceMappingURL=pairing-codes.js.map

package/dist/middleware/pairing-codes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pairing-codes.js","sourceRoot":"","sources":["../../src/middleware/pairing-codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC,MAAM,gBAAgB,GAAG,kCAAkC,CAAC;AAS5D,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,OAAO,cAAc,CAAC,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,MAAM,KAAK,GAAG,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAChE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAAoC,EAAE,GAAW;IAC5E,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,SAAS,IAAI,GAAG;YAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAAoC,EACpC,OAAe;IAEf,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,OAAO;YAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/middleware/pairing.d.ts

@@ -6,14 +6,14 @@ export interface PairingConfig {
 }
 export declare class PairingMiddleware implements GatewayMiddleware {
     readonly name = "pairing";
-    private approved;
-    private pending;
+    private readonly ownerKeys;
+    private readonly approved;
+    private readonly pending;
     private readonly codeLength;
     private readonly expiresIn;
     constructor(config: PairingConfig);
     handle(msg: ChannelMessage, ctx: MiddlewareContext, next: () => Promise<void>): Promise<void>;
     private handleApproval;
-    private findPendingByUser;
     isApproved(channelType: string, userId: string): boolean;
 }
 export declare function pairing(config: PairingConfig): GatewayMiddleware;

package/dist/middleware/pairing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pairing.d.ts","sourceRoot":"","sources":["../../src/middleware/pairing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGhG,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,qBAAa,iBAAkB,YAAW,iBAAiB;IACzD,QAAQ,CAAC,IAAI,aAAa;IAC1B,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAEvB,MAAM,EAAE,aAAa;IAS3B,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;YAmCF,cAAc;IAsB5B,OAAO,CAAC,iBAAiB;IAOzB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;CAGzD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,CAEhE"}
+{"version":3,"file":"pairing.d.ts","sourceRoot":"","sources":["../../src/middleware/pairing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAUhG,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,iBAAkB,YAAW,iBAAiB;IACzD,QAAQ,CAAC,IAAI,aAAa;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqC;IAC7D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAEvB,MAAM,EAAE,aAAa;IAW3B,MAAM,CACV,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACxB,OAAO,CAAC,IAAI,CAAC;YAsCF,cAAc;IAgB5B,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;CAGzD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,CAEhE"}

package/dist/middleware/pairing.js

@@ -1,6 +1,7 @@
-import { nanoid } from 'nanoid';
+import { findPendingByUser, generatePairingCode, isPairCommand, parsePairCommand, prunePending, } from './pairing-codes.js';
 export class PairingMiddleware {
     name = 'pairing';
+    ownerKeys = new Set();
     approved = new Set();
     pending = new Map();
     codeLength;
@@ -9,57 +10,49 @@ export class PairingMiddleware {
         this.codeLength = config.codeLength ?? 6;
         this.expiresIn = (config.expiresIn ?? 300) * 1000;
         for (const [channelType, ownerId] of Object.entries(config.ownerIds)) {
-            this.approved.add(`${channelType}:${ownerId}`);
+            const key = `${channelType}:${ownerId}`;
+            this.ownerKeys.add(key);
+            this.approved.add(key);
         }
     }
     async handle(msg, ctx, next) {
         const userKey = `${msg.channelType}:${msg.userId}`;
+        const now = Date.now();
+        prunePending(this.pending, now);
+        if (this.ownerKeys.has(userKey) && isPairCommand(msg.text)) {
+            await this.handleApproval(msg, ctx);
+            return;
+        }
         if (this.approved.has(userKey)) {
-            if (msg.text.startsWith('/pair ')) {
-                await this.handleApproval(msg, ctx);
-                return;
-            }
             await next();
             return;
         }
-        const existing = this.findPendingByUser(userKey);
-        if (existing && existing.expiresAt > Date.now()) {
+        const existing = findPendingByUser(this.pending, userKey);
+        if (existing) {
             await ctx.channel.sendText(msg.channelId, `Waiting for approval. Your code: \`${existing.code}\``);
             return;
         }
-        const code = nanoid(this.codeLength).toUpperCase();
+        const code = generatePairingCode(this.codeLength);
         this.pending.set(code, {
             code,
             userId: msg.userId,
             channelType: msg.channelType,
-            expiresAt: Date.now() + this.expiresIn,
+            expiresAt: now + this.expiresIn,
         });
         await ctx.channel.sendText(msg.channelId, `Hi! Ask the bot owner to approve you with: \`/pair ${code}\``);
     }
     async handleApproval(msg, ctx) {
-        const code = msg.text.replace('/pair ', '').trim().toUpperCase();
-        const pairing = this.pending.get(code);
-        if (!pairing) {
+        const code = parsePairCommand(msg.text);
+        const pairing = code ? this.pending.get(code) : undefined;
+        if (!code || !pairing) {
             await ctx.channel.sendText(msg.channelId, 'Invalid or expired pairing code.');
             return;
         }
-        if (pairing.expiresAt < Date.now()) {
-            this.pending.delete(code);
-            await ctx.channel.sendText(msg.channelId, 'Pairing code expired.');
-            return;
-        }
         const userKey = `${pairing.channelType}:${pairing.userId}`;
         this.approved.add(userKey);
         this.pending.delete(code);
         await ctx.channel.sendText(msg.channelId, `User approved (${userKey}).`);
     }
-    findPendingByUser(userKey) {
-        for (const p of this.pending.values()) {
-            if (`${p.channelType}:${p.userId}` === userKey)
-                return p;
-        }
-        return undefined;
-    }
     isApproved(channelType, userId) {
         return this.approved.has(`${channelType}:${userId}`);
     }