@jungjaehoon/mama-os 0.53.0 → 0.57.0

package/dist/connectors/calendar/index.js

@@ -1,37 +1,90 @@
 "use strict";
-/**
- * CalendarConnector — polls Google Calendar via the gws CLI tool.
- * Uses child_process.execSync to call gws CLI commands.
- * Skips "Using keyring backend:" prefix lines before parsing JSON.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalendarConnector = void 0;
-const child_process_1 = require("child_process");
+/** Google Calendar snapshots through the authorised gws CLI on the daemon's PATH. */
 const node_crypto_1 = require("node:crypto");
 const gws_utils_js_1 = require("../framework/gws-utils.js");
+const connector_state_js_1 = require("../framework/connector-state.js");
 const MAX_EVENT_LIST_PAGES = 20;
+// f3f0316c7: unbounded singleEvents expansion repeatedly hit the cap and saved nothing.
+const EVENT_LIST_HORIZON_MS = 90 * 24 * 60 * 60 * 1000;
+const EVENT_LIST_PAGE_SIZE = 250;
+/** Free text reaches search and delta previews. Structured event times are kept separately. */
+function previewText(value) {
+    return value
+        .replace(/[\w.+-]+@[\w.-]+\.[a-z]{2,}/gi, '[email]')
+        .replace(/\+?\(?\d[\d ().-]{5,}\d/g, (candidate) => {
+        if (/^\d{4}-\d{2}-\d{2}$/.test(candidate))
+            return candidate;
+        return candidate.replace(/\D/g, '').length >= 7 ? '[phone]' : candidate;
+    });
+}
 class CalendarConnector {
+    statePath;
     name = 'calendar';
     type = 'api';
     lastPollTime = null;
     lastPollCount = 0;
-    lastError = undefined;
+    lastError;
+    // The primary calendar uses the existing configured channel key "calendar".
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    constructor(_config) {
-        // config reserved for future channel-scoped filtering
+    calendars;
+    /** Calendars whose whole window has been collected once; later polls only ask for changes. */
+    synced;
+    pendingSynced = null;
+    constructor(config, statePath) {
+        this.statePath = statePath;
+        const configured = Object.entries(config.channels).filter(([key, channel]) => channel.role !== 'ignore' && (channel.calendarId || key === 'calendar' || key === 'primary'));
+        this.calendars = configured.some(([, channel]) => channel.calendarId)
+            ? configured.map(([key, channel]) => ({
+                key,
+                id: channel.calendarId ?? 'primary',
+                label: channel.name ?? key,
+            }))
+            : [{ key: 'calendar', id: 'primary', label: 'Primary calendar' }];
+        this.synced = new Set((0, connector_state_js_1.readConnectorState)(statePath, (value) => {
+            const synced = value?.synced;
+            if (!Array.isArray(synced) || !synced.every((key) => typeof key === 'string')) {
+                throw new Error('Calendar connector state must list synced calendar keys');
+            }
+            return synced;
+        }) ?? []);
+    }
+    commitPoll() {
+        if (this.pendingSynced === null)
+            return;
+        for (const key of this.pendingSynced)
+            this.synced.add(key);
+        this.pendingSynced = null;
+        (0, connector_state_js_1.writeConnectorState)(this.statePath, { synced: [...this.synced].sort() });
+    }
+    abortPollHandoff() {
+        this.pendingSynced = null;
+    }
+    async verifyAccess() {
+        // auth status can succeed without Calendar scope. Exercise the read permission itself.
+        await (0, gws_utils_js_1.execGwsAsync)([
+            'calendar',
+            'events',
+            'list',
+            '--params',
+            JSON.stringify({ calendarId: this.calendars[0]?.id ?? 'primary', maxResults: 1 }),
+        ]);
     }
     async init() {
-        // Verify gws CLI is available
         try {
-            (0, child_process_1.execSync)('gws --version', { stdio: 'pipe' });
+            await this.verifyAccess();
+            this.lastError = undefined;
         }
-        catch {
-            throw new Error('gws CLI not found. Install it and run: gws auth login');
+        catch (error) {
+            this.lastError =
+                error.code === 'ENOENT'
+                    ? 'Calendar: install gws and add its bin directory to the daemon PATH in ~/.mama/start.sh; then run: gws auth login'
+                    : 'Calendar: gws cannot read the primary calendar. Run: gws auth login with Google Calendar read access, then retry.';
+            throw new Error(this.lastError, { cause: error });
         }
     }
-    async dispose() {
-        // No resources to clean up
-    }
+    async dispose() { }
     async healthCheck() {
         return {
             healthy: this.lastError === undefined,
@@ -46,106 +99,127 @@ class CalendarConnector {
                 type: 'cli',
                 cli: 'gws',
                 cliAuthCommand: 'gws auth login',
-                description: 'Google Workspace CLI authentication. Run: gws auth login',
+                description: 'Google Calendar read access through Google Workspace CLI. Run: gws auth login',
             },
         ];
     }
     async authenticate() {
         try {
-            (0, child_process_1.execSync)('gws auth status', { stdio: 'pipe' });
+            await this.verifyAccess();
             return true;
         }
         catch {
             return false;
         }
     }
-    getEventTime(ev) {
-        return ev.start?.dateTime ?? ev.start?.date ?? '';
-    }
-    getEventEndTime(ev) {
-        return ev.end?.dateTime ?? ev.end?.date ?? '';
-    }
-    async poll(since) {
+    async poll(since, cursor) {
         const items = [];
         try {
-            const timeMin = since.toISOString();
+            const windowStart = new Date();
+            const timeMin = windowStart.toISOString();
+            const timeMax = new Date(windowStart.getTime() + EVENT_LIST_HORIZON_MS).toISOString();
             const observedAt = new Date().toISOString();
-            let pageToken;
-            const visitedPageTokens = new Set();
-            for (let page = 0; page < MAX_EVENT_LIST_PAGES; page += 1) {
-                const params = JSON.stringify({
-                    calendarId: 'primary',
-                    timeMin,
-                    singleEvents: true,
-                    showDeleted: true,
-                    orderBy: 'startTime',
-                    maxResults: 50,
-                    ...(pageToken ? { pageToken } : {}),
-                });
-                // Escape single quotes so an upstream-controlled value inside the JSON (e.g. a pageToken)
-                // cannot close the shell single-quoted argument and inject a command.
-                const safeParams = params.replace(/'/g, `'\\''`);
-                const result = (0, gws_utils_js_1.execGws)(`calendar events list --params '${safeParams}'`);
-                for (const ev of result.items ?? []) {
-                    const start = this.getEventTime(ev);
-                    const end = this.getEventEndTime(ev);
-                    const summary = ev.summary ?? '(No title)';
-                    const description = ev.description ?? '';
-                    const organizer = ev.organizer?.displayName ?? ev.organizer?.email ?? 'unknown';
-                    const allDay = ev.start?.date !== undefined;
-                    const startMs = start ? new Date(start).getTime() : Date.now();
-                    const timeZone = ev.start?.timeZone ?? result.timeZone ?? 'UTC';
-                    const observation = {
-                        eventId: ev.id,
-                        summary,
-                        description,
-                        start,
-                        end,
-                        status: ev.status,
-                        organizer: ev.organizer,
-                        allDay,
-                        endExclusive: allDay,
-                        timeZone,
-                    };
-                    const version = (0, node_crypto_1.createHash)('sha256')
-                        .update(JSON.stringify(observation))
-                        .digest('hex')
-                        .slice(0, 24);
-                    items.push({
-                        source: 'calendar',
-                        sourceId: `${ev.id}:${version}`,
-                        sourceEntityId: ev.id,
-                        channel: 'calendar',
-                        author: organizer,
-                        content: `${summary} | ${start} ~ ${end}\n${description}`,
-                        timestamp: new Date(startMs),
-                        type: 'event',
-                        sourceCursor: observedAt,
-                        metadata: {
-                            ...observation,
-                            observedAt,
-                        },
-                    });
+            const pendingSynced = new Set();
+            for (const calendar of this.calendars) {
+                // A calendar added after the first poll still needs its whole window once.
+                const changesOnly = cursor?.hasCursor === true && this.synced.has(calendar.key);
+                let pageToken;
+                let pageComplete = false;
+                const visitedPageTokens = new Set();
+                for (let page = 0; page < MAX_EVENT_LIST_PAGES; page += 1) {
+                    const result = (await (0, gws_utils_js_1.execGwsAsync)([
+                        'calendar',
+                        'events',
+                        'list',
+                        '--params',
+                        JSON.stringify({
+                            calendarId: calendar.id,
+                            timeMin,
+                            timeMax,
+                            ...(changesOnly ? { updatedMin: since.toISOString() } : {}),
+                            singleEvents: true,
+                            showDeleted: true,
+                            orderBy: 'startTime',
+                            maxResults: EVENT_LIST_PAGE_SIZE,
+                            ...(pageToken ? { pageToken } : {}),
+                        }),
+                    ]));
+                    for (const ev of result.items ?? []) {
+                        const updatedAt = new Date(ev.updated);
+                        if (!Number.isFinite(updatedAt.getTime())) {
+                            throw new Error('Calendar event omitted a valid updated time');
+                        }
+                        const start = ev.start?.dateTime ?? ev.start?.date ?? '';
+                        const end = ev.end?.dateTime ?? ev.end?.date ?? '';
+                        const summary = ev.summary ?? '(No title)';
+                        const description = ev.description ?? '';
+                        const organizer = ev.organizer?.displayName ?? ev.organizer?.email ?? 'unknown';
+                        const allDay = ev.start?.date !== undefined;
+                        // Cancelled events can carry only an id; retain that cancellation observation.
+                        const observation = {
+                            eventId: ev.id,
+                            calendarId: calendar.id,
+                            calendarName: calendar.label,
+                            updated: ev.updated,
+                            summary,
+                            description,
+                            location: ev.location,
+                            start,
+                            end,
+                            status: ev.status,
+                            organizer: ev.organizer,
+                            allDay,
+                            endExclusive: allDay,
+                            timeZone: ev.start?.timeZone ?? result.timeZone ?? 'UTC',
+                        };
+                        const version = (0, node_crypto_1.createHash)('sha256')
+                            .update(JSON.stringify(observation))
+                            .digest('hex')
+                            .slice(0, 24);
+                        items.push({
+                            source: 'calendar',
+                            sourceId: `${calendar.key === 'calendar' ? '' : `${calendar.key}:`}${ev.id}:${version}`,
+                            sourceEntityId: `${calendar.key === 'calendar' ? '' : `${calendar.key}:`}${ev.id}`,
+                            channel: calendar.key,
+                            author: previewText(organizer),
+                            content: [
+                                `${previewText(summary)} | ${start} ~ ${end}`,
+                                `Organizer: ${previewText(organizer)}`,
+                                ...(ev.location ? [`Location: ${previewText(ev.location)}`] : []),
+                                previewText(description),
+                            ].join('\n'),
+                            timestamp: updatedAt,
+                            type: 'event',
+                            sourceCursor: ev.updated,
+                            metadata: { ...observation, observedAt },
+                            ...(!this.synced.has(calendar.key) ? { collectOnly: true } : {}),
+                        });
+                    }
+                    if (!result.nextPageToken) {
+                        pageComplete = true;
+                        break;
+                    }
+                    if (visitedPageTokens.has(result.nextPageToken)) {
+                        throw new Error('Calendar returned a repeated upstream page token');
+                    }
+                    visitedPageTokens.add(result.nextPageToken);
+                    pageToken = result.nextPageToken;
                 }
-                if (!result.nextPageToken) {
-                    this.lastPollTime = new Date();
-                    this.lastPollCount = items.length;
-                    this.lastError = undefined;
-                    return items;
-                }
-                if (visitedPageTokens.has(result.nextPageToken)) {
-                    throw new Error('Calendar returned a repeated upstream page token');
-                }
-                visitedPageTokens.add(result.nextPageToken);
-                pageToken = result.nextPageToken;
+                if (!pageComplete)
+                    throw new Error(`Calendar page cap (${MAX_EVENT_LIST_PAGES}) reached; upstream snapshot is incomplete`);
+                pendingSynced.add(calendar.key);
             }
-            throw new Error(`Calendar page cap (${MAX_EVENT_LIST_PAGES}) reached; upstream snapshot is incomplete`);
+            this.pendingSynced = pendingSynced;
+            this.lastPollTime = new Date();
+            this.lastPollCount = items.length;
+            this.lastError = undefined;
+            return items;
         }
-        catch (err) {
-            this.lastError = err instanceof Error ? err.message : String(err);
+        catch (error) {
+            this.lastError = error instanceof Error ? error.message : String(error);
             this.lastPollTime = new Date();
             this.lastPollCount = 0;
-            throw err instanceof Error ? err : new Error(String(err));
+            throw error instanceof Error ? error : new Error(String(error));
         }
     }
 }

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

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

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

@@ -3,31 +3,57 @@
  * No SDK dependency; uses X-ChatWorkToken header for auth.
  */
 import type { AuthRequirement, ConnectorConfig, ConnectorHealth, IConnector, NormalizedItem } from '../framework/types.js';
+import { type AttachmentDescriptor, type AttachmentListRequest, type AttachmentDownloadRequest } from '../framework/attachments.js';
+export interface ChatworkConnectorOptions {
+    fetch?: typeof fetch;
+}
+export declare function extractChatworkFileIds(body: string): string[];
+export declare function extractChatworkFiles(body: string): Array<{
+    fileId: string;
+    name?: string;
+}>;
 export declare class ChatworkConnector implements IConnector {
     readonly name = "chatwork";
     readonly type: "api";
     private config;
     private token;
     private readonly baseUrl;
+    private readonly http;
     private lastPollTime;
     private lastPollCount;
     private lastError;
     /**
      * Per-room last seen message ID for incremental polling.
-     * NOTE: The Chatwork API has no cursor-based pagination. The `force=0` mode
-     * returns messages since the server-tracked read cursor (up to 100 per call).
-     * We additionally track the last seen message_id client-side so we can skip
-     * already-processed messages on the first poll after restart.
+     * NOTE: The Chatwork API has no cursor-based pagination. `force=0` returns only
+     * messages the SERVER has not yet handed to this token — a read cursor shared by
+     * every reader of the token. Measured live 2026-09-10: a second poller on the same
+     * token (30 s cadence vs our 5 min) consumed the cursor first and this connector
+     * saw ~1 message/day while the rooms carried ~30/day. So we ask for `force=1`
+     * (the latest 100 regardless of read state) and dedupe client-side with the
+     * `since` timestamp plus this per-room last seen message_id.
      * Limitation: if a room receives >100 messages between polls, the oldest
      * messages in that batch will be missed — this is a Chatwork API constraint.
      */
     private lastMessageIds;
-    constructor(config: ConnectorConfig);
+    private pendingMessageIds;
+    private pollCommitDeferred;
+    constructor(config: ConnectorConfig, options?: ChatworkConnectorOptions);
     init(): Promise<void>;
     dispose(): Promise<void>;
     healthCheck(): Promise<ConnectorHealth>;
     getAuthRequirements(): AuthRequirement[];
     authenticate(): Promise<boolean>;
     poll(since: Date): Promise<NormalizedItem[]>;
+    beginPollHandoff(): void;
+    commitPoll(): void;
+    abortPollHandoff(): void;
+    listAttachments(request: AttachmentListRequest): Promise<AttachmentDescriptor[]>;
+    private uploaderAccountId;
+    downloadAttachment(request: AttachmentDownloadRequest): Promise<{
+        descriptor: AttachmentDescriptor;
+        size: number;
+    }>;
+    private readFile;
+    private chatworkFileDescriptor;
 }
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/chatwork/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAc/B,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAE/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAiC;IAElD;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc,CAAkC;gBAE5C,MAAM,EAAE,eAAe;IAI7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IASrB,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;IAYhC,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAmEnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/chatwork/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC/B,MAAM,6BAA6B,CAAC;AA8BrC,MAAM,WAAW,wBAAwB;IACvC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB;AAID,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAO7D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAM3F;AAED,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,IAAI,EAAG,KAAK,CAAU;IAE/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAe;IACpC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAiC;IAElD;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,cAAc,CAAkC;IACxD,OAAO,CAAC,iBAAiB,CAAoC;IAC7D,OAAO,CAAC,kBAAkB,CAAS;gBAEvB,MAAM,EAAE,eAAe,EAAE,OAAO,GAAE,wBAA6B;IAKrE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrB,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;IAYhC,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAiFlD,gBAAgB,IAAI,IAAI;IAOxB,UAAU,IAAI,IAAI;IASlB,gBAAgB,IAAI,IAAI;IAKlB,eAAe,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;YAuDxE,iBAAiB;IAyBzB,kBAAkB,CACtB,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC;QAAE,UAAU,EAAE,oBAAoB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;YAchD,QAAQ;IAuBtB,OAAO,CAAC,sBAAsB;CAoB/B"}