agentroam 0.2.0-preview.1 → 0.2.0-preview.2

package/runtime/node_modules/@agent/core/dist/index.js

@@ -5398,9 +5398,37 @@ ${truncated}`
   }
 }
 // src/domain/tool/builtin/WebSearchTool.ts
+var BROWSER_UA = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0 Safari/537.36";
+function stripTags(html) {
+  return html.replace(/<[^>]+>/g, "");
+}
+function decodeEntities(text) {
+  return text.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;|&apos;/g, "'").replace(/&nbsp;/g, " ").replace(/&amp;/g, "&");
+}
+function describeError(err) {
+  if (!(err instanceof Error))
+    return "Search failed";
+  const cause = err.cause;
+  const causeMsg = cause instanceof Error ? cause.message : typeof cause === "string" ? cause : "";
+  return causeMsg ? `${err.message}: ${causeMsg}` : err.message;
+}
+function decodeBingRedirect(href) {
+  const decoded = decodeEntities(href);
+  const u = /[?&]u=([^&]+)/.exec(decoded)?.[1];
+  if (u && u.length > 2) {
+    try {
+      const b64 = u.slice(2).replace(/-/g, "+").replace(/_/g, "/");
+      const real = atob(b64);
+      if (/^https?:\/\//.test(real))
+        return real;
+    } catch {}
+  }
+  return decoded;
+}
+
 class WebSearchTool {
   name = "web_search";
-  description = "Search the web for information using DuckDuckGo HTML";
+  description = "Search the web for information using DuckDuckGo HTML, falling back to Bing";
   schema = exports_external.object({
     query: exports_external.string().min(2).describe("The search query")
   });
@@ -5420,44 +5448,63 @@ class WebSearchTool {
         isError: true
       };
     }
-    try {
-      const response = await fetch(`https://html.duckduckgo.com/html/?q=${encodeURIComponent(parsed.data.query)}`, {
-        headers: { "User-Agent": "customer-agent/0.1" },
-        signal: AbortSignal.timeout(15000)
-      });
-      if (!response.ok) {
-        return {
-          toolCallId: "",
-          content: `Search failed: HTTP ${response.status}`,
-          isError: true
-        };
-      }
-      const html = await response.text();
-      const results = this.parseResults(html);
-      return {
-        toolCallId: "",
-        content: results.length > 0 ? results.map((r, i) => `${i + 1}. ${r.title}
+    const errors2 = [];
+    let anySourceResponded = false;
+    for (const search of [this.searchDuckDuckGo, this.searchBing]) {
+      try {
+        const results = await search.call(this, parsed.data.query);
+        anySourceResponded = true;
+        if (results.length > 0) {
+          return {
+            toolCallId: "",
+            content: results.map((r, i) => `${i + 1}. ${r.title}
    ${r.snippet}
    ${r.url}`).join(`
 
-`) : "No results found."
-      };
-    } catch (err) {
+`)
+          };
+        }
+      } catch (err) {
+        errors2.push(describeError(err));
+      }
+    }
+    if (!anySourceResponded && errors2.length > 0) {
       return {
         toolCallId: "",
-        content: err instanceof Error ? err.message : "Search failed",
+        content: `Search failed: ${errors2.join(" | ")}`,
         isError: true
       };
     }
+    return { toolCallId: "", content: "No results found." };
+  }
+  async searchDuckDuckGo(query) {
+    const response = await fetch(`https://html.duckduckgo.com/html/?q=${encodeURIComponent(query)}`, {
+      headers: { "User-Agent": "customer-agent/0.1" },
+      signal: AbortSignal.timeout(15000)
+    });
+    if (!response.ok) {
+      throw new Error(`DuckDuckGo HTTP ${response.status}`);
+    }
+    return this.parseDuckDuckGoResults(await response.text());
+  }
+  async searchBing(query) {
+    const response = await fetch(`https://www.bing.com/search?q=${encodeURIComponent(query)}`, {
+      headers: { "User-Agent": BROWSER_UA, Accept: "text/html" },
+      signal: AbortSignal.timeout(15000)
+    });
+    if (!response.ok) {
+      throw new Error(`Bing HTTP ${response.status}`);
+    }
+    return this.parseBingResults(await response.text());
   }
-  parseResults(html) {
+  parseDuckDuckGoResults(html) {
     const results = [];
     const linkRegex = /<a[^>]*class="result__a"[^>]*href="([^"]*)"[^>]*>([\s\S]*?)<\/a>/gi;
     const snippetRegex = /<a[^>]*class="result__snippet"[^>]*>([\s\S]*?)<\/a>/gi;
     let linkMatch;
     while ((linkMatch = linkRegex.exec(html)) !== null) {
       const url = linkMatch[1];
-      const title = linkMatch[2].replace(/<[^>]+>/g, "").trim();
+      const title = decodeEntities(stripTags(linkMatch[2])).trim();
       if (url && title) {
         results.push({ title, url, snippet: "" });
       }
@@ -5465,11 +5512,30 @@ class WebSearchTool {
     let snippetMatch;
     let i = 0;
     while ((snippetMatch = snippetRegex.exec(html)) !== null && i < results.length) {
-      results[i].snippet = snippetMatch[1].replace(/<[^>]+>/g, "").trim();
+      results[i].snippet = decodeEntities(stripTags(snippetMatch[1])).trim();
       i++;
     }
     return results.slice(0, 10);
   }
+  parseBingResults(html) {
+    const results = [];
+    const blockRegex = /<li class="b_algo"[\s\S]*?<\/li>/gi;
+    let block;
+    while ((block = blockRegex.exec(html)) !== null && results.length < 10) {
+      const chunk = block[0];
+      const link = /<h2[^>]*>\s*<a[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/.exec(chunk);
+      if (!link)
+        continue;
+      const title = decodeEntities(stripTags(link[2])).trim();
+      const snippetMatch = /<p[^>]*>([\s\S]*?)<\/p>/.exec(chunk);
+      const snippet = snippetMatch ? decodeEntities(stripTags(snippetMatch[1])).trim() : "";
+      const url = decodeBingRedirect(link[1]);
+      if (url && title) {
+        results.push({ title, snippet, url });
+      }
+    }
+    return results;
+  }
 }
 // src/domain/tool/builtin/GrepTool.ts
 import { readFile as readFile3, readdir, stat } from "node:fs/promises";
@@ -7302,6 +7368,7 @@ class SkillRegistry {
   promptCache = new Map;
   semanticCache = new Map;
   modelProvider = null;
+  semanticMatchingEnabled = true;
   constructor(loader) {
     this.loader = loader;
   }
@@ -7309,6 +7376,10 @@ class SkillRegistry {
     this.modelProvider = provider;
     this.semanticCache.clear();
   }
+  setSemanticMatchingEnabled(enabled) {
+    this.semanticMatchingEnabled = enabled;
+    this.semanticCache.clear();
+  }
   register(skill) {
     this.skills.set(skill.name, skill);
     if ("prompt" in skill) {
@@ -7326,9 +7397,12 @@ class SkillRegistry {
     return Array.from(this.skills.values());
   }
   findMatching(input) {
+    return this.findMatchingFrom(input, this.skills.values());
+  }
+  findMatchingFrom(input, skills) {
     const lowerInput = input.toLowerCase();
     const matched = [];
-    for (const skill of this.skills.values()) {
+    for (const skill of skills) {
       for (const trigger of skill.triggers) {
         if (lowerInput.includes(trigger.toLowerCase())) {
           matched.push(skill);
@@ -7338,14 +7412,15 @@ class SkillRegistry {
     }
     return matched;
   }
-  async findMatchingSemantic(input) {
-    if (!this.modelProvider || this.skills.size === 0)
+  async findMatchingSemantic(input, candidates) {
+    if (!this.modelProvider || candidates.length === 0)
       return [];
-    const cacheKey = input.trim().slice(0, 200);
+    const candidateKey = candidates.map((skill) => skill.name).sort().join("\x00");
+    const cacheKey = `${input.trim().slice(0, 200)}\x01${candidateKey}`;
     const cached = this.semanticCache.get(cacheKey);
     if (cached)
       return cached;
-    const skillList = Array.from(this.skills.values()).map((s, i) => `${i + 1}. ${s.name}: ${s.description || "(no description)"}`).join(`
+    const skillList = candidates.map((s, i) => `${i + 1}. ${s.name}: ${s.description || "(no description)"}`).join(`
 `);
     const matchPrompt = `You are a skill matching assistant. Given the user's input and a list of available skills with their descriptions, determine which skills are semantically relevant to the user's request.
 
@@ -7379,8 +7454,9 @@ Return ONLY the names of relevant skills, one per line. If none are relevant, re
       const names = trimmed.split(`
 `).map((line) => line.replace(/^\d+\.\s*/, "").replace(/^[\s\-•*]+/, "").trim()).filter(Boolean);
       const matched = [];
+      const candidatesByName = new Map(candidates.map((skill) => [skill.name, skill]));
       for (const name of names) {
-        const skill = this.skills.get(name);
+        const skill = candidatesByName.get(name);
         if (skill && !matched.find((m) => m.name === skill.name)) {
           matched.push(skill);
         }
@@ -7392,24 +7468,22 @@ Return ONLY the names of relevant skills, one per line. If none are relevant, re
     }
   }
   async getSkillPrompts(input, enabledSkills) {
-    let matched = this.findMatching(input);
+    const allowed = enabledSkills && enabledSkills.length > 0 ? new Set(enabledSkills) : null;
+    const eligibleSkills = Array.from(this.skills.values()).filter((skill) => !allowed || allowed.has(skill.name));
+    let matched = this.findMatchingFrom(input, eligibleSkills);
     const slashMatch = input.match(/^\/([\w-]+)/);
     if (slashMatch) {
-      const byName = this.skills.get(slashMatch[1]);
+      const byName = eligibleSkills.find((skill) => skill.name === slashMatch[1]);
       if (byName && !matched.find((m) => m.name === byName.name)) {
         matched.unshift(byName);
       }
     }
-    if (matched.length === 0) {
-      const semanticMatches = await this.findMatchingSemantic(input);
+    if (matched.length === 0 && this.semanticMatchingEnabled && eligibleSkills.length > 0) {
+      const semanticMatches = await this.findMatchingSemantic(input, eligibleSkills);
       if (semanticMatches.length > 0) {
         matched = semanticMatches;
       }
     }
-    if (enabledSkills && enabledSkills.length > 0) {
-      const allowed = new Set(enabledSkills);
-      matched = matched.filter((s) => allowed.has(s.name));
-    }
     if (matched.length === 0)
       return "";
     const parts = [];
@@ -7432,35 +7506,46 @@ ${prompt}`);
 }
 
 // src/domain/context/ContextLoader.ts
-import { readFile as readFile6, readdir as readdir4, stat as stat4 } from "node:fs/promises";
-import { join as join6, basename as basename2 } from "node:path";
-var PROJECT_FILES = [
+import { constants } from "node:fs";
+import { open, readFile as readFile6, readdir as readdir4, realpath, stat as stat4 } from "node:fs/promises";
+import { join as join6, basename as basename2, isAbsolute, relative as relative3, resolve as resolve8, sep } from "node:path";
+var ROOT_PROJECT_FILES = [
+  "AGENTS.md",
   "CLAUDE.md",
   "README.md",
   "CONTRIBUTING.md",
   ".cursorrules",
   ".github/copilot-instructions.md"
 ];
+var CUSTOMER_AGENT_FILES = ROOT_PROJECT_FILES.map((file) => join6(".customer-agent", file));
+var INSTRUCTION_FILES = new Set(["AGENTS.md", "CLAUDE.md"]);
+var EXCLUDED_DIRECTORIES = new Set(["node_modules", ".git", "dist"]);
 
 class ContextLoader {
   async loadProjectContext(rootDir) {
     const files = [];
-    for (const relPath of PROJECT_FILES) {
+    const loadedPaths = new Set;
+    for (const relPath of [...ROOT_PROJECT_FILES, ...CUSTOMER_AGENT_FILES]) {
       const fullPath = join6(rootDir, relPath);
+      if (loadedPaths.has(fullPath))
+        continue;
       try {
         await stat4(fullPath);
         const file = await this.loadFile(fullPath);
         files.push(file);
+        loadedPaths.add(fullPath);
       } catch {}
     }
     try {
-      const claudeFiles = await this.findClaudeMdFiles(rootDir);
-      for (const filePath of claudeFiles) {
-        if (filePath === join6(rootDir, "CLAUDE.md"))
+      const resolvedRoot = await realpath(rootDir);
+      const instructionFiles = await this.findClaudeMdFiles(rootDir);
+      for (const filePath of instructionFiles) {
+        if (loadedPaths.has(filePath))
           continue;
         try {
-          const file = await this.loadFile(filePath);
+          const file = await this.loadRecursiveFile(rootDir, resolvedRoot, filePath);
           files.push(file);
+          loadedPaths.add(filePath);
         } catch {}
       }
     } catch {}
@@ -7470,7 +7555,7 @@ class ContextLoader {
     const content = await readFile6(filePath, "utf-8");
     const fileName = basename2(filePath);
     let type = "other";
-    if (fileName === "CLAUDE.md")
+    if (INSTRUCTION_FILES.has(fileName))
       type = "claude_md";
     else if (fileName === "README.md" || fileName === "CONTRIBUTING.md")
       type = "readme";
@@ -7480,25 +7565,52 @@ class ContextLoader {
       type = "code";
     return { path: filePath, content, type };
   }
+  async loadRecursiveFile(rootDir, resolvedRoot, filePath) {
+    const relativePath = relative3(rootDir, filePath);
+    if (!relativePath || isAbsolute(relativePath) || relativePath === ".." || relativePath.startsWith(`..${sep}`)) {
+      throw new Error("Recursive context candidate is outside the configured root");
+    }
+    const expectedPath = resolve8(resolvedRoot, relativePath);
+    const fileHandle = await open(filePath, constants.O_RDONLY | constants.O_NOFOLLOW);
+    try {
+      const openedStat = await fileHandle.stat();
+      if (!openedStat.isFile()) {
+        throw new Error("Recursive context candidate is not a regular file");
+      }
+      const resolvedPath = await realpath(filePath);
+      if (resolvedPath !== expectedPath) {
+        throw new Error("Recursive context candidate traverses a symbolic link");
+      }
+      const resolvedStat = await stat4(resolvedPath);
+      if (resolvedStat.dev !== openedStat.dev || resolvedStat.ino !== openedStat.ino) {
+        throw new Error("Recursive context candidate changed while opening");
+      }
+      const content = await fileHandle.readFile({ encoding: "utf-8" });
+      return { path: filePath, content, type: "claude_md" };
+    } finally {
+      await fileHandle.close();
+    }
+  }
   async findClaudeMdFiles(rootDir) {
     const results = [];
     const scan = async (dir) => {
       try {
         const entries = await readdir4(dir, { withFileTypes: true });
+        entries.sort((left, right) => left.name.localeCompare(right.name));
         for (const entry of entries) {
-          if (entry.name === "node_modules" || entry.name === ".git" || entry.name === "dist")
+          if (EXCLUDED_DIRECTORIES.has(entry.name))
             continue;
           const fullPath = join6(dir, entry.name);
           if (entry.isDirectory()) {
             await scan(fullPath);
-          } else if (entry.name === "CLAUDE.md") {
+          } else if (entry.isFile() && INSTRUCTION_FILES.has(entry.name)) {
             results.push(fullPath);
           }
         }
       } catch {}
     };
     await scan(rootDir);
-    return results;
+    return results.sort((left, right) => left.localeCompare(right));
   }
 }
 
@@ -8612,6 +8724,7 @@ class AgentBuilder {
   compactThreshold;
   enabledTools = null;
   enabledSkills = null;
+  semanticSkillMatching = true;
   withWorkingDirectory(path) {
     this.workingDirectory = path;
     return this;
@@ -8699,6 +8812,10 @@ class AgentBuilder {
     this.enabledSkills = skillNames.length > 0 ? skillNames : null;
     return this;
   }
+  withSemanticSkillMatching(enabled) {
+    this.semanticSkillMatching = enabled;
+    return this;
+  }
   async build() {
     if (!this.modelProvider) {
       throw new Error("Model provider is required. Call withModelProvider() or withModel()");
@@ -8706,6 +8823,7 @@ class AgentBuilder {
     const remoteToolStore = this.remoteToolStore;
     const projectId = this.projectId;
     this.skillRegistry.setModelProvider(this.modelProvider);
+    this.skillRegistry.setSemanticMatchingEnabled(this.semanticSkillMatching);
     const memoryStore = this.memoryStore ?? new FileSystemMemoryStore(this.workingDirectory);
     const toolRegistry = this.createToolRegistry(remoteToolStore, projectId);
     this.toolRegistry = toolRegistry;
@@ -8753,6 +8871,7 @@ class AgentBuilder {
     const remoteToolStore = this.remoteToolStore;
     const projectId = this.projectId;
     this.skillRegistry.setModelProvider(this.modelProvider);
+    this.skillRegistry.setSemanticMatchingEnabled(this.semanticSkillMatching);
     const memoryStore = this.memoryStore ?? new FileSystemMemoryStore(this.workingDirectory);
     const toolRegistry = this.createToolRegistry(remoteToolStore, projectId);
     this.toolRegistry = toolRegistry;
@@ -8845,7 +8964,7 @@ class MCPClient {
     if (!config.command) {
       return Promise.reject(new Error(`stdio 服务器 "${config.id}" 缺少 command 字段`));
     }
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       const proc = spawn2(config.command, config.args ?? [], {
         env: { ...process.env, ...config.env },
         stdio: ["pipe", "pipe", "pipe"]
@@ -8884,7 +9003,7 @@ class MCPClient {
         clientInfo: { name: "customer-agent", version: "0.1.0" }
       }).then(() => {
         this._connected = true;
-        resolve8();
+        resolve9();
       }).catch(reject);
     });
   }
@@ -8934,7 +9053,7 @@ class MCPClient {
     if (this.config?.transport === "streamableHttp") {
       return this.sendRequestHttp(method, params);
     }
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       if (!this.process || !this.process.stdin) {
         reject(new Error("MCP client not connected"));
         return;
@@ -8950,7 +9069,7 @@ class MCPClient {
         if (response.error) {
           reject(new Error(response.error.message));
         } else {
-          resolve8(response.result);
+          resolve9(response.result);
         }
       });
       const timeout = setTimeout(() => {
@@ -8968,7 +9087,7 @@ class MCPClient {
     });
   }
   sendRequestSSE(method, params) {
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       if (!this.ssePostUrl) {
         reject(new Error("SSE post URL not established"));
         return;
@@ -8981,7 +9100,7 @@ class MCPClient {
         if (response.error)
           reject(new Error(response.error.message));
         else
-          resolve8(response.result);
+          resolve9(response.result);
       });
       const timeout = setTimeout(() => {
         this.pendingRequests.delete(id);
@@ -9047,7 +9166,7 @@ class MCPClient {
     this._connected = true;
   }
   sendRequestHttp(method, params) {
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       const urlStr = this.config?.url ?? this.config?.sseUrl;
       if (!urlStr) {
         reject(new Error("URL not set"));
@@ -9118,7 +9237,7 @@ class MCPClient {
                     if (resp.error)
                       reject(new Error(resp.error.message));
                     else
-                      resolve8(resp.result);
+                      resolve9(resp.result);
                   }
                 } catch {}
                 evType = "";
@@ -9146,7 +9265,7 @@ class MCPClient {
               if (resp.error)
                 reject(new Error(resp.error.message));
               else
-                resolve8(resp.result);
+                resolve9(resp.result);
             } catch {
               reject(new Error(`Invalid JSON response: ${data.slice(0, 100)}`));
             }
@@ -9166,7 +9285,7 @@ class MCPClient {
     });
   }
   connectSSE(config) {
-    return new Promise((resolve8, reject) => {
+    return new Promise((resolve9, reject) => {
       const sseUrl = config.url ?? config.sseUrl;
       if (!sseUrl) {
         reject(new Error("SSE URL is required for remote MCP servers"));
@@ -9220,7 +9339,7 @@ class MCPClient {
                     clientInfo: { name: "customer-agent", version: "0.1.0" }
                   }).then(() => {
                     this._connected = true;
-                    resolve8();
+                    resolve9();
                   }).catch(reject);
                 }
               } else if (eventType === "message" || eventType === "") {
@@ -10135,11 +10254,31 @@ class SQLiteSessionStore {
   }
   async create(session) {
     const db = getDatabase(this.baseDir);
-    const projectId = session.projectId || null;
-    const parentId = session.parentSessionId || null;
+    const projectId = this.resolveProjectId(session.projectId);
+    const parentId = this.resolveParentId(session.parentSessionId);
     db.db.prepare("INSERT INTO sessions (id, project_id, parent_id, title, status, created, updated, metadata) VALUES (?, ?, ?, ?, ?, ?, ?, ?)").run(session.id, projectId, parentId, session.title, session.status, session.created, session.updated, JSON.stringify(session.metadata));
     return session;
   }
+  resolveProjectId(projectId) {
+    if (!projectId)
+      return null;
+    const db = getDatabase(this.baseDir);
+    const exists = db.db.prepare("SELECT 1 FROM projects WHERE id = ?").get(projectId);
+    if (exists)
+      return projectId;
+    console.warn(`[SQLiteSessionStore] project_id "${projectId}" not found — storing session without project (FK-safe).`);
+    return null;
+  }
+  resolveParentId(parentId) {
+    if (!parentId)
+      return null;
+    const db = getDatabase(this.baseDir);
+    const exists = db.db.prepare("SELECT 1 FROM sessions WHERE id = ?").get(parentId);
+    if (exists)
+      return parentId;
+    console.warn(`[SQLiteSessionStore] parent_id "${parentId}" not found — storing session as root (FK-safe).`);
+    return null;
+  }
   async get(id) {
     const db = getDatabase(this.baseDir);
     const row = db.db.prepare("SELECT * FROM sessions WHERE id = ?").get(id);
@@ -10153,7 +10292,7 @@ class SQLiteSessionStore {
     if (!existing)
       throw new Error(`Session not found: ${id}`);
     const merged = { ...existing, ...update, updated: new Date().toISOString() };
-    db.db.prepare("UPDATE sessions SET project_id=?, title=?, status=?, updated=?, metadata=? WHERE id=?").run(merged.projectId, merged.title, merged.status, merged.updated, JSON.stringify(merged.metadata), id);
+    db.db.prepare("UPDATE sessions SET project_id=?, title=?, status=?, updated=?, metadata=? WHERE id=?").run(this.resolveProjectId(merged.projectId), merged.title, merged.status, merged.updated, JSON.stringify(merged.metadata), id);
     return merged;
   }
   async delete(id) {
@@ -10547,7 +10686,7 @@ class SQLiteProjectStore {
   }
   async delete(id) {
     const db = getDatabase(this.baseDir);
-    db.db.prepare("UPDATE sessions SET project_id = '' WHERE project_id = ?").run(id);
+    db.db.prepare("UPDATE sessions SET project_id = NULL WHERE project_id = ?").run(id);
     db.db.prepare("DELETE FROM projects WHERE id = ?").run(id);
   }
   async list() {
@@ -10898,4 +11037,4 @@ export {
   AgentBuilder
 };
 
-//# debugId=A5D7CF646EBE851864756E2164756E21
+//# debugId=05A3BC3FF39651A264756E2164756E21