Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

browser: forgive misplaced extract fields; wait for a reconnecting extension

Dashb2a46fd40331
diff --git a/apps/desktop/src/main/mcp-integrations/browser-backend/__tests__/user-browser-backend.test.ts b/apps/desktop/src/main/mcp-integrations/browser-backend/__tests__/user-browser-backend.test.ts
index acf0b15030..bead62360c 100644
--- a/apps/desktop/src/main/mcp-integrations/browser-backend/__tests__/user-browser-backend.test.ts
+++ b/apps/desktop/src/main/mcp-integrations/browser-backend/__tests__/user-browser-backend.test.ts
@@ -85,6 +85,7 @@ function backend(
return new UserBrowserBackend({
getPageControl: () => control,
...(resolveUploadRoots ? { resolveUploadRoots } : {}),
+ reconnectWaitMs: 0,
logger: { info: vi.fn(), warn: vi.fn() },
});
}
@@ -733,4 +734,17 @@ describe('UserBrowserBackend · 读取与动作', () => {
data: { note: expect.stringContaining('不抢焦点') },
});
});
+
+ it('status 先等扩展重连几秒,不在刷新后的空档里报未连接', async () => {
+ const fake = fakeControl({ version: '0.4.46' });
+ let calls = 0;
+ const realStatus = (fake.control.bridge as unknown as { status: () => Promise<{ ok: boolean; clients: Array<{ connected: boolean }> }> }).status;
+ (fake.control.bridge as unknown as { status: () => Promise<unknown> }).status = async () => {
+ const s = await realStatus();
+ return ++calls < 3 ? { ...s, clients: [] } : s;
+ };
+ const b = new UserBrowserBackend({ getPageControl: () => fake.control, reconnectWaitMs: 5000, logger: { info: vi.fn(), warn: vi.fn() } });
+ expect(await call(b, { action: 'status' })).toMatchObject({ ok: true, data: { connected: true } });
+ expect(calls).toBe(3);
+ });
});
diff --git a/apps/desktop/src/main/mcp-integrations/browser-backend/user-browser-backend.ts b/apps/desktop/src/main/mcp-integrations/browser-backend/user-browser-backend.ts
index 40ca0251fe..2f64faec7b 100644
--- a/apps/desktop/src/main/mcp-integrations/browser-backend/user-browser-backend.ts
+++ b/apps/desktop/src/main/mcp-integrations/browser-backend/user-browser-backend.ts
@@ -45,6 +45,8 @@ export interface UserBrowserBackendOptions {
warn(message: string, meta?: unknown): void;
};
now?(): number;
+ /** status 时扩展未连接,先等它重连这么久(扩展刷新或更新后会断开几秒);默认 8 秒。 */
+ reconnectWaitMs?: number;
}
interface TargetRecord {
@@ -545,7 +547,14 @@ export class UserBrowserBackend implements BrowserBackend {
capabilities: userBrowserCapabilities(null),
});
}
- const status = await control.bridge.status();
+ let status = await control.bridge.status();
+ // Right after an extension reload or update it reconnects within seconds: wait briefly before
+ // reporting "not connected", so the agent does not give up on a browser that is coming back.
+ const deadline = (this.opts.now ?? Date.now)() + (this.opts.reconnectWaitMs ?? 8000);
+ while (status.ok && !status.clients.some((c) => c.connected) && (this.opts.now ?? Date.now)() < deadline) {
+ await sleep(500);
+ status = await control.bridge.status();
+ }
if (!status.ok) {
return actionOk(req.action, {
ready: false,
diff --git a/packages/lizi-mcps/src/browser/browserMcpServer.test.ts b/packages/lizi-mcps/src/browser/browserMcpServer.test.ts
index 0eb4360174..6e3fa30308 100644
--- a/packages/lizi-mcps/src/browser/browserMcpServer.test.ts
+++ b/packages/lizi-mcps/src/browser/browserMcpServer.test.ts
@@ -1765,6 +1765,18 @@ describe('browser · backend capability gating (user browser via extension)', ()
} finally { await h.cleanup(); }
});
+ it('accepts extract fields written next to extract, and urls in afterSnapshot, for any backend', async () => {
+ const h = await makeHarness();
+ try {
+ const extracted = await h.client.callTool({ name: 'call_tool', arguments: { name: 'browser', args: { action: 'extract', targetId: 't1', fields: { title: 'h1' }, from: 'main', multiple: true } } });
+ expect(extracted.isError).toBeFalsy();
+ expect(h.calls[0]).toMatchObject({ action: 'act', request: { kind: 'evaluate', domRead: { kind: 'extract', extract: { fields: { title: 'h1' }, from: 'main', multiple: true } } } });
+ const clicked = await h.client.callTool({ name: 'call_tool', arguments: { name: 'browser', args: { action: 'act', targetId: 't1', request: { kind: 'click', ref: 'e1' }, afterSnapshot: { urls: true } } } });
+ expect(clicked.isError).toBeFalsy();
+ expect(h.calls.find((c) => (c as { action?: string }).action === 'snapshot')).toMatchObject({ action: 'snapshot', urls: true });
+ } finally { await h.cleanup(); }
+ });
+
it('ignores a browser name passed as target instead of failing schema validation', async () => {
const h = await makeHarness({ backendCapabilities: () => ({ ...caps(), pointer: true }) });
try {
diff --git a/packages/lizi-mcps/src/browser/tool-registry.ts b/packages/lizi-mcps/src/browser/tool-registry.ts
index 6cc9241f31..91b58947f7 100644
--- a/packages/lizi-mcps/src/browser/tool-registry.ts
+++ b/packages/lizi-mcps/src/browser/tool-registry.ts
@@ -28,6 +28,11 @@ export interface BrowserToolDef {
*/
rules?: string[];
inputShape: z.ZodRawShape;
+ /**
+ * Moves arguments the agent put in an unambiguous wrong place before strict validation (for example
+ * extraction fields written next to `extract` instead of inside it). Anything else still fails.
+ */
+ normalizeArgs?: (raw: Record<string, unknown>) => Record<string, unknown>;
handler: BrowserToolHandler;
}
@@ -47,6 +52,7 @@ export class BrowserToolRegistry {
description: string;
rules?: string[];
inputShape: T;
+ normalizeArgs?: (raw: Record<string, unknown>) => Record<string, unknown>;
handler: BrowserToolHandler<{ [K in keyof T]: z.infer<T[K]> }>;
}): void {
if (this.tools.has(def.name)) {
@@ -115,7 +121,8 @@ export class BrowserToolRegistry {
// "返回成功、实际忽略",误导其以为生效(典型:camelCase 写成 sessionIds 而非 session_ids)。
// 失败分支已带 schema + hint,agent 可据此自纠重试。
const objSchema = z.strictObject(def.inputShape);
- const parsed = objSchema.safeParse(rawArgs ?? {});
+ const input = rawArgs && typeof rawArgs === 'object' && def.normalizeArgs ? def.normalizeArgs(rawArgs as Record<string, unknown>) : rawArgs;
+ const parsed = objSchema.safeParse(input ?? {});
if (!parsed.success) {
let jsonSchema: unknown;
try {
diff --git a/packages/lizi-mcps/src/browser/tools.ts b/packages/lizi-mcps/src/browser/tools.ts
index 132130b788..6fad739a78 100644
--- a/packages/lizi-mcps/src/browser/tools.ts
+++ b/packages/lizi-mcps/src/browser/tools.ts
@@ -606,6 +606,12 @@ export function registerBrowserTools(registry: BrowserToolRegistry, deps: Browse
const elementQuery = elementQuerySchema(deps);
registry.register({
name: 'browser',
+ // Agents of every backend often write extract's fields/from/multiple next to it instead of inside it.
+ normalizeArgs: (raw) => {
+ if (raw.action !== 'extract' || raw.extract !== undefined || raw.fields === undefined) return raw;
+ const { fields, from, multiple, ...rest } = raw;
+ return { ...rest, extract: { fields, ...(from !== undefined ? { from } : {}), ...(multiple !== undefined ? { multiple } : {}) } };
+ },
category: 'browser',
description:
'浏览器自动化统一入口。通过 action 选择 status/start/tabs/navigate/snapshot/screenshot/act 等操作; ' +
@@ -656,6 +662,7 @@ export function registerBrowserTools(registry: BrowserToolRegistry, deps: Browse
interactive: z.boolean().optional(),
depth: z.number().int().nonnegative().optional(),
maxChars: z.number().int().min(1).max(20_000).optional(),
+ urls: z.boolean().optional(),
}).optional().describe('动作成功后读取精简快照,正文默认最多 4000 字符;只读失败不改变动作的成功状态,不要重复动作'),
labels: z.boolean().optional(),
urls: z.boolean().optional(),