chore: remove unsafe assertions and tighten tooling types

Author: 0x5457

packages/aipex-react/src/hooks/use-agent.ts

@@ -9,8 +9,8 @@ import {
   AIPex,
   ContextManager,
   type ContextProvider,
+  type FunctionTool,
   type SessionStorageAdapter,
-  type UnifiedToolDefinition,
 } from "@aipexstudio/aipex-core";
 import { useEffect, useRef, useState } from "react";
 import type { ChatSettings } from "../types";
@@ -32,7 +32,7 @@ export interface UseAgentOptions {
   contextProviders?: ContextProvider[];
 
   /** Tools to register with the agent (optional) */
-  tools?: UnifiedToolDefinition[];
+  tools?: FunctionTool[];
 
   /** System instructions (optional) */
   instructions?: string;
@@ -162,8 +162,7 @@ export function useAgent({
         name,
         instructions: instructions ?? "You are a helpful AI assistant.",
         model,
-        tools:
-          toolsRef.current.length > 0 ? (toolsRef.current as any) : undefined,
+        tools: toolsRef.current.length > 0 ? toolsRef.current : undefined,
         storage: storageRef.current,
         contextManager,
         maxTurns,

packages/aipex-react/src/i18n/tool-names.ts

@@ -10,11 +10,14 @@ export const translatedToolName = (
   toolName: string,
 ): string => {
   try {
+    const translationKey = `tools.${toolName}` as const;
     // Try to get translation from tools namespace
-    const translatedName = t(`tools.${toolName}` as any);
+    const translatedName = t(translationKey, {
+      defaultValue: translationKey,
+    });
 
     // If the translated name is the same as the key, it means no translation was found
-    if (translatedName === `tools.${toolName}`) {
+    if (translatedName === translationKey) {
       // Return formatted original name as fallback
       return formatToolName(toolName);
     }

packages/aipex-react/src/i18n/types.ts

@@ -104,7 +104,7 @@ export interface TranslationResources {
   };
 }
 
-export type TranslationKey =
+export type BaseTranslationKey =
   | "common.title"
   | "common.settings"
   | "common.newChat"
@@ -186,6 +186,8 @@ export type TranslationKey =
   | "config.apiTokenRequired"
   | "config.openSettings";
 
+export type TranslationKey = BaseTranslationKey | `tools.${string}`;
+
 export interface I18nContextValue {
   language: Language;
   t: (key: TranslationKey, params?: Record<string, string | number>) => string;

packages/aipex-react/src/lib/storage.ts

@@ -3,7 +3,11 @@
  * Provides a simple browser localStorage backend for settings and data persistence
  */
 
-import type { KeyValueStorage, WatchCallback } from "@aipexstudio/aipex-core";
+import {
+  type KeyValueStorage,
+  safeJsonParse,
+  type WatchCallback,
+} from "@aipexstudio/aipex-core";
 
 export class LocalStorageKeyValueAdapter<T = unknown>
   implements KeyValueStorage<T>
@@ -22,24 +26,8 @@ export class LocalStorageKeyValueAdapter<T = unknown>
       if (event.key && this.watchers.has(event.key)) {
         const callbacks = this.watchers.get(event.key);
         if (callbacks) {
-          let newValue: T | undefined;
-          let oldValue: T | undefined;
-
-          try {
-            newValue = event.newValue
-              ? (JSON.parse(event.newValue) as T)
-              : undefined;
-          } catch {
-            newValue = undefined;
-          }
-
-          try {
-            oldValue = event.oldValue
-              ? (JSON.parse(event.oldValue) as T)
-              : undefined;
-          } catch {
-            oldValue = undefined;
-          }
+          const newValue = safeJsonParse<T>(event.newValue);
+          const oldValue = safeJsonParse<T>(event.oldValue);
 
           for (const callback of callbacks) {
             callback({ newValue, oldValue });
@@ -76,8 +64,8 @@ export class LocalStorageKeyValueAdapter<T = unknown>
   async load(key: string): Promise<T | null> {
     if (typeof localStorage === "undefined") return null;
     try {
-      const value = localStorage.getItem(key);
-      return value ? (JSON.parse(value) as T) : null;
+      const value = safeJsonParse<T>(localStorage.getItem(key));
+      return value ?? null;
     } catch {
       return null;
     }
@@ -99,9 +87,9 @@ export class LocalStorageKeyValueAdapter<T = unknown>
       const key = localStorage.key(i);
       if (key) {
         try {
-          const value = localStorage.getItem(key);
-          if (value) {
-            results.push(JSON.parse(value) as T);
+          const value = safeJsonParse<T>(localStorage.getItem(key));
+          if (value !== undefined) {
+            results.push(value);
           }
         } catch {
           // Skip non-JSON values

packages/browser-ext/src/hooks/use-agent.ts

@@ -5,6 +5,7 @@
  * configuration (browser tools, context providers, storage).
  */
 
+import type { FunctionTool } from "@aipexstudio/aipex-core";
 import { aisdk, SessionStorage } from "@aipexstudio/aipex-core";
 import {
   createAIProvider,
@@ -67,7 +68,7 @@ export function useAgent({
 
   // Stable references for context providers and tools to prevent infinite loops
   const contextProvidersRef = useRef(allBrowserProviders);
-  const toolsRef = useRef(allBrowserTools);
+  const toolsRef = useRef<FunctionTool[]>(allBrowserTools);
 
   // Use the generic hook with browser-specific configuration
   return useAgentCore({
@@ -76,7 +77,7 @@ export function useAgent({
     modelFactory: modelFactoryRef.current,
     storage,
     contextProviders: contextProvidersRef.current,
-    tools: toolsRef.current as any,
+    tools: toolsRef.current,
     instructions: SYSTEM_PROMPT,
     name: "AIPex Browser Assistant",
     maxTurns: 10,

packages/browser-ext/vite.config.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { crx } from "@crxjs/vite-plugin";
+import { crx, type ManifestV3Export } from "@crxjs/vite-plugin";
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
 import { viteStaticCopy } from "vite-plugin-static-copy";
@@ -9,7 +9,7 @@ import manifest from "./manifest.json";
 export default defineConfig({
   plugins: [
     react(),
-    crx({ manifest: manifest as any }),
+    crx({ manifest: manifest as unknown as ManifestV3Export }),
     viteStaticCopy({
       targets: [
         {

packages/browser-runtime/package.json

@@ -22,6 +22,7 @@
   "type": "module",
   "dependencies": {
     "@aipexstudio/aipex-core": "workspace:*",
+    "micromatch": "^4.0.8",
     "nanoid": "^5.1.6",
     "zod": "^4.1.13"
   },
@@ -35,6 +36,7 @@
     }
   },
   "devDependencies": {
+    "@types/micromatch": "^4.0.10",
     "@types/react": "19.2.7"
   }
 }

packages/browser-runtime/src/automation/query.ts

@@ -1,8 +1,4 @@
-/**
- * Snapshot Query and Search System
- *
- * Provides search functionality for snapshot text with glob pattern support
- */
+import { matcher } from "micromatch";
 
 export const SKIP_ROLES = [
   "generic",
@@ -21,59 +17,7 @@ export const SKIP_ROLES = [
 ];
 
 function hasGlobPattern(str: string): boolean {
-  return /[*?[\]{}]/.test(str);
-}
-
-function matchGlob(
-  pattern: string,
-  text: string,
-  caseSensitive: boolean = false,
-): boolean {
-  if (!caseSensitive) {
-    pattern = pattern.toLowerCase();
-    text = text.toLowerCase();
-  }
-
-  if (pattern.includes("{") && pattern.includes("}")) {
-    const braceStart = pattern.indexOf("{");
-    const braceEnd = pattern.indexOf("}");
-    if (braceStart < braceEnd) {
-      const prefix = pattern.substring(0, braceStart);
-      const suffix = pattern.substring(braceEnd + 1);
-      const alternatives = pattern
-        .substring(braceStart + 1, braceEnd)
-        .split(",");
-
-      for (const alt of alternatives) {
-        const fullPattern = prefix + alt.trim() + suffix;
-        if (matchGlob(fullPattern, text, caseSensitive)) {
-          return true;
-        }
-      }
-      return false;
-    }
-  }
-
-  let regexPattern = pattern
-    .replace(/[.*+^${}()|[\]\\]/g, "\\$&")
-    .replace(/\\\*/g, ".*")
-    .replace(/\\\?/g, ".")
-    .replace(/\\\[/g, "[")
-    .replace(/\\\]/g, "]");
-
-  regexPattern = regexPattern.replace(/\[([^\]]+)\]/g, (_, chars) => {
-    if (chars.includes("-") && chars.length === 3) {
-      return `[${chars}]`;
-    }
-    return `[${chars.replace(/[.*+^${}()|[\]\\]/g, "\\$&")}]`;
-  });
-
-  try {
-    const regex = new RegExp(`${regexPattern}`, "i");
-    return regex.test(text);
-  } catch {
-    return false;
-  }
+  return /[*?[{\]}]/.test(str);
 }
 
 export interface SearchOptions {
@@ -108,6 +52,9 @@ export function searchSnapshotText(
     useGlob !== undefined
       ? useGlob
       : searchTerms.some((term) => hasGlobPattern(term));
+  const matcherFns = shouldUseGlob
+    ? searchTerms.map((term) => matcher(term, { nocase: !caseSensitive }))
+    : [];
 
   const lines = snapshotText.split("\n");
   const matchedLines: number[] = [];
@@ -117,7 +64,9 @@ export function searchSnapshotText(
     if (line === undefined) {
       continue;
     }
-    if (matchLine(line, searchTerms, caseSensitive, shouldUseGlob)) {
+    if (
+      matchLine(line, searchTerms, matcherFns, caseSensitive, shouldUseGlob)
+    ) {
       matchedLines.push(i);
     }
   }
@@ -134,23 +83,19 @@ export function searchSnapshotText(
 function matchLine(
   line: string,
   searchTerms: string[],
+  matchers: Array<(value: string) => boolean>,
   caseSensitive: boolean,
   useGlob: boolean,
 ): boolean {
-  for (const term of searchTerms) {
-    if (useGlob) {
-      if (matchGlob(term, line, caseSensitive)) {
-        return true;
-      }
-    } else {
-      const lineValue = caseSensitive ? line : line.toLowerCase();
-      const searchTerm = caseSensitive ? term : term.toLowerCase();
-      if (lineValue.includes(searchTerm)) {
-        return true;
-      }
-    }
+  if (useGlob) {
+    return matchers.some((match) => match(line));
   }
-  return false;
+
+  const lineValue = caseSensitive ? line : line.toLowerCase();
+  return searchTerms.some((term) => {
+    const searchTerm = caseSensitive ? term : term.toLowerCase();
+    return lineValue.includes(searchTerm);
+  });
 }
 
 function expandLineContext(

packages/browser-runtime/src/storage/storage-adapter.ts

@@ -1,4 +1,4 @@
-import type { KeyValueStorage } from "@aipexstudio/aipex-core";
+import { type KeyValueStorage, safeJsonParse } from "@aipexstudio/aipex-core";
 
 export type WatchCallback<T> = (change: { newValue?: T; oldValue?: T }) => void;
 
@@ -40,12 +40,8 @@ export class ChromeStorageAdapter<T = unknown> implements KeyValueStorage<T> {
       const result = await area.get(key);
       return (result[key] as T) ?? null;
     }
-    try {
-      const value = localStorage.getItem(key);
-      return value ? (JSON.parse(value) as T) : null;
-    } catch {
-      return null;
-    }
+    const parsed = safeJsonParse<T>(localStorage.getItem(key));
+    return parsed ?? null;
   }
 
   async delete(key: string): Promise<void> {
@@ -72,9 +68,9 @@ export class ChromeStorageAdapter<T = unknown> implements KeyValueStorage<T> {
       const key = localStorage.key(i);
       if (key) {
         try {
-          const value = localStorage.getItem(key);
-          if (value) {
-            values.push(JSON.parse(value) as T);
+          const value = safeJsonParse<T>(localStorage.getItem(key));
+          if (value !== undefined) {
+            values.push(value);
           }
         } catch {
           // Skip non-JSON values
@@ -139,9 +135,9 @@ export class ChromeStorageAdapter<T = unknown> implements KeyValueStorage<T> {
       const key = localStorage.key(i);
       if (key) {
         try {
-          const value = localStorage.getItem(key);
-          if (value) {
-            result[key] = JSON.parse(value) as T;
+          const value = safeJsonParse<T>(localStorage.getItem(key));
+          if (value !== undefined) {
+            result[key] = value;
           }
         } catch {
           // Skip non-JSON values

packages/browser-runtime/src/tools/index.ts

@@ -1,3 +1,5 @@
+import type { FunctionTool } from "@aipexstudio/aipex-core";
+
 // Re-export all tool modules
 export * from "./bookmark";
 export * from "./element";
@@ -55,7 +57,7 @@ import {
   switchToTabTool,
 } from "./tab";
 
-export const allBrowserTools = [
+export const allBrowserTools: FunctionTool[] = [
   // Page tools
   getPageInfoTool,
   scrollPageTool,