feat(agent): move aio client to core package, add unit test for parser (#1113)

cjraft · web-flow · commit cb7d1f2b45fe · 2025-08-14T01:08:50.000+08:00
diff --git a/multimodal/omni-tars/code-agent/package.json b/multimodal/omni-tars/code-agent/package.json
@@ -28,8 +28,7 @@
   "dependencies": {
     "@tarko/agent": "workspace:*",
     "@omni-tars/core": "workspace:*",
-    "@tarko/agent-interface": "workspace:*",
-    "node-fetch": "3.3.2"
+    "@tarko/agent-interface": "workspace:*"
   },
   "devDependencies": {
     "@rslib/core": "0.10.0",
diff --git a/multimodal/omni-tars/code-agent/src/CodeAgentPlugin.ts b/multimodal/omni-tars/code-agent/src/CodeAgentPlugin.ts
@@ -8,7 +8,7 @@ import { LLMRequestHookPayload, LLMResponseHookPayload } from '@tarko/agent';
 import { ExcuteBashProvider } from './tools/ExcuteBash';
 import { JupyterCIProvider } from './tools/JupyterCI';
 import { StrReplaceEditorProvider } from './tools/StrReplaceEditor';
-import { AioClient } from './tools/AioFetch';
+import { AioClient } from '@omni-tars/core';
 import assert from 'assert';
 
 /**
diff --git a/multimodal/omni-tars/code-agent/src/tools/ExcuteBash.ts b/multimodal/omni-tars/code-agent/src/tools/ExcuteBash.ts
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Tool, z } from '@tarko/agent';
-import { AioClient } from './AioFetch';
+import { AioClient } from '@omni-tars/core';
+
 export class ExcuteBashProvider {
   private client: AioClient;
 
diff --git a/multimodal/omni-tars/code-agent/src/tools/JupyterCI.ts b/multimodal/omni-tars/code-agent/src/tools/JupyterCI.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Tool, z } from '@tarko/agent';
-import { AioClient } from './AioFetch';
+import { AioClient } from '@omni-tars/core';
 
 export class JupyterCIProvider {
   private client: AioClient;
diff --git a/multimodal/omni-tars/code-agent/src/tools/StrReplaceEditor.ts b/multimodal/omni-tars/code-agent/src/tools/StrReplaceEditor.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Tool, z } from '@tarko/agent';
-import { AioClient } from './AioFetch';
+import { AioClient } from '@omni-tars/core';
 
 export class StrReplaceEditorProvider {
   private client: AioClient;
diff --git a/multimodal/omni-tars/core/examples/aio.ts b/multimodal/omni-tars/core/examples/aio.ts
@@ -1,10 +1,14 @@
-import { AioClient } from '../src/tools/AioFetch';
+import { AioClient } from '../src/utils/aio';
 
 async function main() {
   const client = new AioClient({
     baseUrl: process.env.AIO_SANDBOX_URL!,
   });
 
+  const a = await client.cdpVersion();
+
+  console.log(a);
+
   const c = await client.shellExecWithPolling({
     command: 'ls -al',
   });
diff --git a/multimodal/omni-tars/core/package.json b/multimodal/omni-tars/core/package.json
@@ -23,6 +23,7 @@
     "dev": "rslib build --watch",
     "build": "rslib build",
     "test": "vitest",
+    "coverage": "vitest run --coverage",
     "dev:agent": "tarko --agent ./"
   },
   "dependencies": {
@@ -35,6 +36,7 @@
   "devDependencies": {
     "@rslib/core": "0.10.0",
     "@types/node": "22.15.30",
+    "@vitest/coverage-v8": "^1.0.0",
     "typescript": "^5.5.3",
     "vitest": "^1.0.0",
     "openai": "4.93.0",
diff --git a/multimodal/omni-tars/core/src/AgentBuilder.ts b/multimodal/omni-tars/core/src/AgentBuilder.ts
diff --git a/multimodal/omni-tars/core/src/ComposableAgent.ts b/multimodal/omni-tars/core/src/ComposableAgent.ts
@@ -12,7 +12,6 @@ import {
 } from '@tarko/agent';
 import { AgentComposer } from './AgentComposer';
 import { AgentPlugin } from './AgentPlugin';
-import { SYSTEM_PROMPT } from './environments/prompt';
 
 export interface ComposableAgentOptions extends AgentOptions {
   /** Agent plugins to compose */
diff --git a/multimodal/omni-tars/core/src/index.ts b/multimodal/omni-tars/core/src/index.ts
@@ -4,25 +4,14 @@
  */
 
 export { ComposableAgent, ComposableAgentOptions } from './ComposableAgent';
-export { AgentBuilder } from './AgentBuilder';
-export { ComposableToolCallEngine } from './ComposableToolCallEngine';
-export {
-  ComposableToolCallEngineFactory,
-  createComposableToolCallEngineFactory,
-} from './ComposableToolCallEngineFactory';
-export {
-  AgentCompositionConfig,
-  EnvironmentSection,
-  ToolCallEngineProvider,
-  ToolCallEngineContext,
-  ToolCallEngineCompositionConfig,
-} from './types';
+export { createComposableToolCallEngineFactory } from './ComposableToolCallEngineFactory';
+export { ToolCallEngineProvider, ToolCallEngineContext } from './types';
 
-// Export environment sections for use by agent plugins
 export { CODE_ENVIRONMENT } from './environments/code';
 export { MCP_ENVIRONMENT } from './environments/mcp';
 export { COMPUTER_USE_ENVIRONMENT } from './environments/computer';
 
 export { SnapshotPlugin } from './plugins/snapshot';
 export { AgentPlugin } from './AgentPlugin';
-export * from './utils/parser';
+export { parseCodeContent, parseComputerContent, parseMcpContent } from './utils/parser';
+export { AioClient } from './utils/aio';
diff --git a/multimodal/omni-tars/core/src/types.ts b/multimodal/omni-tars/core/src/types.ts
@@ -4,35 +4,6 @@
  */
 
 import { ChatCompletionMessageToolCall, Tool, ToolCallEngine } from '@tarko/agent';
-import { AgentPlugin } from './AgentPlugin';
-
-/**
- * Configuration for composing multiple agent plugins
- */
-export interface AgentCompositionConfig {
-  /** Base agent name */
-  name: string;
-
-  /** Agent plugins to compose */
-  plugins: AgentPlugin[];
-
-  /** Tool call engine */
-  toolCallEngine: ToolCallEngine;
-
-  /** Maximum iterations for the composed agent */
-  maxIterations?: number;
-}
-
-/**
- * Interface for environment sections that can be combined
- */
-export interface EnvironmentSection {
-  /** Environment name (e.g., 'CODE_ENVIRONMENT', 'MCP_ENVIRONMENT') */
-  name: string;
-
-  /** The prompt content for this environment */
-  content: string;
-}
 
 /**
  * Abstract base class for tool call engine providers that can be composed
diff --git a/multimodal/omni-tars/core/src/utils/aio.ts b/multimodal/omni-tars/core/src/utils/aio.ts
@@ -4,7 +4,6 @@
  */
 
 import { getLogger } from '@tarko/agent';
-import fetch, { RequestInit, Response } from 'node-fetch';
 import type {
   ClientConfig,
   ApiResponse,
@@ -17,6 +16,7 @@ import type {
   FileEditorParams,
   FileListParams,
   FileListResp,
+  CDPVersionResp,
 } from './types';
 
 export class AioClient {
@@ -192,6 +192,12 @@ export class AioClient {
     });
   }
 
+  async cdpVersion(): Promise<ApiResponse<CDPVersionResp>> {
+    return this.base<CDPVersionResp>('/cdp/json/version', {
+      method: 'GET',
+    });
+  }
+
   /**
    * Execute shell command with async polling and timeout management
    * @param params Shell execution parameters
diff --git a/multimodal/omni-tars/core/src/utils/parser.ts b/multimodal/omni-tars/core/src/utils/parser.ts
@@ -138,11 +138,11 @@ export function parseMcpContent(c: string): ParsedContent {
 
     // Extract function calls between FunctionCallBegin and FunctionCallEnd
     const functionCallMatch = mcpEnvContent.match(
-      /<\|FunctionCallBegin\|>\[([\s\S]*?)\]<\|FunctionCallEnd\|>/,
+      /<\|FunctionCallBegin\|>\s*(\[[\s\S]*?\])\s*<\|FunctionCallEnd\|>/,
     );
     if (functionCallMatch) {
       try {
-        const functionCallData = JSON.parse(`[${functionCallMatch[1]}]`) as Array<{
+        const functionCallData = JSON.parse(functionCallMatch[1]) as Array<{
           name: string;
           parameters: Record<string, unknown>;
         }>;
diff --git a/multimodal/omni-tars/core/src/utils/types.ts b/multimodal/omni-tars/core/src/utils/types.ts
@@ -93,3 +93,12 @@ export interface ClientConfig {
   retries?: number;
   retryDelay?: number;
 }
+
+export interface CDPVersionResp {
+  Browser: string;
+  'Protocol-Version': string;
+  'User-Agent': string;
+  'V8-Version': string;
+  'WebKit-Version': string;
+  webSocketDebuggerUrl: string;
+}
diff --git a/multimodal/omni-tars/core/test/AioFetch.test.ts b/multimodal/omni-tars/core/test/AioFetch.test.ts
diff --git a/multimodal/omni-tars/core/test/ComposableToolCallEngine.test.ts b/multimodal/omni-tars/core/test/ComposableToolCallEngine.test.ts
diff --git a/multimodal/omni-tars/core/test/parser.test.ts b/multimodal/omni-tars/core/test/parser.test.ts
diff --git a/multimodal/pnpm-lock.yaml b/multimodal/pnpm-lock.yaml
