@probelabs/probe 0.6.0-rc314 → 0.6.0-rc316

package/build/query.js

@@ -18,6 +18,7 @@ const QUERY_FLAG_MAP = {
 	language: '--language',
 	ignore: '--ignore',
 	allowTests: '--allow-tests',
+	withContext: '--with-context',
 	maxResults: '--max-results',
 	format: '--format'
 };
@@ -32,6 +33,7 @@ const QUERY_FLAG_MAP = {
  * @param {string} [options.language] - Programming language to search in
  * @param {string[]} [options.ignore] - Patterns to ignore
  * @param {boolean} [options.allowTests] - Include test files
+ * @param {boolean} [options.withContext] - Include owning source-block context in JSON output
  * @param {number} [options.maxResults] - Maximum number of results
  * @param {string} [options.format] - Output format ('markdown', 'plain', 'json', 'color')
  * @param {Object} [options.binaryOptions] - Options for getting the binary
@@ -120,4 +122,4 @@ export async function query(options) {
 		const errorMessage = `Error executing query command: ${error.message}\nCommand: ${command}\nCwd: ${cwd}`;
 		throw new Error(errorMessage);
 	}
-}
+}

package/build/tools/common.js

@@ -33,7 +33,8 @@ export const querySchema = z.object({
 	pattern: z.string().describe('AST pattern to search for. Use $NAME for variable names, $$$PARAMS for parameter lists, etc.'),
 	path: z.string().optional().default('.').describe('Path to search in'),
 	language: z.string().optional().default('rust').describe('Programming language to use for parsing'),
-	allow_tests: z.boolean().optional().default(true).describe('Allow test files in search results')
+	allow_tests: z.boolean().optional().default(true).describe('Allow test files in search results'),
+	with_context: z.boolean().optional().default(false).describe('Include owning source-block context in JSON output')
 });
 
 export const extractSchema = z.object({

package/build/tools/vercel.js

@@ -141,9 +141,16 @@ const CODE_SEARCH_SCHEMA = {
  * Returns: { action: 'allow'|'block'|'rewrite', rewritten?: string, reason: string }
  */
 async function checkDelegateDedup(newQuery, previousQueries, model, debug) {
-	if (!model || previousQueries.length === 0) {
+	if (previousQueries.length === 0) {
 		return { action: 'allow', reason: 'no previous queries' };
 	}
+	if (!model) {
+		return {
+			action: 'allow',
+			reason: 'dedup model unavailable',
+			error: 'dedup_model_unavailable'
+		};
+	}
 
 	const previousList = previousQueries
 		.map((q, i) => {
@@ -203,11 +210,18 @@ Examples:
 			return { action: 'block', reason: parts[1]?.trim() || 'duplicate query' };
 		} else if (action === 'rewrite' && parts[2]) {
 			return { action: 'rewrite', reason: parts[1]?.trim() || 'refined query', rewritten: parts[2].trim() };
+		} else if (action === 'allow') {
+			return { action: 'allow', reason: parts[1]?.trim() || 'new concept' };
 		}
-		return { action: 'allow', reason: parts[1]?.trim() || 'new concept' };
+		return {
+			action: 'allow',
+			reason: 'dedup returned unparseable response',
+			error: `unexpected_response:${line.slice(0, 200)}`
+		};
 	} catch (err) {
-		if (debug) console.error('[DEDUP-LLM] Error:', err.message);
-		return { action: 'allow', reason: 'dedup check failed, allowing' };
+		const errorMessage = err instanceof Error ? `${err.name}: ${err.message}` : String(err);
+		if (debug) console.error('[DEDUP-LLM] Error:', errorMessage);
+		return { action: 'allow', reason: 'dedup check failed', error: errorMessage };
 	}
 }
 
@@ -702,7 +716,7 @@ export const searchTool = (options = {}) => {
 				}
 			}
 
-			// ── Delegate-level semantic dedup ────────────────────────────
+				// ── Delegate-level semantic dedup ────────────────────────────
 				// Each delegate is a full flash agent session (minutes, not seconds).
 				// Use LLM to detect semantic duplicates and suggest rewrites.
 				// Compare against ALL previous delegations (not filtered by path) because
@@ -713,10 +727,10 @@ export const searchTool = (options = {}) => {
 				let effectiveQuery = searchQuery;
 
 				if (previousDelegations.length > 0) {
+					const dedupProvider = options.searchDelegateProvider || process.env.PROBE_SEARCH_DELEGATE_PROVIDER || options.provider || process.env.FORCE_PROVIDER || null;
+					const dedupModelName = options.searchDelegateModel || process.env.PROBE_SEARCH_DELEGATE_MODEL || options.model || process.env.MODEL_NAME || null;
 					// Lazily create the dedup model (same provider/model as delegate)
 					if (cachedDedupModel === undefined) {
-						const dedupProvider = options.searchDelegateProvider || process.env.PROBE_SEARCH_DELEGATE_PROVIDER || options.provider || process.env.FORCE_PROVIDER || null;
-						const dedupModelName = options.searchDelegateModel || process.env.PROBE_SEARCH_DELEGATE_MODEL || options.model || process.env.MODEL_NAME || null;
 						if (debug) {
 							console.error(`[DEDUP-LLM] Creating model: provider=${dedupProvider}, model=${dedupModelName}`);
 						}
@@ -730,6 +744,9 @@ export const searchTool = (options = {}) => {
 						'dedup.query': searchQuery,
 						'dedup.previous_count': String(previousDelegations.length),
 						'dedup.previous_queries': previousDelegations.map(d => d.query).join(' | '),
+						'dedup.provider': dedupProvider || '',
+						'dedup.model': dedupModelName || '',
+						'dedup.model_available': cachedDedupModel ? 'true' : 'false',
 					};
 
 					const dedup = options.tracer?.withSpan
@@ -740,6 +757,7 @@ export const searchTool = (options = {}) => {
 								'dedup.action': result.action,
 								'dedup.reason': result.reason || '',
 								'dedup.rewritten': result.rewritten || '',
+								'dedup.error': result.error || '',
 							});
 						})
 						: await checkDelegateDedup(searchQuery, previousDelegations, cachedDedupModel, debug);
@@ -918,7 +936,7 @@ export const queryTool = (options = {}) => {
 		name: 'query',
 		description: queryDescription,
 		inputSchema: querySchema,
-		execute: async ({ pattern, path, language, allow_tests }) => {
+		execute: async ({ pattern, path, language, allow_tests, with_context }) => {
 			try {
 				// Parse and resolve paths (supports comma-separated and relative paths)
 				let queryPaths;
@@ -944,6 +962,7 @@ export const queryTool = (options = {}) => {
 					cwd: options.cwd, // Working directory for resolving relative paths
 					language,
 					allowTests: allow_tests ?? true,
+					withContext: with_context ?? false,
 					json: false
 				});