minimal-agent 0.13.0 → 0.14.0

package/src/tools/webbrowser/browserTabs.ts

@@ -1,9 +1,9 @@
 import type { AgentBrowserRun, AgentBrowserRunner } from './browser.js';
-import { browserService } from './browserService.js';
 import {
-  browserRunRegistry,
   type BrowserRunContext,
+  browserRunRegistry,
 } from './browserRunRegistry.js';
+import { browserService } from './browserService.js';
 
 export interface BrowserTabRecord {
   id: string;
@@ -29,20 +29,25 @@ export function parseTabList(text: string): BrowserTabRecord[] {
       };
     };
     return (parsed.data?.tabs ?? []).flatMap((tab) => {
-      const id = typeof tab.tabId === 'string' && tab.tabId
-        ? tab.tabId
-        : typeof tab.id === 'string' && tab.id
-          ? tab.id
-          : Number.isInteger(tab.index)
-            ? String(tab.index)
-            : '';
-      return id ? [{
-        id,
-        active: Boolean(tab.active),
-        ...(typeof tab.url === 'string' ? { url: tab.url } : {}),
-        ...(typeof tab.title === 'string' ? { title: tab.title } : {}),
-        ...(typeof tab.type === 'string' ? { type: tab.type } : {}),
-      }] : [];
+      const id =
+        typeof tab.tabId === 'string' && tab.tabId
+          ? tab.tabId
+          : typeof tab.id === 'string' && tab.id
+            ? tab.id
+            : Number.isInteger(tab.index)
+              ? String(tab.index)
+              : '';
+      return id
+        ? [
+            {
+              id,
+              active: Boolean(tab.active),
+              ...(typeof tab.url === 'string' ? { url: tab.url } : {}),
+              ...(typeof tab.title === 'string' ? { title: tab.title } : {}),
+              ...(typeof tab.type === 'string' ? { type: tab.type } : {}),
+            },
+          ]
+        : [];
     });
   } catch {
     return [];
@@ -84,9 +89,14 @@ function parseListedTabs(result: AgentBrowserRun): BrowserTabRecord[] {
   let reportedCount = 0;
   try {
     const parsed = JSON.parse(result.stdout) as { data?: { tabs?: unknown[] } };
-    reportedCount = Array.isArray(parsed.data?.tabs) ? parsed.data.tabs.length : 0;
+    reportedCount = Array.isArray(parsed.data?.tabs)
+      ? parsed.data.tabs.length
+      : 0;
   } catch {
-    throw new BrowserTabError('browser_protocol_mismatch', '浏览器标签列表不是有效 JSON');
+    throw new BrowserTabError(
+      'browser_protocol_mismatch',
+      '浏览器标签列表不是有效 JSON',
+    );
   }
   if (reportedCount > 0 && tabs.length === 0) {
     throw new BrowserTabError(
@@ -97,7 +107,9 @@ function parseListedTabs(result: AgentBrowserRun): BrowserTabRecord[] {
   return tabs;
 }
 
-export async function listBrowserTabs(input: Omit<BrowserTabInput, 'context'>): Promise<BrowserTabRecord[]> {
+export async function listBrowserTabs(
+  input: Omit<BrowserTabInput, 'context'>,
+): Promise<BrowserTabRecord[]> {
   const result = await browserService.run({
     sessionName: input.sessionName,
     bin: input.bin,
@@ -121,90 +133,160 @@ export async function createConversationTab(
   input: BrowserTabInput,
   url = 'about:blank',
 ): Promise<string> {
-  return browserService.exclusive({
-    sessionName: input.sessionName,
-    bin: input.bin,
-    runner: input.runner,
-    signal: input.signal,
-  }, async (run) => {
-    const before = parseListedTabs(await run([...input.globals, 'tab', 'list', '--json']));
-    const beforeIds = new Set(before.map((tab) => tab.id));
-    const created = await run([...input.globals, 'tab', 'new', url]);
-    if (created.code !== 0) {
-      throw new BrowserTabError(
-        'tab_bootstrap_failed',
-        created.stderr || created.stdout || '无法创建会话浏览器标签',
+  return browserService.exclusive(
+    {
+      sessionName: input.sessionName,
+      bin: input.bin,
+      runner: input.runner,
+      signal: input.signal,
+    },
+    async (run) => {
+      const before = parseListedTabs(
+        await run([...input.globals, 'tab', 'list', '--json']),
       );
-    }
-    const after = parseListedTabs(await run([...input.globals, 'tab', 'list', '--json']));
-    const added = after.filter((tab) => !beforeIds.has(tab.id));
-    const tab = added.find((candidate) => candidate.active) ?? added.at(-1);
-    if (!tab) {
-      throw new BrowserTabError('tab_bootstrap_failed', '新标签创建成功，但 Runtime 未返回其标签 ID');
-    }
-    try {
-      browserRunRegistry.claimTab(input.context, tab.id);
-    } catch (error) {
-      throw new BrowserTabError(
-        'tab_owned_by_other_conversation',
-        error instanceof Error ? error.message : String(error),
+      const beforeIds = new Set(before.map((tab) => tab.id));
+      const created = await run([...input.globals, 'tab', 'new', url]);
+      if (created.code !== 0) {
+        throw new BrowserTabError(
+          'tab_bootstrap_failed',
+          created.stderr || created.stdout || '无法创建会话浏览器标签',
+        );
+      }
+      const after = parseListedTabs(
+        await run([...input.globals, 'tab', 'list', '--json']),
       );
-    }
-    assertSwitched(await run([...input.globals, 'tab', tab.id]));
-    return tab.id;
-  });
+      const added = after.filter((tab) => !beforeIds.has(tab.id));
+      const tab = added.find((candidate) => candidate.active) ?? added.at(-1);
+      if (!tab) {
+        throw new BrowserTabError(
+          'tab_bootstrap_failed',
+          '新标签创建成功，但 Runtime 未返回其标签 ID',
+        );
+      }
+      try {
+        browserRunRegistry.claimTab(input.context, tab.id);
+      } catch (error) {
+        throw new BrowserTabError(
+          'tab_owned_by_other_conversation',
+          error instanceof Error ? error.message : String(error),
+        );
+      }
+      assertSwitched(await run([...input.globals, 'tab', tab.id]));
+      return tab.id;
+    },
+  );
 }
 
-export async function ensureConversationTab(input: BrowserTabInput): Promise<string> {
-  return browserService.exclusive({
-    sessionName: input.sessionName,
-    bin: input.bin,
-    runner: input.runner,
-    signal: input.signal,
-  }, async (run) => {
-    const tabs = parseListedTabs(await run([...input.globals, 'tab', 'list', '--json']));
-    let tabId = input.context.activeTabId;
-    if (!tabId || !tabs.some((tab) => tab.id === tabId)) {
-      const claimed = browserRunRegistry.claimedTabs(input.context.conversationKey);
-      tabId = claimed.find((candidate) => tabs.some((tab) => tab.id === candidate));
-    }
-    if (!tabId) {
-      const hasClaimedTabs = browserRunRegistry.claimedTabs(input.context.conversationKey).length > 0;
-      const reusableBlank = !hasClaimedTabs
-        ? tabs.find((tab) => tab.url === 'about:blank' && browserRunRegistry.ownerOf(tab.id) === undefined)
-        : undefined;
-      if (reusableBlank) {
-        tabId = reusableBlank.id;
-      } else {
-        const beforeIds = new Set(tabs.map((tab) => tab.id));
-        const created = await run([...input.globals, 'tab', 'new', 'about:blank']);
-        if (created.code !== 0) {
-          throw new BrowserTabError(
-            'tab_bootstrap_failed',
-            created.stderr || created.stdout || '无法创建会话浏览器标签',
+export async function ensureConversationTab(
+  input: BrowserTabInput,
+): Promise<string> {
+  return browserService.exclusive(
+    {
+      sessionName: input.sessionName,
+      bin: input.bin,
+      runner: input.runner,
+      signal: input.signal,
+    },
+    async (run) => {
+      const tabs = parseListedTabs(
+        await run([...input.globals, 'tab', 'list', '--json']),
+      );
+      let tabId = input.context.activeTabId;
+      if (!tabId || !tabs.some((tab) => tab.id === tabId)) {
+        const claimed = browserRunRegistry.claimedTabs(
+          input.context.conversationKey,
+        );
+        tabId = claimed.find((candidate) =>
+          tabs.some((tab) => tab.id === candidate),
+        );
+      }
+      if (!tabId) {
+        const hasClaimedTabs =
+          browserRunRegistry.claimedTabs(input.context.conversationKey).length >
+          0;
+        const reusableBlank = !hasClaimedTabs
+          ? tabs.find(
+              (tab) =>
+                tab.url === 'about:blank' &&
+                browserRunRegistry.ownerOf(tab.id) === undefined,
+            )
+          : undefined;
+        if (reusableBlank) {
+          tabId = reusableBlank.id;
+        } else {
+          const beforeIds = new Set(tabs.map((tab) => tab.id));
+          const created = await run([
+            ...input.globals,
+            'tab',
+            'new',
+            'about:blank',
+          ]);
+          if (created.code !== 0) {
+            throw new BrowserTabError(
+              'tab_bootstrap_failed',
+              created.stderr || created.stdout || '无法创建会话浏览器标签',
+            );
+          }
+          const after = parseListedTabs(
+            await run([...input.globals, 'tab', 'list', '--json']),
           );
-        }
-        const after = parseListedTabs(await run([...input.globals, 'tab', 'list', '--json']));
-        const added = after.filter((tab) => !beforeIds.has(tab.id));
-        tabId = (added.find((candidate) => candidate.active) ?? added.at(-1))?.id;
-        if (!tabId) {
-          throw new BrowserTabError('tab_bootstrap_failed', '新标签创建成功，但 Runtime 未返回其标签 ID');
+          const added = after.filter((tab) => !beforeIds.has(tab.id));
+          tabId = (added.find((candidate) => candidate.active) ?? added.at(-1))
+            ?.id;
+          if (!tabId) {
+            throw new BrowserTabError(
+              'tab_bootstrap_failed',
+              '新标签创建成功，但 Runtime 未返回其标签 ID',
+            );
+          }
         }
       }
-    }
 
-    try {
-      browserRunRegistry.claimTab(input.context, tabId);
-    } catch (error) {
-      throw new BrowserTabError(
-        'tab_owned_by_other_conversation',
-        error instanceof Error ? error.message : String(error),
-      );
-    }
-    assertSwitched(await run([...input.globals, 'tab', tabId]));
-    return tabId;
-  });
+      try {
+        browserRunRegistry.claimTab(input.context, tabId);
+      } catch (error) {
+        throw new BrowserTabError(
+          'tab_owned_by_other_conversation',
+          error instanceof Error ? error.message : String(error),
+        );
+      }
+      assertSwitched(await run([...input.globals, 'tab', tabId]));
+      return tabId;
+    },
+  );
 }
 
-/** Compatibility alias for callers compiled against the previous helper name. */
-export const claimConversationTab = ensureConversationTab;
+export async function claimConversationTabById(
+  input: BrowserTabInput,
+  tabId: string,
+): Promise<string> {
+  return browserService.exclusive(
+    {
+      sessionName: input.sessionName,
+      bin: input.bin,
+      runner: input.runner,
+      signal: input.signal,
+    },
+    async (run) => {
+      const tabs = parseListedTabs(
+        await run([...input.globals, 'tab', 'list', '--json']),
+      );
+      if (!tabs.some((tab) => tab.id === tabId)) {
+        throw new BrowserTabError(
+          'tab_not_found',
+          `浏览器标签不存在：${tabId}`,
+        );
+      }
+      try {
+        browserRunRegistry.claimTab(input.context, tabId);
+      } catch (error) {
+        throw new BrowserTabError(
+          'tab_owned_by_other_conversation',
+          error instanceof Error ? error.message : String(error),
+        );
+      }
+      assertSwitched(await run([...input.globals, 'tab', tabId]));
+      return tabId;
+    },
+  );
+}