Implement the PR suggestions from Cubic

Author: Shashikant86

src/semantic-search.ts

@@ -148,19 +148,17 @@ export class SemanticSearchClient {
 			payload.connector = options.connector;
 		}
 
-		try {
-			const controller = new AbortController();
-			const timeoutId = setTimeout(() => controller.abort(), this.timeout);
+		const controller = new AbortController();
+		const timeoutId = setTimeout(() => controller.abort(), this.timeout);
 
+		try {
 			const response = await fetch(url, {
 				method: 'POST',
 				headers,
 				body: JSON.stringify(payload),
 				signal: controller.signal,
 			});
 
-			clearTimeout(timeoutId);
-
 			if (!response.ok) {
 				const text = await response.text();
 				throw new SemanticSearchError(`API error: ${response.status} - ${text}`);
@@ -179,6 +177,8 @@ export class SemanticSearchClient {
 				`Request failed: ${error instanceof Error ? error.message : String(error)}`,
 				{ cause: error },
 			);
+		} finally {
+			clearTimeout(timeoutId);
 		}
 	}
 

src/tool.ts

@@ -504,6 +504,8 @@ export class Tools implements Iterable<BaseTool> {
 	getConnectors(): Set<string> {
 		const connectors = new Set<string>();
 		for (const tool of this.tools) {
+			// Skip internal/utility tools (e.g. tool_search, tool_execute, tool_feedback)
+			if (tool.name.startsWith('tool_')) continue;
 			const connector = tool.name.split('_')[0]?.toLowerCase();
 			if (connector) {
 				connectors.add(connector);
@@ -942,6 +944,8 @@ function semanticToolSearch(semanticClient: SemanticSearchClient): BaseTool {
 			});
 
 			const seen = new Set<string>();
+			// Result shape intentionally omits `parameters` (unlike local tool_search) to match
+			// the Python SDK's create_semantic_tool_search. The semantic API doesn't return schemas.
 			const toolsData: Array<Record<string, unknown>> = [];
 			for (const r of response.results) {
 				if (r.similarityScore >= minScore) {

src/toolsets.ts

@@ -8,6 +8,7 @@ import { type RpcActionResponse, RpcClient } from './rpc-client';
 import {
 	SemanticSearchClient,
 	SemanticSearchError,
+	type SemanticSearchResponse,
 	type SemanticSearchResult,
 	normalizeActionName,
 } from './semantic-search';
@@ -341,7 +342,7 @@ export class StackOneToolSet {
 		const fallbackToLocal = options?.fallbackToLocal ?? true;
 		const accountIds = options?.accountIds;
 
-		let allTools: Tools;
+		let allTools: Tools | undefined;
 		try {
 			// Step 1: Fetch all tools to get available connectors from linked accounts
 			allTools = await this.fetchTools({ accountIds });
@@ -352,6 +353,8 @@ export class StackOneToolSet {
 			}
 
 			// Step 2: Query semantic search API
+			// topK is intentionally omitted here (matching Python SDK) to let the backend
+			// return its default set; client-side filtering + per-connector fallback handle sizing.
 			const response = await this.semanticClient.search(query, { connector });
 
 			// Step 3: Filter results to only available connectors and min_score
@@ -432,7 +435,7 @@ export class StackOneToolSet {
 			// Note: The Python SDK logs a warning here via logger.warning(). A similar
 			// logging mechanism can be added when a logging strategy is established.
 			// allTools may not be defined if fetchTools failed before semantic search
-			if (!allTools!) {
+			if (!allTools) {
 				throw error;
 			}
 
@@ -498,7 +501,7 @@ export class StackOneToolSet {
 			}
 		}
 
-		let response;
+		let response: SemanticSearchResponse;
 		try {
 			response = await this.semanticClient.search(query, {
 				connector,