@jungjaehoon/mama-os 0.53.1 → 0.58.0

package/dist/connectors/discord/index.js

@@ -5,6 +5,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiscordConnector = void 0;
+const connector_state_js_1 = require("../framework/connector-state.js");
+const MAX_MESSAGE_PAGES_PER_CHANNEL = 20;
 class DiscordConnector {
     name = 'discord';
     type = 'api';
@@ -12,18 +14,28 @@ class DiscordConnector {
     token = null;
     baseUrl = 'https://discord.com/api/v10';
     lastMessageIdPerChannel = new Map();
+    pendingMessageIds = null;
+    pollCommitDeferred = false;
+    stateFilePath;
     lastPollTime = null;
     lastPollCount = 0;
     lastError = undefined;
-    constructor(config) {
+    constructor(config, stateFilePath) {
         this.config = config;
+        if (!stateFilePath.trim())
+            throw new Error('Discord state file path is required');
+        this.stateFilePath = stateFilePath;
     }
     async init() {
-        const token = this.config.auth.token ?? process.env[this.config.auth.tokenName ?? 'DISCORD_BOT_TOKEN'];
+        if (this.config.auth.tokenName !== 'MAMA_DISCORD_TOKEN') {
+            throw new Error('Discord auth.tokenName must be MAMA_DISCORD_TOKEN');
+        }
+        const token = process.env[this.config.auth.tokenName];
         if (!token) {
-            throw new Error('Discord bot token not found. Set DISCORD_BOT_TOKEN environment variable.');
+            throw new Error('Discord bot token not found. Run mama secret set MAMA_DISCORD_TOKEN.');
         }
         this.token = token;
+        this.loadState();
     }
     async dispose() {
         this.token = null;
@@ -41,7 +53,7 @@ class DiscordConnector {
         return [
             {
                 type: 'token',
-                tokenName: 'DISCORD_BOT_TOKEN',
+                tokenName: 'MAMA_DISCORD_TOKEN',
                 description: 'Discord Bot token from the Discord Developer Portal. Add the bot to your server with MESSAGE_CONTENT intent.',
             },
         ];
@@ -62,19 +74,23 @@ class DiscordConnector {
     async poll(since) {
         if (!this.token)
             throw new Error('DiscordConnector not initialized');
+        if (this.pendingMessageIds !== null)
+            throw new Error('Discord poll handoff is already active');
+        this.pendingMessageIds = new Map(this.lastMessageIdPerChannel);
         const items = [];
-        let hadError = false;
-        for (const [channelId, channelCfg] of Object.entries(this.config.channels)) {
-            if (channelCfg.role === 'ignore')
-                continue;
+        const channels = Object.entries(this.config.channels).filter(([, channel]) => channel.role !== 'ignore');
+        let failedChannels = 0;
+        let lastChannelError;
+        for (const [channelId] of channels) {
             try {
-                let afterId = this.lastMessageIdPerChannel.get(channelId);
-                let hasMore = true;
-                while (hasMore) {
+                const committedMessageId = this.lastMessageIdPerChannel.get(channelId);
+                let beforeId;
+                let reachedBoundary = false;
+                for (let page = 0; page < MAX_MESSAGE_PAGES_PER_CHANNEL; page += 1) {
                     const url = new URL(`${this.baseUrl}/channels/${channelId}/messages`);
                     url.searchParams.set('limit', '100');
-                    if (afterId)
-                        url.searchParams.set('after', afterId);
+                    if (beforeId)
+                        url.searchParams.set('before', beforeId);
                     const controller = new AbortController();
                     const timeout = setTimeout(() => controller.abort(), 30_000);
                     let res;
@@ -88,14 +104,26 @@ class DiscordConnector {
                         clearTimeout(timeout);
                     }
                     if (!res.ok) {
-                        hadError = true;
-                        this.lastError = `Channel ${channelId}: HTTP ${res.status}`;
-                        break;
+                        throw new Error(`channel ${channelId} page ${page + 1} HTTP ${res.status}`);
                     }
                     const messages = (await res.json());
                     // Discord returns newest-first; reverse to get ascending order
-                    const sorted = [...messages].reverse();
+                    const sorted = [...messages].sort((left, right) => {
+                        const leftId = BigInt(left.id);
+                        const rightId = BigInt(right.id);
+                        return leftId < rightId ? -1 : leftId > rightId ? 1 : 0;
+                    });
+                    const oldestId = sorted[0]?.id;
+                    const newestId = sorted.at(-1)?.id;
+                    if (newestId !== undefined) {
+                        const currentId = this.pendingMessageIds.get(channelId);
+                        if (currentId === undefined || BigInt(newestId) > BigInt(currentId)) {
+                            this.pendingMessageIds.set(channelId, newestId);
+                        }
+                    }
                     for (const msg of sorted) {
+                        if (committedMessageId && BigInt(msg.id) <= BigInt(committedMessageId))
+                            continue;
                         // Skip bot messages
                         if (msg.author.bot)
                             continue;
@@ -105,15 +133,10 @@ class DiscordConnector {
                         // Filter by since date
                         if (timestamp <= since)
                             continue;
-                        // Track the newest message id for next poll
-                        const current = this.lastMessageIdPerChannel.get(channelId);
-                        if (!current || msg.id > current) {
-                            this.lastMessageIdPerChannel.set(channelId, msg.id);
-                        }
                         items.push({
                             source: 'discord',
                             sourceId: `${channelId}:${msg.id}`,
-                            channel: channelCfg.name ?? channelId,
+                            channel: channelId,
                             author: msg.author.username,
                             content: msg.content,
                             timestamp,
@@ -125,25 +148,80 @@ class DiscordConnector {
                             },
                         });
                     }
-                    hasMore = messages.length === 100;
-                    if (sorted.length > 0) {
-                        afterId = sorted[sorted.length - 1].id;
+                    if (messages.length < 100 || oldestId === undefined) {
+                        reachedBoundary = true;
+                        break;
+                    }
+                    if (beforeId === oldestId) {
+                        throw new Error(`channel ${channelId} pagination repeated before cursor at page ${page + 1}`);
                     }
+                    if (committedMessageId && BigInt(oldestId) <= BigInt(committedMessageId)) {
+                        reachedBoundary = true;
+                        break;
+                    }
+                    if (new Date(sorted[0].timestamp) <= since) {
+                        reachedBoundary = true;
+                        break;
+                    }
+                    beforeId = oldestId;
+                }
+                if (!reachedBoundary) {
+                    throw new Error(`channel ${channelId} page cap (${MAX_MESSAGE_PAGES_PER_CHANNEL}) reached`);
                 }
             }
-            catch (err) {
-                hadError = true;
-                this.lastError = err instanceof Error ? err.message : String(err);
+            catch (error) {
+                failedChannels += 1;
+                lastChannelError = error instanceof Error ? error.message : String(error);
             }
         }
+        if (failedChannels > 0) {
+            this.lastError = `Discord poll failed for ${failedChannels} of ${channels.length} configured channels; last error: ${lastChannelError}`;
+            this.lastPollTime = new Date();
+            this.lastPollCount = items.length;
+            if (!this.pollCommitDeferred)
+                this.abortPollHandoff();
+            throw new Error(this.lastError);
+        }
         items.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
         this.lastPollTime = new Date();
         this.lastPollCount = items.length;
-        // lastError was set in catch blocks; clear only if no error occurred this pass
-        if (!hadError)
-            this.lastError = undefined;
+        this.lastError = undefined;
+        if (!this.pollCommitDeferred)
+            this.commitPoll();
         return items;
     }
+    loadState() {
+        const state = (0, connector_state_js_1.readConnectorState)(this.stateFilePath, (value) => {
+            if (!value || typeof value !== 'object' || Array.isArray(value)) {
+                throw new Error('Discord connector state must contain an object');
+            }
+            const entries = Object.entries(value);
+            if (entries.some(([, id]) => typeof id !== 'string' || id === '')) {
+                throw new Error('Discord connector state must contain nonblank message ids');
+            }
+            return Object.fromEntries(entries);
+        });
+        if (state !== undefined)
+            this.lastMessageIdPerChannel = new Map(Object.entries(state));
+    }
+    commitPoll() {
+        if (this.pendingMessageIds === null)
+            throw new Error('Discord poll state is unavailable to commit');
+        (0, connector_state_js_1.writeConnectorState)(this.stateFilePath, Object.fromEntries(this.pendingMessageIds));
+        this.lastMessageIdPerChannel = this.pendingMessageIds;
+        this.pendingMessageIds = null;
+        this.pollCommitDeferred = false;
+    }
+    beginPollHandoff() {
+        if (this.pollCommitDeferred || this.pendingMessageIds !== null) {
+            throw new Error('Discord poll handoff is already active');
+        }
+        this.pollCommitDeferred = true;
+    }
+    abortPollHandoff() {
+        this.pendingMessageIds = null;
+        this.pollCommitDeferred = false;
+    }
 }
 exports.DiscordConnector = DiscordConnector;
 //# sourceMappingURL=index.js.map

package/dist/connectors/discord/index.js.map

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

package/dist/connectors/drive/index.d.ts

@@ -1,6 +1,6 @@
 /**
  * DriveConnector — polls Google Drive changes via the gws CLI tool.
- * Uses short synchronous gws checks during setup and asynchronous calls while polling.
+ * Uses argv-based asynchronous gws CLI calls.
  * Emits file_change NormalizedItems for files modified in configured folders.
  */
 import type { AuthRequirement, ConnectorConfig, ConnectorHealth, IConnector, NormalizedItem } from '../framework/types.js';
@@ -11,13 +11,15 @@ export declare class DriveConnector implements IConnector {
     private lastPollTime;
     private lastPollCount;
     private lastError;
-    /** Stored page tokens per poll session (single global token for Drive changes API) */
     private pageTokens;
-    private readonly stateFilePath;
-    constructor(config: ConnectorConfig);
+    private fileChannels;
+    private pendingPageTokens;
+    private pendingFileChannels;
+    private pollCommitDeferred;
+    private stateFilePath;
+    constructor(config: ConnectorConfig, stateFilePath: string);
     init(): Promise<void>;
     private loadState;
-    private saveState;
     dispose(): Promise<void>;
     healthCheck(): Promise<ConnectorHealth>;
     getAuthRequirements(): AuthRequirement[];
@@ -38,5 +40,8 @@ export declare class DriveConnector implements IConnector {
      */
     private pollDrive;
     poll(_since: Date): Promise<NormalizedItem[]>;
+    commitPoll(): void;
+    beginPollHandoff(): void;
+    abortPollHandoff(): void;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/connectors/drive/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/drive/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAgC/B,qBAAa,cAAe,YAAW,UAAU;IAC/C,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAE/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAiC;IAElD,sFAAsF;IACtF,OAAO,CAAC,UAAU,CAAkC;IAEpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAM5B;gBAEU,MAAM,EAAE,eAAe;IAI7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B,OAAO,CAAC,SAAS;IAajB,OAAO,CAAC,SAAS;IAQX,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IAWlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAStC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAW3B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAWzB;;;OAGG;YACW,SAAS;IA2HjB,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAwCpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/drive/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAoC/B,qBAAa,cAAe,YAAW,UAAU;IAC/C,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAE/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAiC;IAElD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,iBAAiB,CAAoC;IAC7D,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,aAAa,CAAS;gBAElB,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM;IAMpD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B,OAAO,CAAC,SAAS;IAwBX,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IAWlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAStC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAW3B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAWzB;;;OAGG;YACW,SAAS;IAgIjB,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAkDnD,UAAU,IAAI,IAAI;IAelB,gBAAgB,IAAI,IAAI;IAWxB,gBAAgB,IAAI,IAAI;CAKzB"}