Merge pull request #21 -- better support for extracting text and links

Extraction links

Author: felarof99

packages/controller-ext/src/actions/browser/GetSnapshotAction.ts

@@ -13,24 +13,6 @@ import { BrowserOSAdapter, type Snapshot, type SnapshotOptions } from '@/adapter
 // Input schema for getSnapshot action
 const GetSnapshotInputSchema = z.object({
   tabId: z.number().int().positive().describe('Tab ID to get snapshot from'),
-  type: z.enum(['text', 'links']).describe('Type of snapshot to extract (text or links)'),
-  options: z.object({
-    context: z.enum(['visible', 'full']).optional().describe('Context to extract: visible viewport or full page'),
-    includeSections: z.array(z.enum([
-      'main',
-      'navigation',
-      'footer',
-      'header',
-      'article',
-      'aside',
-      'complementary',
-      'contentinfo',
-      'form',
-      'search',
-      'region',
-      'other'
-    ])).optional().describe('Specific ARIA landmark sections to include')
-  }).optional().describe('Optional snapshot extraction options')
 });
 
 type GetSnapshotInput = z.infer<typeof GetSnapshotInputSchema>;
@@ -39,50 +21,27 @@ type GetSnapshotInput = z.infer<typeof GetSnapshotInputSchema>;
 export type GetSnapshotOutput = Snapshot;
 
 /**
- * GetSnapshotAction - Extract text or links from a page
+ * GetSnapshotAction - Extract page content snapshot
  *
- * Extracts structured content from the page:
- * - "text" type: Extracts readable text content organized by ARIA landmarks
- * - "links" type: Extracts all links with text and URLs
+ * Extracts structured content from the page including:
+ * - Headings (with levels)
+ * - Text content
+ * - Links (with URLs)
  *
- * Options:
- * - context: "visible" (viewport only) or "full" (entire page)
- * - includeSections: Array of specific ARIA landmarks to include (main, navigation, etc.)
+ * Returns items in document order with type information.
  *
- * The snapshot is organized by sections (main, navigation, footer, etc.) for better structure.
- *
- * Example payloads:
- *
- * Get all text from visible viewport:
+ * Example payload:
  * {
- *   "tabId": 123,
- *   "type": "text",
- *   "options": { "context": "visible" }
- * }
- *
- * Get links from main content only:
- * {
- *   "tabId": 123,
- *   "type": "links",
- *   "options": {
- *     "context": "full",
- *     "includeSections": ["main", "article"]
- *   }
+ *   "tabId": 123
  * }
  */
 export class GetSnapshotAction extends ActionHandler<GetSnapshotInput, GetSnapshotOutput> {
   readonly inputSchema = GetSnapshotInputSchema;
   private browserOSAdapter = BrowserOSAdapter.getInstance();
 
   async execute(input: GetSnapshotInput): Promise<GetSnapshotOutput> {
-    const { tabId, type, options } = input;
-
-    const snapshot = await this.browserOSAdapter.getSnapshot(
-      tabId,
-      type,
-      options as SnapshotOptions | undefined
-    );
-
+    const { tabId } = input;
+    const snapshot = await this.browserOSAdapter.getSnapshot(tabId);
     return snapshot;
   }
 }

packages/controller-ext/src/adapters/BrowserOSAdapter.ts

@@ -363,69 +363,45 @@ export class BrowserOSAdapter {
   }
 
   /**
-   * Get a content snapshot of the specified type from the page
+   * Get a content snapshot from the page
    */
-  async getSnapshot(
-    tabId: number,
-    type: SnapshotType,
-    options?: SnapshotOptions,
-  ): Promise<Snapshot> {
+  async getSnapshot(tabId: number): Promise<Snapshot> {
     try {
-      logger.debug(`[BrowserOSAdapter] Getting ${type} snapshot for tab ${tabId} with options: ${JSON.stringify(options)}`);
+      logger.debug(`[BrowserOSAdapter] Getting snapshot for tab ${tabId}`);
 
       return new Promise<Snapshot>((resolve, reject) => {
-        if (options) {
-          chrome.browserOS.getSnapshot(
-            tabId,
-            type,
-            options,
-            (snapshot: Snapshot) => {
-              if (chrome.runtime.lastError) {
-                reject(new Error(chrome.runtime.lastError.message));
-              } else {
-                logger.debug(`[BrowserOSAdapter] Retrieved ${type} snapshot with ${snapshot.sections.length} sections`);
-                resolve(snapshot);
-              }
-            },
-          );
-        } else {
-          chrome.browserOS.getSnapshot(tabId, type, (snapshot: Snapshot) => {
-            if (chrome.runtime.lastError) {
-              reject(new Error(chrome.runtime.lastError.message));
-            } else {
-              logger.debug(`[BrowserOSAdapter] Retrieved ${type} snapshot with ${snapshot.sections.length} sections`);
-              resolve(snapshot);
-            }
-          });
-        }
+        chrome.browserOS.getSnapshot(tabId, (snapshot: Snapshot) => {
+          if (chrome.runtime.lastError) {
+            reject(new Error(chrome.runtime.lastError.message));
+          } else {
+            logger.debug(`[BrowserOSAdapter] Retrieved snapshot: ${JSON.stringify(snapshot)}`);
+            resolve(snapshot);
+          }
+        });
       });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      logger.error(`[BrowserOSAdapter] Failed to get ${type} snapshot: ${errorMessage}`);
-      throw new Error(`Failed to get ${type} snapshot: ${errorMessage}`);
+      logger.error(`[BrowserOSAdapter] Failed to get snapshot: ${errorMessage}`);
+      throw new Error(`Failed to get snapshot: ${errorMessage}`);
     }
   }
 
   /**
    * Get text content snapshot from the page
-   * Convenience method for text snapshot
+   * Convenience method (deprecated - use getSnapshot directly)
+   * @deprecated Use getSnapshot(tabId) instead
    */
-  async getTextSnapshot(
-    tabId: number,
-    options?: SnapshotOptions,
-  ): Promise<Snapshot> {
-    return this.getSnapshot(tabId, "text", options);
+  async getTextSnapshot(tabId: number): Promise<Snapshot> {
+    return this.getSnapshot(tabId);
   }
 
   /**
    * Get links snapshot from the page
-   * Convenience method for links snapshot
+   * Convenience method (deprecated - use getSnapshot directly)
+   * @deprecated Use getSnapshot(tabId) instead
    */
-  async getLinksSnapshot(
-    tabId: number,
-    options?: SnapshotOptions,
-  ): Promise<Snapshot> {
-    return this.getSnapshot(tabId, "links", options);
+  async getLinksSnapshot(tabId: number): Promise<Snapshot> {
+    return this.getSnapshot(tabId);
   }
 
   /**

packages/controller-ext/src/types/chrome-browser-os.d.ts

@@ -295,25 +295,6 @@ declare namespace chrome.browserOS {
 
   function getSnapshot(
     tabId: number,
-    type: SnapshotType,
-    options: SnapshotOptions,
-    callback: (snapshot: Snapshot) => void,
-  ): void;
-
-  function getSnapshot(
-    tabId: number,
-    type: SnapshotType,
-    callback: (snapshot: Snapshot) => void,
-  ): void;
-
-  function getSnapshot(
-    type: SnapshotType,
-    options: SnapshotOptions,
-    callback: (snapshot: Snapshot) => void,
-  ): void;
-
-  function getSnapshot(
-    type: SnapshotType,
     callback: (snapshot: Snapshot) => void,
   ): void;