@jungjaehoon/mama-os 0.53.0 → 0.57.0

package/dist/connectors/notion/index.js

@@ -5,6 +5,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotionConnector = void 0;
+const MAX_SEARCH_PAGES = 100;
+const MAX_BLOCK_PAGES = 100;
+const MAX_BLOCK_DEPTH = 8;
 class NotionConnector {
     name = 'notion';
     type = 'api';
@@ -19,9 +22,13 @@ class NotionConnector {
         this.config = config;
     }
     async init() {
-        const token = this.config.auth.token ?? process.env[this.config.auth.tokenName ?? 'NOTION_TOKEN'];
+        const tokenName = this.config.auth.tokenName;
+        if (tokenName !== 'MAMA_NOTION_TOKEN') {
+            throw new Error('Notion auth.tokenName must be MAMA_NOTION_TOKEN');
+        }
+        const token = process.env[tokenName];
         if (!token) {
-            throw new Error('Notion token not found. Set NOTION_TOKEN environment variable.');
+            throw new Error('Notion token not found. Run mama secret set MAMA_NOTION_TOKEN.');
         }
         this.token = token;
     }
@@ -40,7 +47,7 @@ class NotionConnector {
         return [
             {
                 type: 'token',
-                tokenName: 'NOTION_TOKEN',
+                tokenName: 'MAMA_NOTION_TOKEN',
                 description: 'Notion Internal Integration Token. Create an integration at https://www.notion.so/my-integrations and share your pages with it.',
             },
         ];
@@ -83,48 +90,71 @@ class NotionConnector {
             return '';
         return richText.map((t) => t.plain_text).join('');
     }
-    async fetchBlockChildren(pageId) {
+    async fetchBlockChildren(pageId, depth = 0) {
+        if (depth > MAX_BLOCK_DEPTH)
+            throw new Error(`block children depth cap (${MAX_BLOCK_DEPTH}) reached`);
         const texts = [];
         let startCursor;
-        let hasMore = true;
-        while (hasMore) {
-            const url = `${this.baseUrl}/blocks/${pageId}/children?page_size=100${startCursor ? `&start_cursor=${startCursor}` : ''}`;
+        const visitedCursors = new Set();
+        for (let page = 0; page < MAX_BLOCK_PAGES; page += 1) {
+            const url = new URL(`${this.baseUrl}/blocks/${pageId}/children`);
+            url.searchParams.set('page_size', '100');
+            if (startCursor)
+                url.searchParams.set('start_cursor', startCursor);
             const controller = new AbortController();
             const timeout = setTimeout(() => controller.abort(), 30_000);
             try {
-                const res = await fetch(url, {
+                const res = await fetch(url.toString(), {
                     headers: this.authHeaders(),
                     signal: controller.signal,
                 });
                 if (!res.ok)
-                    break;
+                    throw new Error(`block children HTTP ${res.status} for page ${page + 1}`);
                 const data = (await res.json());
                 for (const block of data.results ?? []) {
                     const text = this.extractBlockText(block);
                     if (text)
                         texts.push(text);
+                    if (block.has_children) {
+                        if (depth === MAX_BLOCK_DEPTH)
+                            throw new Error(`block children depth cap (${MAX_BLOCK_DEPTH}) reached`);
+                        texts.push(await this.fetchBlockChildren(block.id, depth + 1));
+                    }
+                }
+                if (!data.has_more)
+                    return texts.join('\n');
+                const nextCursor = data.next_cursor;
+                if (!nextCursor)
+                    throw new Error(`block children page ${page + 1} omitted next_cursor`);
+                if (visitedCursors.has(nextCursor)) {
+                    throw new Error(`block children pagination repeated a cursor at page ${page + 1}`);
                 }
-                hasMore = data.has_more ?? false;
-                startCursor = data.next_cursor ?? undefined;
+                visitedCursors.add(nextCursor);
+                startCursor = nextCursor;
             }
-            catch {
-                break;
+            catch (error) {
+                throw error instanceof Error ? error : new Error(String(error));
             }
             finally {
                 clearTimeout(timeout);
             }
         }
-        return texts.join('\n');
+        throw new Error(`block children page cap (${MAX_BLOCK_PAGES}) reached`);
     }
     async poll(since) {
         if (!this.token)
             throw new Error('NotionConnector not initialized');
+        const configuredChannels = Object.entries(this.config.channels).filter(([, channel]) => channel.role !== 'ignore');
+        if (configuredChannels.length !== 1) {
+            throw new Error('Notion requires exactly one configured workspace channel');
+        }
+        const [channel] = configuredChannels[0];
         const items = [];
-        let hadError = false;
         try {
             let startCursor;
-            let hasMore = true;
-            while (hasMore) {
+            const visitedCursors = new Set();
+            let pagesRead = 0;
+            for (let pageNumber = 0; pageNumber < MAX_SEARCH_PAGES; pageNumber += 1) {
                 const searchBody = {
                     filter: { property: 'object', value: 'page' },
                     sort: { direction: 'descending', timestamp: 'last_edited_time' },
@@ -147,24 +177,27 @@ class NotionConnector {
                     clearTimeout(timeout);
                 }
                 if (!res.ok) {
-                    hadError = true;
-                    this.lastError = `Notion search HTTP ${res.status}`;
-                    this.lastPollTime = new Date();
-                    this.lastPollCount = 0;
-                    return items;
+                    throw new Error(`search HTTP ${res.status} on page ${pageNumber + 1}`);
                 }
                 const data = (await res.json());
+                pagesRead += 1;
                 for (const page of data.results) {
                     const lastEdited = new Date(page.last_edited_time);
-                    if (lastEdited <= since)
+                    if (lastEdited.getTime() <= since.getTime() - 60_000)
                         continue;
                     const title = this.extractTitle(page);
-                    const blockText = await this.fetchBlockChildren(page.id);
+                    let blockText;
+                    try {
+                        blockText = await this.fetchBlockChildren(page.id);
+                    }
+                    catch (error) {
+                        throw new Error(`Notion page content fetch failed for 1 of ${pagesRead} search pages; last error: ${error instanceof Error ? error.message : String(error)}`);
+                    }
                     const content = blockText ? `${title}\n\n${blockText}` : title;
                     items.push({
                         source: 'notion',
                         sourceId: page.id,
-                        channel: 'notion',
+                        channel,
                         author: '',
                         content,
                         timestamp: lastEdited,
@@ -176,21 +209,31 @@ class NotionConnector {
                         },
                     });
                 }
-                hasMore = data.has_more ?? false;
-                startCursor = data.next_cursor ?? undefined;
+                if (!data.has_more) {
+                    items.sort((a, b) => a.timestamp.getTime() - b.timestamp.getTime());
+                    this.lastError = undefined;
+                    this.lastPollTime = new Date();
+                    this.lastPollCount = items.length;
+                    return items;
+                }
+                const nextCursor = data.next_cursor;
+                if (!nextCursor)
+                    throw new Error(`search page ${pageNumber + 1} omitted next_cursor`);
+                if (visitedCursors.has(nextCursor)) {
+                    throw new Error(`search pagination repeated a cursor at page ${pageNumber + 1}`);
+                }
+                visitedCursors.add(nextCursor);
+                startCursor = nextCursor;
             }
+            throw new Error(`search page cap (${MAX_SEARCH_PAGES}) reached`);
         }
         catch (err) {
-            hadError = true;
-            this.lastError = err instanceof Error ? err.message : String(err);
+            const message = err instanceof Error ? err.message : String(err);
+            this.lastError = `Notion poll failed for 1 page fetch; last error: ${message}`;
+            this.lastPollTime = new Date();
+            this.lastPollCount = items.length;
+            throw new Error(this.lastError, { cause: err });
         }
-        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;
-        return items;
     }
 }
 exports.NotionConnector = NotionConnector;

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

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

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

@@ -16,7 +16,7 @@ export declare class ObsidianConnector implements IConnector {
     healthCheck(): Promise<ConnectorHealth>;
     getAuthRequirements(): AuthRequirement[];
     authenticate(): Promise<boolean>;
-    private getVaultPath;
+    private getVaultConfigs;
     private collectMdFiles;
     poll(since: Date): Promise<NormalizedItem[]>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/obsidian/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,IAAI,EAAG,OAAO,CAAU;IAEjC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAiC;gBAEtC,MAAM,EAAE,eAAe;IAI7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IASlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAWtC,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,cAAc;IAoBhB,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAuDnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/obsidian/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,IAAI,cAAc;IAC3B,QAAQ,CAAC,IAAI,EAAG,OAAO,CAAU;IAEjC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAiC;gBAEtC,MAAM,EAAE,eAAe;IAI7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IASlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IActC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,cAAc;IAgBhB,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CA8CnD"}

package/dist/connectors/obsidian/index.js

@@ -18,15 +18,21 @@ class ObsidianConnector {
         this.config = config;
     }
     async init() {
-        const vaultPath = this.getVaultPath();
-        if (!vaultPath) {
+        const configured = this.getVaultConfigs();
+        if (configured.length === 0) {
             throw new Error('Obsidian vault path not configured. Set vaultPath in channel config.');
         }
-        try {
-            (0, fs_1.statSync)(vaultPath);
-        }
-        catch {
-            throw new Error(`Obsidian vault path does not exist: ${vaultPath}`);
+        for (const { channelKey, vaultPath } of configured) {
+            try {
+                if (!(0, fs_1.statSync)(vaultPath).isDirectory())
+                    throw new Error('path is not a directory');
+                (0, fs_1.readdirSync)(vaultPath);
+            }
+            catch (error) {
+                throw new Error(`Obsidian vault for channel ${channelKey} is not readable: ${vaultPath}`, {
+                    cause: error,
+                });
+            }
         }
     }
     async dispose() {
@@ -49,96 +55,92 @@ class ObsidianConnector {
         ];
     }
     async authenticate() {
-        const vaultPath = this.getVaultPath();
-        if (!vaultPath)
-            return false;
         try {
-            (0, fs_1.statSync)(vaultPath);
+            const configured = this.getVaultConfigs();
+            if (configured.length === 0)
+                return false;
+            for (const { vaultPath } of configured) {
+                if (!(0, fs_1.statSync)(vaultPath).isDirectory())
+                    return false;
+                (0, fs_1.readdirSync)(vaultPath);
+            }
             return true;
         }
         catch {
             return false;
         }
     }
-    getVaultPath() {
-        for (const channelCfg of Object.values(this.config.channels)) {
-            if (channelCfg.vaultPath) {
-                return channelCfg.vaultPath;
+    getVaultConfigs() {
+        return Object.entries(this.config.channels)
+            .filter(([, channel]) => channel.role !== 'ignore')
+            .map(([channelKey, channel]) => {
+            if (!channel.vaultPath) {
+                throw new Error(`Obsidian channel ${channelKey} requires vaultPath`);
             }
-        }
-        return undefined;
+            return { channelKey, vaultPath: channel.vaultPath };
+        });
     }
     collectMdFiles(dir) {
         const results = [];
-        try {
-            const entries = (0, fs_1.readdirSync)(dir, { withFileTypes: true });
-            for (const entry of entries) {
-                // Skip hidden directories (e.g., .obsidian, .git)
-                if (entry.name.startsWith('.'))
-                    continue;
-                const fullPath = (0, path_1.join)(dir, entry.name);
-                if (entry.isDirectory()) {
-                    results.push(...this.collectMdFiles(fullPath));
-                }
-                else if (entry.isFile() && entry.name.endsWith('.md')) {
-                    results.push(fullPath);
-                }
+        const entries = (0, fs_1.readdirSync)(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            // Skip hidden directories (e.g., .obsidian, .git)
+            if (entry.name.startsWith('.'))
+                continue;
+            const fullPath = (0, path_1.join)(dir, entry.name);
+            if (entry.isDirectory()) {
+                results.push(...this.collectMdFiles(fullPath));
+            }
+            else if (entry.isFile() && entry.name.endsWith('.md')) {
+                results.push(fullPath);
             }
-        }
-        catch {
-            // Skip unreadable directories
         }
         return results;
     }
     async poll(since) {
-        const vaultPath = this.getVaultPath();
-        if (!vaultPath)
-            throw new Error('ObsidianConnector: vaultPath not configured');
         const items = [];
-        let hadError = false;
-        try {
-            const mdFiles = this.collectMdFiles(vaultPath);
-            for (const filePath of mdFiles) {
-                try {
+        const configured = this.getVaultConfigs();
+        let failedVaults = 0;
+        let lastVaultError;
+        for (const { channelKey, vaultPath } of configured) {
+            try {
+                for (const filePath of this.collectMdFiles(vaultPath)) {
                     const stat = (0, fs_1.statSync)(filePath);
                     if (stat.mtime <= since)
                         continue;
                     const relPath = (0, path_1.relative)(vaultPath, filePath);
-                    const parts = relPath.split(/[/\\]/);
-                    const channelName = parts.length > 1 ? (parts[0] ?? 'vault') : 'vault';
                     const content = (0, fs_1.readFileSync)(filePath, 'utf8');
                     items.push({
                         source: 'obsidian',
-                        sourceId: relPath,
-                        channel: channelName,
+                        sourceId: `${channelKey}:${relPath}`,
+                        sourceEntityId: `${channelKey}:${relPath}`,
+                        channel: channelKey,
                         author: '',
                         content,
                         timestamp: stat.mtime,
                         type: 'note',
                         metadata: {
-                            filePath,
                             relPath,
                             mtime: stat.mtime.toISOString(),
                         },
                     });
                 }
-                catch (err) {
-                    // Skip individual file errors
-                    hadError = true;
-                    this.lastError = err instanceof Error ? err.message : String(err);
-                }
+            }
+            catch (error) {
+                failedVaults += 1;
+                lastVaultError = error instanceof Error ? error.message : String(error);
             }
         }
-        catch (err) {
-            hadError = true;
-            this.lastError = err instanceof Error ? err.message : String(err);
+        if (failedVaults > 0) {
+            this.lastError = `Obsidian poll failed for ${failedVaults} of ${configured.length} configured vault paths; last error: ${lastVaultError}`;
+            this.lastPollTime = new Date();
+            this.lastPollCount = items.length;
+            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;
         return items;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connectors/obsidian/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,2BAAyD;AACzD,+BAAsC;AAUtC,MAAa,iBAAiB;IACnB,IAAI,GAAG,UAAU,CAAC;IAClB,IAAI,GAAG,OAAgB,CAAC;IAEzB,MAAM,CAAkB;IACxB,YAAY,GAAgB,IAAI,CAAC;IACjC,aAAa,GAAG,CAAC,CAAC;IAClB,SAAS,GAAuB,SAAS,CAAC;IAElD,YAAY,MAAuB;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;QAC1F,CAAC;QACD,IAAI,CAAC;YACH,IAAA,aAAQ,EAAC,SAAS,CAAC,CAAC;QACtB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,2BAA2B;IAC7B,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,KAAK,SAAS;YACrC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,KAAK,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC;IACJ,CAAC;IAED,mBAAmB;QACjB,OAAO;YACL;gBACE,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,sEAAsE;aACpF;SACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAC7B,IAAI,CAAC;YACH,IAAA,aAAQ,EAAC,SAAS,CAAC,CAAC;YACpB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,YAAY;QAClB,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7D,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBACzB,OAAO,UAAU,CAAC,SAAS,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,cAAc,CAAC,GAAW;QAChC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAA,gBAAW,EAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,kDAAkD;gBAClD,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;oBAAE,SAAS;gBACzC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBACvC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;oBACxB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACjD,CAAC;qBAAM,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxD,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,8BAA8B;QAChC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAW;QACpB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAE/E,MAAM,KAAK,GAAqB,EAAE,CAAC;QACnC,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAE/C,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;gBAC/B,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC;oBAChC,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK;wBAAE,SAAS;oBAElC,MAAM,OAAO,GAAG,IAAA,eAAQ,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;oBAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACrC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;oBAEvE,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBAE/C,KAAK,CAAC,IAAI,CAAC;wBACT,MAAM,EAAE,UAAU;wBAClB,QAAQ,EAAE,OAAO;wBACjB,OAAO,EAAE,WAAW;wBACpB,MAAM,EAAE,EAAE;wBACV,OAAO;wBACP,SAAS,EAAE,IAAI,CAAC,KAAK;wBACrB,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE;4BACR,QAAQ;4BACR,OAAO;4BACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;yBAChC;qBACF,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,8BAA8B;oBAC9B,QAAQ,GAAG,IAAI,CAAC;oBAChB,IAAI,CAAC,SAAS,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,CAAC,SAAS,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpE,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpE,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC;QAClC,+EAA+E;QAC/E,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE1C,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA9ID,8CA8IC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connectors/obsidian/index.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 /**
  * SheetsConnector — polls Google Sheets via the gws CLI tool.
- * Uses child_process.execSync to call gws CLI commands.
+ * Uses argv-based asynchronous gws CLI calls.
  * Emits spreadsheet_row NormalizedItems for changed/new rows.
  */
 import type { AuthRequirement, ConnectorConfig, ConnectorHealth, IConnector, NormalizedItem } from '../framework/types.js';
@@ -13,15 +13,19 @@ export declare class SheetsConnector implements IConnector {
     private lastError;
     /** Snapshot of previous rows per channel: channelName → rows (excluding header) */
     private lastSnapshot;
-    constructor(config: ConnectorConfig);
-    private get snapshotPath();
+    private pendingSnapshot;
+    private pollCommitDeferred;
+    private readonly snapshotPath;
+    constructor(config: ConnectorConfig, snapshotPath: string);
     init(): Promise<void>;
     dispose(): Promise<void>;
     private loadSnapshot;
-    private saveSnapshot;
     healthCheck(): Promise<ConnectorHealth>;
     getAuthRequirements(): AuthRequirement[];
     authenticate(): Promise<boolean>;
     poll(_since: Date): Promise<NormalizedItem[]>;
+    commitPoll(): void;
+    beginPollHandoff(): void;
+    abortPollHandoff(): void;
 }
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/sheets/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAO/B,qBAAa,eAAgB,YAAW,UAAU;IAChD,QAAQ,CAAC,IAAI,YAAY;IACzB,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,mFAAmF;IACnF,OAAO,CAAC,YAAY,CAAsC;gBAE9C,MAAM,EAAE,eAAe;IAInC,OAAO,KAAK,YAAY,GAEvB;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,OAAO,CAAC,YAAY;YAWN,YAAY;IAQpB,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IAWlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAShC,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAgJpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connectors/sheets/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,UAAU,EACV,cAAc,EACf,MAAM,uBAAuB,CAAC;AAQ/B,qBAAa,eAAgB,YAAW,UAAU;IAChD,QAAQ,CAAC,IAAI,YAAY;IACzB,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,mFAAmF;IACnF,OAAO,CAAC,YAAY,CAAsC;IAC1D,OAAO,CAAC,eAAe,CAAwC;IAC/D,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM;IAMnD,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IASrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,OAAO,CAAC,YAAY;IAkBd,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAS7C,mBAAmB,IAAI,eAAe,EAAE;IAWlC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAShC,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAqJnD,UAAU,IAAI,IAAI;IASlB,gBAAgB,IAAI,IAAI;IAOxB,gBAAgB,IAAI,IAAI;CAIzB"}