jinzd-ai-cli 0.4.334 → 0.4.338

package/dist/electron-server.js

@@ -55,7 +55,7 @@ import {
   touchMemoryReferences,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-YTAYWGS4.js";
+} from "./chunk-JUYK4OML.js";
 import {
   DEFAULT_PATTERNS,
   redactJson,
@@ -81,7 +81,7 @@ import {
   recoverGbkMojibake,
   runTestsTool,
   shellInvocation
-} from "./chunk-7GGWVBHG.js";
+} from "./chunk-DCWBDSMO.js";
 import {
   getCurrentSessionKey,
   getExecutionConfigDir,
@@ -123,7 +123,7 @@ import {
   SUBAGENT_MAX_ROUNDS_LIMIT,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-SZQ2C3HH.js";
+} from "./chunk-ATOF545W.js";
 
 // src/web/access.ts
 import { randomBytes, timingSafeEqual } from "crypto";
@@ -262,32 +262,36 @@ var UserProfileSchema = z.object({
   locale: z.string().max(20).optional(),
   /** 自定义人设补充（自由格式，直接注入 system prompt） */
   extra: z.string().max(5e3).optional()
-}).default({});
+}).prefault({});
 var ConfigSchema = z.object({
   version: z.string().default("1.0.0"),
   // 用户身份档案 — 跨 Provider 的 "灵魂"
   userProfile: UserProfileSchema,
   defaultProvider: z.string().default("claude"),
   // 每个 provider 的默认模型（key 为 provider ID）
-  defaultModels: z.record(z.string()).default({}),
+  defaultModels: z.record(z.string(), z.string()).default({}),
   // API Keys：放宽为任意 record，支持自定义 provider ID
-  apiKeys: z.record(z.string()).default({}),
-  customBaseUrls: z.record(z.string()).default({}),
+  apiKeys: z.record(z.string(), z.string()).default({}),
+  customBaseUrls: z.record(z.string(), z.string()).default({}),
   // Per-provider timeout in ms (e.g. { deepseek: 60000 })
   // ⚠️  Timeout 优先级说明（L5）：
   //   1. modelParams[modelId].timeout  — 最高优先级，精确到具体模型（如 deepseek-reasoner 需要更长超时）
   //   2. timeouts[providerId]          — Provider 级默认，覆盖内置默认值
   //   3. 内置 Provider 的硬编码默认值  — 最低兜底（如 OpenAI 兼容系列默认 60000ms）
   //   实现位置：src/providers/registry.ts initialize()，将 timeouts[id] 注入 provider
-  timeouts: z.record(z.number()).default({}),
+  timeouts: z.record(z.string(), z.number()).default({}),
   // HTTP/HTTPS 代理地址（Node.js 不自动使用系统代理，需显式配置）
   // 例：http://127.0.0.1:10809
   // 也可通过环境变量 HTTPS_PROXY / HTTP_PROXY 覆盖
   proxy: z.string().max(500).optional(),
+  // 不走代理的 API 主机（后缀匹配，如 "deepseek.com" 也覆盖 api.deepseek.com；"*" = 全部直连）。
+  // 不填 = 内置国内模型清单（DeepSeek/智谱/Kimi/Qwen/MiniMax 直连，见 core/proxy.ts）；
+  // 填 [] = 所有 Provider 都走代理（公司网络只能经代理出网时用）。
+  noProxy: z.array(z.string().max(200)).max(100).optional(),
   // 自定义 Provider 列表（OpenAI 兼容接口，无需改代码）
   customProviders: z.array(CustomProviderConfigSchema).default([]),
   // 按模型 ID 存储的推理参数（key 为模型 ID，如 "deepseek-chat"）
-  modelParams: z.record(ModelParamsSchema).default({}),
+  modelParams: z.record(z.string(), ModelParamsSchema).default({}),
   ui: z.object({
     streaming: z.boolean().default(true),
     markdownRendering: z.boolean().default(true),
@@ -321,12 +325,12 @@ var ConfigSchema = z.object({
       toolResult: z.string().optional(),
       heading: z.string().optional()
     }).optional()
-  }).default({}),
+  }).prefault({}),
   session: z.object({
     autoSave: z.boolean().default(true),
     maxHistoryDays: z.number().default(30),
     systemPrompt: z.string().max(1e5).optional()
-  }).default({}),
+  }).prefault({}),
   // 项目上下文文件配置
   // 启动时自动读取并注入 system prompt，类似 Claude Code 的 CLAUDE.md / Codex AGENTS.md 机制
   // 默认按顺序查找：AICLI.override.md → AGENTS.override.md → AICLI.md → CLAUDE.md → AGENTS.md
@@ -336,13 +340,13 @@ var ConfigSchema = z.object({
     projectDocFallbackFilenames: z.array(z.string().max(500)).max(20).default([]),
     projectDocMaxBytes: z.number().int().positive().default(32 * 1024),
     showLoadedContextSources: z.boolean().default(false)
-  }).default({}),
+  }).prefault({}),
   // 持久记忆注入配置（MEM-005）
   // maxChars: 注入 system prompt 的字符预算，超出丢最老条目并显式标注截断。
   // 注意 CJK ≈ 1 字符/token——中文记忆的 token 开销约等于字符数。
   memory: z.object({
     maxChars: z.number().int().positive().max(2e5).default(1e4)
-  }).default({}),
+  }).prefault({}),
   // Google Custom Search API 的 Search Engine ID (cx 参数)
   // API Key 通过 apiKeys['google-search'] 或 AICLI_API_KEY_GOOGLESEARCH 环境变量配置
   // CX 也可通过 AICLI_GOOGLE_CX 环境变量覆盖
@@ -354,7 +358,7 @@ var ConfigSchema = z.object({
   // 仍想用 API 版？把 enabled 设为 true，并务必到 GCP Console 把 Custom Search Quota 设硬上限。
   googleSearch: z.object({
     enabled: z.boolean().default(false)
-  }).default({ enabled: false }),
+  }).prefault({ enabled: false }),
   // MCP (Model Context Protocol) 全局开关（v0.4.135+）
   // false 时启动跳过 connectAll()，所有 MCP 服务器都不连，节省冷启动时间 + 工具定义 token。
   // 对应你的 skills（whitelist 不依赖 MCP 工具时）完全不受影响。
@@ -363,10 +367,10 @@ var ConfigSchema = z.object({
   // 声明外部 MCP 服务器，启动时自动连接、发现工具并注册
   // 配置格式兼容 Claude Desktop（command + args + env）
   // 示例：{ "filesystem": { "command": "npx", "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path"] } }
-  mcpServers: z.record(z.object({
+  mcpServers: z.record(z.string(), z.object({
     command: z.string().max(500),
     args: z.array(z.string()).max(100).default([]),
-    env: z.record(z.string()).optional(),
+    env: z.record(z.string(), z.string()).optional(),
     timeout: z.number().int().min(100).max(3e5).default(3e4)
   })).default({}),
   // Hooks 生命周期（v0.4.212+）：兼容旧 pre/post 字符串，同时支持 events.<EventName> 结构化 JSON hook。
@@ -374,7 +378,7 @@ var ConfigSchema = z.object({
     enabled: z.boolean().default(true),
     preToolExecution: z.string().optional(),
     postToolExecution: z.string().optional(),
-    events: z.record(z.union([
+    events: z.record(z.string(), z.union([
       z.string(),
       z.object({
         command: z.string(),
@@ -412,12 +416,12 @@ var ConfigSchema = z.object({
       google_search: z.enum(["allow", "confirm", "deny"]).optional(),
       shell: z.enum(["allow", "confirm", "deny"]).optional(),
       mcp: z.enum(["allow", "confirm", "deny"]).optional()
-    }).default({})
-  }).default({ enabled: false, defaultAction: "confirm", allowDomains: [], denyDomains: [], allowPorts: [], denyPorts: [], allowPrivateNetwork: false, tools: {} }),
+    }).prefault({})
+  }).prefault({ enabled: false, defaultAction: "confirm", allowDomains: [], denyDomains: [], allowPorts: [], denyPorts: [], allowPrivateNetwork: false, tools: {} }),
   // 权限 Profile（v0.4.211+）：legacy 保持旧行为；其余 profile 提供更清晰的安全边界。
   defaultPermissionProfile: z.enum(["legacy", "read-only", "workspace-write", "danger-full-access"]).default("legacy"),
   allowedPermissionProfiles: z.array(z.string().max(50)).max(20).default(["legacy", "read-only", "workspace-write", "danger-full-access"]),
-  permissionProfiles: z.record(z.object({
+  permissionProfiles: z.record(z.string(), z.object({
     extends: z.enum(["legacy", "read-only", "workspace-write", "danger-full-access"]).optional(),
     defaultAction: z.enum(["auto-approve", "deny", "confirm"]).optional(),
     workspaceRoots: z.array(z.string()).optional(),
@@ -492,7 +496,7 @@ var ConfigSchema = z.object({
     redactOnSend: z.boolean().default(false),
     mode: z.enum(["default", "strict", "off"]).default("default"),
     customPatterns: z.array(z.string().max(200)).max(50).default([])
-  }).default({}),
+  }).prefault({}),
   // 智能模型路由（v0.4.68+）
   // 按用户每轮输入的内容/标签/长度动态选择模型，在同一 provider 内切换，
   // 例：短问题走 haiku（省钱），planning 走 opus（质量）。
@@ -512,7 +516,7 @@ var ConfigSchema = z.object({
       name: z.string().max(100).optional()
     })).default([]),
     fallback: z.string().optional()
-  }).default({ enabled: false, rules: [] }),
+  }).prefault({ enabled: false, rules: [] }),
   // Provider 容错（v0.4.144+）：网络抖动 / 5xx / 429 时，先在当前 provider 上做指数退避重试，
   // 仍失败则按顺序尝试 chain 里的 fallback provider。auth / 400 / 422 等"硬失败"直接跳过同
   // provider 重试，但仍会尝试 chain（不同 key/schema 可能能成功）。
@@ -532,7 +536,7 @@ var ConfigSchema = z.object({
       provider: z.string().max(100),
       model: z.string().optional()
     })).default([])
-  }).default({ enabled: false, retries: 2, initialBackoffMs: 500, maxBackoffMs: 8e3, chain: [] })
+  }).prefault({ enabled: false, retries: 2, initialBackoffMs: 500, maxBackoffMs: 8e3, chain: [] })
 });
 
 // src/config/env-loader.ts
@@ -806,7 +810,7 @@ ${err}`
     const draft = { ...this.config, [key]: value };
     const result = ConfigSchema.safeParse(draft);
     if (!result.success) {
-      const firstErr = result.error.errors[0];
+      const firstErr = result.error.issues[0];
       throw new ConfigError(
         `Invalid transient config value for "${String(key)}": ${firstErr?.message ?? "validation failed"}`
       );
@@ -858,7 +862,7 @@ ${err}`
     current[keys[keys.length - 1]] = value;
     const result = ConfigSchema.safeParse(draft);
     if (!result.success) {
-      const firstErr = result.error.errors[0];
+      const firstErr = result.error.issues[0];
       throw new ConfigError(`Invalid config value for "${path3}": ${firstErr?.message ?? "validation failed"}`);
     }
     this.config = result.data;
@@ -1479,6 +1483,77 @@ var BaseProvider = class {
 function isFileWriteTool(name) {
   return name === "write_file" || name === "edit_file" || name === "notebook_edit";
 }
+var READ_ONLY_CMDLETS = new Set([
+  "Get-ChildItem",
+  "gci",
+  "Get-Content",
+  "gc",
+  "Get-Item",
+  "gi",
+  "Get-ItemProperty",
+  "gp",
+  "Get-ItemPropertyValue",
+  "Get-Location",
+  "gl",
+  "Test-Path",
+  "Resolve-Path",
+  "Split-Path",
+  "Join-Path",
+  "Get-Command",
+  "gcm",
+  "Get-Service",
+  "gsv",
+  "Get-Process",
+  "gps",
+  "Get-Date",
+  "Get-Alias",
+  "Get-Module",
+  "Get-PSDrive",
+  "Get-Acl",
+  "Get-FileHash",
+  "Get-CimInstance",
+  "Get-NetTCPConnection",
+  "Get-NetIPAddress",
+  "Get-WinEvent",
+  "Get-ComputerInfo",
+  "Get-Culture",
+  "Get-ExecutionPolicy",
+  "Get-Unique",
+  "Select-Object",
+  "select",
+  "Where-Object",
+  "Sort-Object",
+  "Measure-Object",
+  "Group-Object",
+  "Compare-Object",
+  "Select-String",
+  "sls",
+  "Format-Table",
+  "ft",
+  "Format-List",
+  "fl",
+  "Format-Wide",
+  "Out-String",
+  "Write-Output",
+  "Write-Host",
+  // Waiting is harmless on its own; chained segments still have to pass this list (v0.4.338).
+  "Start-Sleep",
+  // ls is read-only both as the PowerShell alias and as the Unix binary; models pair it with
+  // Start-Sleep to poll an output folder (2026-11-05 lecture-video run).
+  "ls",
+  "ConvertTo-Json",
+  "ConvertFrom-Json",
+  "ConvertTo-Csv",
+  "ConvertFrom-Csv"
+].map((name) => name.toLowerCase()));
+function isReadOnlyCmdletChain(cmd) {
+  const normalized = cmd.trim().replace(/\s2>\s*\$null\b/gi, " ").replace(/\s2>&1\b/g, " ").replace(/\$(?:env:\w+|null|true|false)\b/gi, "X");
+  if (!normalized || /[&`$<>\n\r(){}]|::/.test(normalized)) return false;
+  return normalized.split(/[;|]/).every((segment) => {
+    const name = segment.trim().split(/\s+/)[0].toLowerCase();
+    return READ_ONLY_CMDLETS.has(name);
+  });
+}
 function getDangerLevel(toolName, args) {
   if (toolName.startsWith("mcp__")) {
     const rawName = toolName.split("__").pop() ?? "";
@@ -1508,6 +1583,7 @@ function getDangerLevel(toolName, args) {
     if (/\b(python3?|node|deno|bun|perl|ruby|php|bash|sh|zsh|pwsh|powershell)(\.exe)?\b[^\n]*?\s-(?:Command|EncodedCommand|c|e|p|r)\b/i.test(cmd)) return "write";
     if (/\bcmd(\.exe)?\s+\/[ck]\b/i.test(cmd)) return "write";
     if (!/[;&|`$<>\n\r(){}]/.test(cmd) && (/^(?:pwd|ls|cat|head|tail|wc|Get-ChildItem|Get-Location|Get-Content)(?:\s+[\w ./\\:*?=,@'"-]+)?\s*$/i.test(cmd.trim()) || /^echo(?:\s+[\w .,'"-]+)?\s*$/.test(cmd.trim()) || /^(?:node|python3?)\s+(?:-v|--version)\s*$/.test(cmd.trim()) || /^git\s+(?:status|log)(?:\s+(?:--short|--porcelain|--oneline|-\d+))*\s*$/.test(cmd.trim()))) return "safe";
+    if (isReadOnlyCmdletChain(cmd)) return "safe";
     return "write";
   }
   if (toolName === "run_tests") return "write";
@@ -2568,6 +2644,41 @@ function readReasoningContent(message) {
   return typeof value === "string" ? value : void 0;
 }
 
+// src/core/proxy.ts
+var DEFAULT_NO_PROXY_HOSTS = [
+  "deepseek.com",
+  "bigmodel.cn",
+  "moonshot.cn",
+  "moonshot.ai",
+  "aliyuncs.com",
+  "minimaxi.com"
+];
+function shouldBypassProxy(baseUrl, noProxy = DEFAULT_NO_PROXY_HOSTS) {
+  if (!baseUrl) return false;
+  let host;
+  try {
+    host = new URL(baseUrl).hostname.toLowerCase();
+  } catch {
+    return false;
+  }
+  if (!host) return false;
+  return noProxy.some((raw) => {
+    const entry = raw.trim().toLowerCase().replace(/^\*?\./, "");
+    if (!entry) return false;
+    if (entry === "*") return true;
+    return host === entry || host.endsWith("." + entry);
+  });
+}
+async function setupProxy(configProxy) {
+  const proxyUrl = process.env.HTTPS_PROXY ?? process.env.HTTP_PROXY ?? process.env.https_proxy ?? process.env.http_proxy ?? configProxy;
+  if (!proxyUrl) return;
+  try {
+    const { ProxyAgent, setGlobalDispatcher } = await import("undici");
+    setGlobalDispatcher(new ProxyAgent({ uri: proxyUrl }));
+  } catch {
+  }
+}
+
 // src/tools/hallucination.ts
 var HALLUCINATION_PATTERNS = [
   /文件路径[：:]\s*`?[^\s`]+\.\w{1,5}/,
@@ -3901,7 +4012,8 @@ var OpenAICompatibleProvider = class extends BaseProvider {
       timeout: this.defaultTimeout,
       maxRetries
     };
-    const proxyUrl = isLoopbackBaseUrl(clientOptions.baseURL) ? void 0 : options?.proxy;
+    const noProxy = Array.isArray(options?.noProxy) ? options.noProxy : DEFAULT_NO_PROXY_HOSTS;
+    const proxyUrl = isLoopbackBaseUrl(clientOptions.baseURL) || shouldBypassProxy(clientOptions.baseURL, noProxy) ? void 0 : options?.proxy;
     try {
       const { Agent: Agent2, ProxyAgent, fetch: undiciFetch } = await import("undici");
       const STREAM_BODY_TIMEOUT = 30 * 60 * 1e3;
@@ -8361,6 +8473,14 @@ function domainMatches(pattern, host) {
   const h = host.trim().toLowerCase().replace(/:\d+$/, "");
   return h === p || h.endsWith(`.${p}`);
 }
+function isHostAllowedByNetworkPolicy(host, policy) {
+  if (!policy?.enabled) return true;
+  if (policy.denyDomains?.some((pattern) => domainMatches(pattern, host))) return false;
+  if (policy.allowDomains && policy.allowDomains.length > 0) {
+    return policy.allowDomains.some((pattern) => domainMatches(pattern, host));
+  }
+  return true;
+}
 function isPrivateNetworkHost(host) {
   const h = host.toLowerCase().replace(/^\[|\]$/g, "");
   if (h === "" || h === "localhost") return true;
@@ -10720,6 +10840,231 @@ ${stderr}`);
 import { promises as dnsPromises } from "dns";
 import net from "net";
 import { Agent } from "undici";
+
+// src/tools/builtin/google-search.ts
+var GOOGLE_SEARCH_API = "https://www.googleapis.com/customsearch/v1";
+var REQUEST_TIMEOUT_MS = 15e3;
+var MAX_RESULTS = 10;
+var DEFAULT_RESULTS = 5;
+var googleSearchContext = {};
+var googleSearchTool = {
+  definition: {
+    name: "google_search",
+    description: "\u26A0\uFE0F NOT RECOMMENDED \u2014 uses Google Custom Search API which requires a paid API key. API keys have leaked in the wild causing tens of thousands of USD in unauthorized charges. PREFER `web_search` (keyless Bing/Google scraping, zero billing risk). This tool is disabled by default; user must set config.googleSearch.enabled=true to use it.",
+    parameters: {
+      query: {
+        type: "string",
+        description: "The search query string.",
+        required: true
+      },
+      num_results: {
+        type: "number",
+        description: "Number of results to return (1-10, default 5).",
+        required: false
+      }
+    },
+    dangerous: false
+  },
+  async execute(args) {
+    const query = String(args["query"] ?? "").trim();
+    if (!query) throw new ToolError("google_search", "query parameter is required");
+    const enabledFlag = googleSearchContext.configManager?.get("googleSearch")?.enabled ?? false;
+    if (!enabledFlag) {
+      throw new ToolError(
+        "google_search",
+        '\u{1F6AB} google_search is disabled by default (v0.4.135+).\n\nWHY: Google Custom Search has no native daily-spend cap. Keys leak (search GitHub for "AIza" \u2014 thousands of public exposures), bots scrape them within hours, and the GCP bill lands days later. Multiple engineers have lost $10k+ USD this way.\n\nRECOMMENDED: use `web_search` instead \u2014 same use case, scrapes Bing/Google public pages, zero API key, zero billing risk.\n\nIF YOU INSIST: edit ~/.aicli/config.json and set `googleSearch.enabled = true`. ALSO go to GCP Console \u2192 Custom Search API \u2192 Quotas and set a hard daily request cap (e.g. 100/day) \u2014 that is the only real damage cap.'
+      );
+    }
+    const numResults = Math.min(
+      Math.max(Math.floor(Number(args["num_results"] ?? DEFAULT_RESULTS)), 1),
+      MAX_RESULTS
+    );
+    const { apiKey, cx } = resolveConfig();
+    const url = new URL(GOOGLE_SEARCH_API);
+    url.searchParams.set("key", apiKey);
+    url.searchParams.set("cx", cx);
+    url.searchParams.set("q", query);
+    url.searchParams.set("num", String(numResults));
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    try {
+      const response = await fetch(url.toString(), {
+        method: "GET",
+        headers: {
+          "Accept": "application/json"
+        },
+        signal: controller.signal
+      });
+      if (!response.ok) {
+        const errorBody = await response.text().catch(() => "");
+        if (response.status === 403) {
+          throw new NetworkError(
+            `Google Search API 403 Forbidden \u2014 Invalid API Key or daily free quota exceeded (100/day).
+Please check your API Key and Search Engine ID configuration.`,
+            403
+          );
+        }
+        if (response.status === 429) {
+          throw new NetworkError("Google Search API 429 \u2014 Too many requests, please try again later.", 429);
+        }
+        throw new NetworkError(
+          `Google Search API error: HTTP ${response.status} ${response.statusText}
+${errorBody.slice(0, 500)}`,
+          response.status
+        );
+      }
+      const data = await response.json();
+      return formatResults(query, data, numResults);
+    } catch (err) {
+      if (err instanceof Error && err.name === "AbortError") {
+        throw new NetworkError(`Google Search request timed out (${REQUEST_TIMEOUT_MS / 1e3}s). Please check your network or proxy configuration.`, void 0, err);
+      }
+      throw err;
+    } finally {
+      clearTimeout(timeout);
+    }
+  }
+};
+function resolveConfig() {
+  let apiKey;
+  let cx;
+  if (googleSearchContext.configManager) {
+    apiKey = googleSearchContext.configManager.getApiKey("google-search");
+    cx = EnvLoader.getGoogleSearchEngineId() ?? googleSearchContext.configManager.get("googleSearchEngineId");
+  } else {
+    apiKey = EnvLoader.getApiKey("google-search");
+    cx = EnvLoader.getGoogleSearchEngineId();
+  }
+  if (!apiKey) {
+    throw new ToolError(
+      "google_search",
+      'Google Search API Key not configured.\nConfigure via one of:\n  1. Run /config \u2192 Configure Google Search\n  2. Set env var AICLI_API_KEY_GOOGLESEARCH\n  3. Add apiKeys["google-search"] to ~/.aicli/config.json'
+    );
+  }
+  if (!cx) {
+    throw new ToolError(
+      "google_search",
+      "Google Search Engine ID (cx) not configured.\nConfigure via one of:\n  1. Run /config \u2192 Configure Google Search\n  2. Set env var AICLI_GOOGLE_CX\n  3. Add googleSearchEngineId to ~/.aicli/config.json\n\nGet one at: https://programmablesearchengine.google.com/ \u2192 Create search engine \u2192 Copy Search Engine ID"
+    );
+  }
+  return { apiKey, cx };
+}
+function formatResults(query, data, _requested) {
+  const items = data.items ?? [];
+  if (items.length === 0) {
+    const info2 = data.searchInformation;
+    return `No results found for: "${query}"` + (info2 ? ` (searched ${info2.formattedTotalResults ?? "0"} pages in ${info2.formattedSearchTime ?? "?"}s)` : "");
+  }
+  const info = data.searchInformation;
+  const header = `Search results for "${query}" (${items.length} of ~${info?.formattedTotalResults ?? "?"} results):
+`;
+  const results = items.map((item, i) => {
+    const title = item.title ?? "Untitled";
+    const link = item.link ?? "";
+    const snippet = item.snippet ?? "";
+    return `${i + 1}. **${title}**
+   URL: ${link}
+   ${snippet}`;
+  });
+  return header + "\n" + results.join("\n\n");
+}
+
+// src/tools/builtin/deepseek-web-api.ts
+var DEEPSEEK_TOOLS_HOST = "api.deepseek.com";
+var BASE_URL = `https://${DEEPSEEK_TOOLS_HOST}/v1/tools`;
+var SEARCH_TIMEOUT_MS = 2e4;
+var FETCH_TIMEOUT_MS = 3e4;
+var DEEPSEEK_MAX_QUERY_CHARS = 128;
+function resolveDeepSeekWebKey(configManager = googleSearchContext.configManager) {
+  const key = configManager ? configManager.getApiKey("deepseek") : EnvLoader.getApiKey("deepseek");
+  if (!key || !key.trim()) return void 0;
+  const policy = configManager?.get("networkPolicy");
+  if (!isHostAllowedByNetworkPolicy(DEEPSEEK_TOOLS_HOST, policy)) return void 0;
+  return key.trim();
+}
+async function deepseekSearch(apiKey, query, count) {
+  const data = await postJson(apiKey, "search", { query, count }, SEARCH_TIMEOUT_MS);
+  return parseDeepSeekSearchResponse(data);
+}
+async function deepseekFetch(apiKey, url) {
+  const data = await postJson(apiKey, "fetch", { url }, FETCH_TIMEOUT_MS);
+  const content = typeof data?.content === "string" ? data.content : "";
+  if (!content.trim()) throw new NetworkError("DeepSeek Fetch returned no content.");
+  return { title: typeof data.title === "string" ? data.title : "", content };
+}
+function parseDeepSeekSearchResponse(data) {
+  const raw = data?.results;
+  if (!Array.isArray(raw)) {
+    throw new NetworkError("DeepSeek Search returned an unexpected response (no results array).");
+  }
+  const out = [];
+  for (const item of raw) {
+    if (!item || typeof item !== "object") continue;
+    const r = item;
+    const url = typeof r["url"] === "string" ? r["url"] : "";
+    const title = typeof r["title"] === "string" ? r["title"].trim() : "";
+    if (!url || !title) continue;
+    out.push({
+      title,
+      url,
+      snippet: typeof r["snippet"] === "string" ? r["snippet"].trim() : "",
+      summary: typeof r["summary"] === "string" ? r["summary"].trim() : "",
+      siteName: typeof r["site_name"] === "string" && r["site_name"] ? r["site_name"] : null,
+      date: typeof r["date"] === "string" && r["date"] ? r["date"] : null,
+      rerankScore: typeof r["rerank_score"] === "number" ? r["rerank_score"] : null,
+      authority: typeof r["authority"] === "number" ? r["authority"] : null
+    });
+  }
+  return out;
+}
+async function postJson(apiKey, endpoint, body, timeoutMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const res = await fetch(`${BASE_URL}/${endpoint}`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      },
+      body: JSON.stringify(body),
+      signal: controller.signal
+    });
+    const text = await res.text();
+    if (!res.ok) {
+      throw new NetworkError(
+        `DeepSeek ${endpoint} HTTP ${res.status}: ${describeDeepSeekError(res.status, text)}`,
+        res.status
+      );
+    }
+    try {
+      return JSON.parse(text);
+    } catch {
+      throw new NetworkError(`DeepSeek ${endpoint} returned non-JSON response.`);
+    }
+  } catch (err) {
+    if (err instanceof Error && err.name === "AbortError") {
+      throw new NetworkError(`DeepSeek ${endpoint} timed out after ${timeoutMs / 1e3}s.`, void 0, err);
+    }
+    throw err;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function describeDeepSeekError(status, bodyText) {
+  let message = "";
+  try {
+    const parsed = JSON.parse(bodyText);
+    if (typeof parsed?.error?.message === "string") message = parsed.error.message;
+  } catch {
+  }
+  if (!message) message = bodyText.trim().slice(0, 200) || "(empty body)";
+  const hint = status === 401 ? " \u2014 DeepSeek API key missing or invalid" : status === 402 ? " \u2014 DeepSeek account balance is insufficient" : status === 403 ? " \u2014 rejected by DeepSeek security policy" : status === 404 ? " \u2014 no usable content at this URL" : status === 429 ? " \u2014 DeepSeek QPS limit exceeded" : "";
+  return message + hint;
+}
+
+// src/tools/builtin/web-fetch.ts
 function htmlToText(html) {
   let text = html.replace(/<script[\s\S]*?<\/script>/gi, "").replace(/<style[\s\S]*?<\/style>/gi, "").replace(/<noscript[\s\S]*?<\/noscript>/gi, "").replace(/<svg[\s\S]*?<\/svg>/gi, "");
   const HTML_REGEX_LIMIT = 2e5;
@@ -10892,7 +11237,7 @@ function ssrfSafeDispatcher() {
 var webFetchTool = {
   definition: {
     name: "web_fetch",
-    description: "Fetch a URL and return its content as plain text / Markdown. Use this to read documentation, API references, READMEs, articles, or any public web page. Follows redirects automatically. Returns the first ~16000 characters of extracted text.",
+    description: "Fetch a URL and return its content as plain text / Markdown. Use this to read documentation, API references, READMEs, articles, or any public web page. Follows redirects automatically. Returns the first ~16000 characters of extracted text. If the direct request fails and a DeepSeek API key is configured, retries once via the DeepSeek Fetch API.",
     parameters: {
       url: {
         type: "string",
@@ -10922,94 +11267,26 @@ var webFetchTool = {
       if (e.message.startsWith("Blocked:")) throw e;
       throw new NetworkError(`Invalid URL: "${url}"`);
     }
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 2e4);
-    let rawHtml;
-    let finalUrl;
-    let contentType;
-    const MAX_REDIRECTS = 10;
-    const FETCH_HEADERS = {
-      "User-Agent": "Mozilla/5.0 (compatible; ai-cli/1.0; +https://github.com/ai-cli)",
-      Accept: "text/html,application/xhtml+xml,text/plain,*/*",
-      "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8"
-    };
-    const dispatcher = ssrfSafeDispatcher();
+    let text;
     try {
-      let currentUrl = url;
-      let resp = null;
-      for (let hop = 0; hop <= MAX_REDIRECTS; hop++) {
-        const parsedHop = new URL(currentUrl);
-        if (isPrivateHost(parsedHop.hostname)) {
-          throw new NetworkError(`Blocked: redirect to private/internal address "${currentUrl}".`);
-        }
-        await resolveAndCheck(parsedHop.hostname);
-        const r = await fetch(currentUrl, {
-          signal: controller.signal,
-          headers: FETCH_HEADERS,
-          redirect: "manual",
-          // 手动控制重定向
-          dispatcher
-          // dual undici-types：`dispatcher` 字段在 undici 与 @types/node 内置的
-          // undici-types 两份 RequestInit 间判不兼容，localized 转换。
-        });
-        if (r.status >= 300 && r.status < 400) {
-          if (hop >= MAX_REDIRECTS) {
-            throw new NetworkError(`Too many redirects (>${MAX_REDIRECTS}): ${url}`);
-          }
-          const location = r.headers.get("Location");
-          if (!location) {
-            resp = r;
-            break;
-          }
-          currentUrl = new URL(location, currentUrl).href;
-          continue;
-        }
-        resp = r;
-        break;
-      }
-      if (!resp) throw new NetworkError(`Too many redirects (>${MAX_REDIRECTS}): ${url}`);
-      finalUrl = currentUrl;
-      contentType = resp.headers.get("content-type") ?? "";
-      if (!resp.ok) {
-        throw new NetworkError(`HTTP ${resp.status} ${resp.statusText}`, resp.status);
-      }
-      const bodyBytes = await readBodyCapped(resp, MAX_BODY_BYTES);
-      clearTimeout(timeoutId);
-      rawHtml = new TextDecoder("utf-8", { fatal: false }).decode(bodyBytes);
+      text = await fetchDirect(url);
     } catch (err) {
-      clearTimeout(timeoutId);
-      if (err.name === "AbortError") {
-        throw new NetworkError(`Request timed out after 20s: ${url}`, void 0, err);
-      }
-      const cause = err.cause;
-      if (cause?.message?.startsWith("Blocked:")) throw new NetworkError(cause.message);
-      if (err instanceof Error && err.message === "fetch failed") {
-        const detail = cause?.message ? ` (${cause.message})` : "";
-        throw new NetworkError(
-          `Connection failed for ${url}${detail}. The domain may be unreachable from the current network (some sites require a proxy \u2014 see config.proxy) or temporarily down. Do not retry the same URL; try an alternative source.`,
-          void 0,
-          err
-        );
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.startsWith("Blocked:")) throw err;
+      const key = resolveDeepSeekWebKey();
+      if (!key) throw err;
+      try {
+        const ds = await deepseekFetch(key, url);
+        text = [
+          ds.title ? `# ${ds.title}` : "",
+          `Source: ${url} (via DeepSeek Fetch \u2014 direct request failed: ${msg.split("\n")[0]})`,
+          ""
+        ].filter(Boolean).join("\n") + "\n\n" + ds.content;
+      } catch (dsErr) {
+        const dsMsg = dsErr instanceof Error ? dsErr.message : String(dsErr);
+        throw new NetworkError(`${msg}
+DeepSeek Fetch fallback also failed: ${dsMsg}`, void 0, err);
       }
-      throw err;
-    } finally {
-      void dispatcher.close().catch(() => {
-      });
-    }
-    let text;
-    if (contentType.includes("text/plain") || contentType.includes("application/json")) {
-      text = rawHtml;
-    } else {
-      const title = extractTitle(rawHtml);
-      const desc = extractDescription(rawHtml);
-      const body = htmlToText(rawHtml);
-      const header = [
-        title ? `# ${title}` : "",
-        desc ? `> ${desc}` : "",
-        `Source: ${finalUrl}`,
-        ""
-      ].filter(Boolean).join("\n");
-      text = header + "\n\n" + body;
     }
     if (selector) {
       const lower = selector.toLowerCase();
@@ -11034,16 +11311,132 @@ var webFetchTool = {
     return text;
   }
 };
+async function fetchDirect(url) {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), 2e4);
+  let rawHtml;
+  let finalUrl;
+  let contentType;
+  const MAX_REDIRECTS = 10;
+  const FETCH_HEADERS = {
+    "User-Agent": "Mozilla/5.0 (compatible; ai-cli/1.0; +https://github.com/ai-cli)",
+    Accept: "text/html,application/xhtml+xml,text/plain,*/*",
+    "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8"
+  };
+  const dispatcher = ssrfSafeDispatcher();
+  try {
+    let currentUrl = url;
+    let resp = null;
+    for (let hop = 0; hop <= MAX_REDIRECTS; hop++) {
+      const parsedHop = new URL(currentUrl);
+      if (isPrivateHost(parsedHop.hostname)) {
+        throw new NetworkError(`Blocked: redirect to private/internal address "${currentUrl}".`);
+      }
+      await resolveAndCheck(parsedHop.hostname);
+      const r = await fetch(currentUrl, {
+        signal: controller.signal,
+        headers: FETCH_HEADERS,
+        redirect: "manual",
+        // 手动控制重定向
+        dispatcher
+        // dual undici-types：`dispatcher` 字段在 undici 与 @types/node 内置的
+        // undici-types 两份 RequestInit 间判不兼容，localized 转换。
+      });
+      if (r.status >= 300 && r.status < 400) {
+        if (hop >= MAX_REDIRECTS) {
+          throw new NetworkError(`Too many redirects (>${MAX_REDIRECTS}): ${url}`);
+        }
+        const location = r.headers.get("Location");
+        if (!location) {
+          resp = r;
+          break;
+        }
+        currentUrl = new URL(location, currentUrl).href;
+        continue;
+      }
+      resp = r;
+      break;
+    }
+    if (!resp) throw new NetworkError(`Too many redirects (>${MAX_REDIRECTS}): ${url}`);
+    finalUrl = currentUrl;
+    contentType = resp.headers.get("content-type") ?? "";
+    if (!resp.ok) {
+      throw new NetworkError(`HTTP ${resp.status} ${resp.statusText}`, resp.status);
+    }
+    const bodyBytes = await readBodyCapped(resp, MAX_BODY_BYTES);
+    clearTimeout(timeoutId);
+    rawHtml = new TextDecoder("utf-8", { fatal: false }).decode(bodyBytes);
+  } catch (err) {
+    clearTimeout(timeoutId);
+    if (err.name === "AbortError") {
+      throw new NetworkError(`Request timed out after 20s: ${url}`, void 0, err);
+    }
+    const cause = err.cause;
+    if (cause?.message?.startsWith("Blocked:")) throw new NetworkError(cause.message);
+    if (err instanceof Error && err.message === "fetch failed") {
+      const detail = cause?.message ? ` (${cause.message})` : "";
+      throw new NetworkError(
+        `Connection failed for ${url}${detail}. The domain may be unreachable from the current network (some sites require a proxy \u2014 see config.proxy) or temporarily down. Do not retry the same URL; try an alternative source.`,
+        void 0,
+        err
+      );
+    }
+    throw err;
+  } finally {
+    void dispatcher.close().catch(() => {
+    });
+  }
+  let text;
+  if (contentType.includes("text/plain") || contentType.includes("application/json")) {
+    text = rawHtml;
+  } else {
+    const title = extractTitle(rawHtml);
+    const desc = extractDescription(rawHtml);
+    const body = htmlToText(rawHtml);
+    const header = [
+      title ? `# ${title}` : "",
+      desc ? `> ${desc}` : "",
+      `Source: ${finalUrl}`,
+      ""
+    ].filter(Boolean).join("\n");
+    text = header + "\n\n" + body;
+  }
+  return text;
+}
 
 // src/tools/builtin/web-search.ts
-var REQUEST_TIMEOUT_MS = 15e3;
-var MAX_RESULTS = 10;
-var DEFAULT_RESULTS = 5;
+function planEngineOrder(engine, query, hasDeepSeekKey) {
+  const skipped = [];
+  if (engine === "bing") return { order: ["bing"], skipped };
+  if (engine === "google") return { order: ["google"], skipped };
+  const tooLong = [...query].length > DEEPSEEK_MAX_QUERY_CHARS;
+  if (engine === "deepseek") {
+    if (!hasDeepSeekKey) {
+      throw new ToolError(
+        "web_search",
+        "engine 'deepseek' needs a DeepSeek API key (config apiKeys.deepseek or AICLI_API_KEY_DEEPSEEK), and networkPolicy must allow api.deepseek.com. Use engine 'auto' or 'bing' instead."
+      );
+    }
+    if (tooLong) {
+      throw new ToolError(
+        "web_search",
+        `engine 'deepseek' accepts queries up to ${DEEPSEEK_MAX_QUERY_CHARS} characters \u2014 shorten the query.`
+      );
+    }
+    return { order: ["deepseek"], skipped };
+  }
+  if (hasDeepSeekKey && !tooLong) return { order: ["deepseek", "bing", "google"], skipped };
+  if (hasDeepSeekKey && tooLong) skipped.push(`deepseek: query longer than ${DEEPSEEK_MAX_QUERY_CHARS} chars, skipped`);
+  return { order: ["bing", "google"], skipped };
+}
+var REQUEST_TIMEOUT_MS2 = 15e3;
+var MAX_RESULTS2 = 10;
+var DEFAULT_RESULTS2 = 5;
 var UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36";
 var webSearchTool = {
   definition: {
     name: "web_search",
-    description: 'Search the web using Bing or Google by scraping their public result pages. No API key required, no billing risk. Returns structured {title, url, snippet} for each result. Use this for fresh facts, news, or any "what does X say about Y" lookup. Prefer this over google_search (which needs a paid API key).',
+    description: 'Search the web. Uses the DeepSeek Search API when a DeepSeek API key is configured (results carry a relevance score and a longer summary), otherwise scrapes Bing / Google public result pages. Returns title, url and summary/snippet for each result. Use this for fresh facts, news, or any "what does X say about Y" lookup. With the deepseek engine the query (max 128 chars) supports operators: site:example.com, -site:, "exact phrase", -term, lang:en, after:2025, before:2026-06-01. Prefer this over google_search (which needs a paid API key).',
     parameters: {
       query: {
         type: "string",
@@ -11057,7 +11450,7 @@ var webSearchTool = {
       },
       engine: {
         type: "string",
-        description: "Search engine: 'bing' (default for CN reachability), 'google', or 'auto' (try bing first, fall back to google on empty/error). Default 'auto'.",
+        description: "Search engine: 'auto' (default \u2014 DeepSeek Search API if a DeepSeek key is configured, then Bing, then Google on empty/error), 'deepseek', 'bing', or 'google'.",
         required: false
       }
     },
@@ -11067,21 +11460,30 @@ var webSearchTool = {
     const query = String(args["query"] ?? "").trim();
     if (!query) throw new ToolError("web_search", "query parameter is required");
     const numResults = Math.min(
-      Math.max(Math.floor(Number(args["num_results"] ?? DEFAULT_RESULTS)), 1),
-      MAX_RESULTS
+      Math.max(Math.floor(Number(args["num_results"] ?? DEFAULT_RESULTS2)), 1),
+      MAX_RESULTS2
     );
     const engine = String(args["engine"] ?? "auto").toLowerCase();
-    if (!["bing", "google", "auto"].includes(engine)) {
-      throw new ToolError("web_search", `engine must be one of: bing, google, auto (got: ${engine})`);
+    if (!["deepseek", "bing", "google", "auto"].includes(engine)) {
+      throw new ToolError("web_search", `engine must be one of: auto, deepseek, bing, google (got: ${engine})`);
     }
-    const order = engine === "auto" ? ["bing", "google"] : engine === "bing" ? ["bing"] : ["google"];
-    const errors = [];
+    const deepseekKey = engine === "bing" || engine === "google" ? void 0 : resolveDeepSeekWebKey();
+    const { order, skipped } = planEngineOrder(engine, query, deepseekKey !== void 0);
+    const errors = [...skipped];
     let weakBingFallback = null;
     let weakBingReason = null;
     for (let i = 0; i < order.length; i++) {
       const eng = order[i];
       const isLastEngine = i === order.length - 1;
       try {
+        if (eng === "deepseek") {
+          const dsResults = await deepseekSearch(deepseekKey, query, numResults);
+          if (dsResults.length === 0) {
+            errors.push("deepseek: 0 results");
+            continue;
+          }
+          return formatDeepSeekResults(query, dsResults);
+        }
         const results = eng === "bing" ? await searchBing(query, numResults) : await searchGoogle(query, numResults);
         if (results.length === 0) {
           errors.push(`${eng}: 0 results`);
@@ -11096,13 +11498,13 @@ var webSearchTool = {
             continue;
           }
         }
-        return formatResults(query, eng, results);
+        return formatResults2(query, eng, results);
       } catch (err) {
         errors.push(`${eng}: ${err instanceof Error ? err.message : String(err)}`);
       }
     }
     if (weakBingFallback) {
-      return formatResults(query, "bing", weakBingFallback, {
+      return formatResults2(query, "bing", weakBingFallback, {
         warning: `engine signaled weak relevance (${weakBingReason}). These results may be Bing's "popular sites" fallback rather than real matches. Consider rephrasing the query (shorter, fewer constraints), or use web_fetch against a known authoritative URL (e.g. baike.baidu.com, mfa.gov.cn, news.cctv.com).`
       });
     }
@@ -11308,7 +11710,7 @@ function parseGoogleResults(html, maxResults) {
 }
 async function fetchHtml(url) {
   const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+  const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS2);
   try {
     const res = await fetch(url, {
       method: "GET",
@@ -11325,7 +11727,7 @@ async function fetchHtml(url) {
     return await res.text();
   } catch (err) {
     if (err instanceof Error && err.name === "AbortError") {
-      throw new NetworkError(`Request timed out after ${REQUEST_TIMEOUT_MS / 1e3}s.`, void 0, err);
+      throw new NetworkError(`Request timed out after ${REQUEST_TIMEOUT_MS2 / 1e3}s.`, void 0, err);
     }
     throw err;
   } finally {
@@ -11338,7 +11740,31 @@ function stripTags2(html) {
 function decodeHtmlEntities(s) {
   return s.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&#x2F;/g, "/").replace(/&nbsp;/g, " ");
 }
-function formatResults(query, engine, results, opts) {
+var DEEPSEEK_SUMMARY_MAX_CHARS = 600;
+function clipSummary(s) {
+  const flat = s.replace(/\s+/g, " ").trim();
+  const chars = [...flat];
+  if (chars.length <= DEEPSEEK_SUMMARY_MAX_CHARS) return flat;
+  return chars.slice(0, DEEPSEEK_SUMMARY_MAX_CHARS).join("") + "\u2026";
+}
+function formatDeepSeekResults(query, results) {
+  const preamble = `Search results for "${query}" via deepseek (${results.length} results; relevance 0\u20133, \u22651.5 is high quality):
+`;
+  const body = results.map((r, i) => {
+    const meta = [
+      r.siteName,
+      r.date ? r.date.slice(0, 10) : null,
+      r.rerankScore !== null ? `relevance ${r.rerankScore.toFixed(2)}` : null
+    ].filter(Boolean).join(" \xB7 ");
+    const text = clipSummary(r.summary || r.snippet) || "(no summary)";
+    return `${i + 1}. **${r.title}**
+   URL: ${r.url}${meta ? `
+   ${meta}` : ""}
+   ${text}`;
+  }).join("\n\n");
+  return preamble + "\n" + body;
+}
+function formatResults2(query, engine, results, opts) {
   let preamble = `Search results for "${query}" via ${engine} (${results.length} results):
 `;
   if (opts?.warning) {
@@ -11632,134 +12058,6 @@ function renderTodoList(todos) {
   console.log();
 }
 
-// src/tools/builtin/google-search.ts
-var GOOGLE_SEARCH_API = "https://www.googleapis.com/customsearch/v1";
-var REQUEST_TIMEOUT_MS2 = 15e3;
-var MAX_RESULTS2 = 10;
-var DEFAULT_RESULTS2 = 5;
-var googleSearchContext = {};
-var googleSearchTool = {
-  definition: {
-    name: "google_search",
-    description: "\u26A0\uFE0F NOT RECOMMENDED \u2014 uses Google Custom Search API which requires a paid API key. API keys have leaked in the wild causing tens of thousands of USD in unauthorized charges. PREFER `web_search` (keyless Bing/Google scraping, zero billing risk). This tool is disabled by default; user must set config.googleSearch.enabled=true to use it.",
-    parameters: {
-      query: {
-        type: "string",
-        description: "The search query string.",
-        required: true
-      },
-      num_results: {
-        type: "number",
-        description: "Number of results to return (1-10, default 5).",
-        required: false
-      }
-    },
-    dangerous: false
-  },
-  async execute(args) {
-    const query = String(args["query"] ?? "").trim();
-    if (!query) throw new ToolError("google_search", "query parameter is required");
-    const enabledFlag = googleSearchContext.configManager?.get("googleSearch")?.enabled ?? false;
-    if (!enabledFlag) {
-      throw new ToolError(
-        "google_search",
-        '\u{1F6AB} google_search is disabled by default (v0.4.135+).\n\nWHY: Google Custom Search has no native daily-spend cap. Keys leak (search GitHub for "AIza" \u2014 thousands of public exposures), bots scrape them within hours, and the GCP bill lands days later. Multiple engineers have lost $10k+ USD this way.\n\nRECOMMENDED: use `web_search` instead \u2014 same use case, scrapes Bing/Google public pages, zero API key, zero billing risk.\n\nIF YOU INSIST: edit ~/.aicli/config.json and set `googleSearch.enabled = true`. ALSO go to GCP Console \u2192 Custom Search API \u2192 Quotas and set a hard daily request cap (e.g. 100/day) \u2014 that is the only real damage cap.'
-      );
-    }
-    const numResults = Math.min(
-      Math.max(Math.floor(Number(args["num_results"] ?? DEFAULT_RESULTS2)), 1),
-      MAX_RESULTS2
-    );
-    const { apiKey, cx } = resolveConfig();
-    const url = new URL(GOOGLE_SEARCH_API);
-    url.searchParams.set("key", apiKey);
-    url.searchParams.set("cx", cx);
-    url.searchParams.set("q", query);
-    url.searchParams.set("num", String(numResults));
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS2);
-    try {
-      const response = await fetch(url.toString(), {
-        method: "GET",
-        headers: {
-          "Accept": "application/json"
-        },
-        signal: controller.signal
-      });
-      if (!response.ok) {
-        const errorBody = await response.text().catch(() => "");
-        if (response.status === 403) {
-          throw new NetworkError(
-            `Google Search API 403 Forbidden \u2014 Invalid API Key or daily free quota exceeded (100/day).
-Please check your API Key and Search Engine ID configuration.`,
-            403
-          );
-        }
-        if (response.status === 429) {
-          throw new NetworkError("Google Search API 429 \u2014 Too many requests, please try again later.", 429);
-        }
-        throw new NetworkError(
-          `Google Search API error: HTTP ${response.status} ${response.statusText}
-${errorBody.slice(0, 500)}`,
-          response.status
-        );
-      }
-      const data = await response.json();
-      return formatResults2(query, data, numResults);
-    } catch (err) {
-      if (err instanceof Error && err.name === "AbortError") {
-        throw new NetworkError(`Google Search request timed out (${REQUEST_TIMEOUT_MS2 / 1e3}s). Please check your network or proxy configuration.`, void 0, err);
-      }
-      throw err;
-    } finally {
-      clearTimeout(timeout);
-    }
-  }
-};
-function resolveConfig() {
-  let apiKey;
-  let cx;
-  if (googleSearchContext.configManager) {
-    apiKey = googleSearchContext.configManager.getApiKey("google-search");
-    cx = EnvLoader.getGoogleSearchEngineId() ?? googleSearchContext.configManager.get("googleSearchEngineId");
-  } else {
-    apiKey = EnvLoader.getApiKey("google-search");
-    cx = EnvLoader.getGoogleSearchEngineId();
-  }
-  if (!apiKey) {
-    throw new ToolError(
-      "google_search",
-      'Google Search API Key not configured.\nConfigure via one of:\n  1. Run /config \u2192 Configure Google Search\n  2. Set env var AICLI_API_KEY_GOOGLESEARCH\n  3. Add apiKeys["google-search"] to ~/.aicli/config.json'
-    );
-  }
-  if (!cx) {
-    throw new ToolError(
-      "google_search",
-      "Google Search Engine ID (cx) not configured.\nConfigure via one of:\n  1. Run /config \u2192 Configure Google Search\n  2. Set env var AICLI_GOOGLE_CX\n  3. Add googleSearchEngineId to ~/.aicli/config.json\n\nGet one at: https://programmablesearchengine.google.com/ \u2192 Create search engine \u2192 Copy Search Engine ID"
-    );
-  }
-  return { apiKey, cx };
-}
-function formatResults2(query, data, _requested) {
-  const items = data.items ?? [];
-  if (items.length === 0) {
-    const info2 = data.searchInformation;
-    return `No results found for: "${query}"` + (info2 ? ` (searched ${info2.formattedTotalResults ?? "0"} pages in ${info2.formattedSearchTime ?? "?"}s)` : "");
-  }
-  const info = data.searchInformation;
-  const header = `Search results for "${query}" (${items.length} of ~${info?.formattedTotalResults ?? "?"} results):
-`;
-  const results = items.map((item, i) => {
-    const title = item.title ?? "Untitled";
-    const link = item.link ?? "";
-    const snippet = item.snippet ?? "";
-    return `${i + 1}. **${title}**
-   URL: ${link}
-   ${snippet}`;
-  });
-  return header + "\n" + results.join("\n\n");
-}
-
 // src/core/tool-capable-provider.ts
 function isToolCapableProvider(provider) {
   if (!provider) return false;
@@ -11816,7 +12114,7 @@ var HookEventNameSchema = z2.enum([
 var McpServerSchema = z2.object({
   command: z2.string(),
   args: z2.array(z2.string()).default([]),
-  env: z2.record(z2.string()).optional(),
+  env: z2.record(z2.string(), z2.string()).optional(),
   timeout: z2.number().default(3e4)
 });
 var PluginManifestSchema = z2.object({
@@ -11826,10 +12124,10 @@ var PluginManifestSchema = z2.object({
   skills: z2.array(z2.string()).default([]),
   hooks: z2.object({
     enabled: z2.boolean().optional(),
-    events: z2.record(HookEventNameSchema, HookCommandSchema).default({})
-  }).default({ events: {} }),
+    events: z2.partialRecord(HookEventNameSchema, HookCommandSchema).default({})
+  }).prefault({ events: {} }),
   commands: z2.array(z2.string()).default([]),
-  mcpServers: z2.record(McpServerSchema).default({}),
+  mcpServers: z2.record(z2.string(), McpServerSchema).default({}),
   agents: z2.array(z2.string()).default([]),
   permissionHints: z2.array(z2.string()).default([])
 }).strict();
@@ -12904,26 +13202,75 @@ var taskCreateTool = {
   ID: ${task.id}
   Command: ${command}
   Description: ${description}
-Use task_list to check status, task_stop to terminate.`;
+Use task_list to check status (task_list with id + wait_seconds waits for it to finish \u2014 no bash sleep needed), task_stop to terminate.`;
   }
 };
 
 // src/tools/builtin/task-list.ts
+var MAX_TASK_WAIT_SECONDS = 300;
+var POLL_MS = 200;
+async function waitForTasks(id, seconds) {
+  const isRunning = (taskId) => getTaskOutput(taskId)?.status === "running";
+  const watched = id ? [id] : listTasks().filter((t) => t.status === "running").map((t) => t.id);
+  if (!watched.some(isRunning)) return "nothing-running";
+  const signal = currentAbortSignal();
+  const deadline = Date.now() + seconds * 1e3;
+  for (; ; ) {
+    if (signal.aborted) return "interrupted";
+    if (!watched.every(isRunning)) return "finished";
+    const left = deadline - Date.now();
+    if (left <= 0) return "timeout";
+    await new Promise((resolve13) => {
+      const timer = setTimeout(done, Math.min(POLL_MS, left));
+      function done() {
+        clearTimeout(timer);
+        signal.removeEventListener("abort", done);
+        resolve13();
+      }
+      signal.addEventListener("abort", done, { once: true });
+    });
+  }
+}
+function parseWaitSeconds(raw) {
+  const n = Number(raw);
+  if (raw === void 0 || raw === null || raw === "" || !Number.isFinite(n) || n <= 0) {
+    return { seconds: 0, clamped: false };
+  }
+  return n > MAX_TASK_WAIT_SECONDS ? { seconds: MAX_TASK_WAIT_SECONDS, clamped: true } : { seconds: n, clamped: false };
+}
 var taskListTool = {
   definition: {
     name: "task_list",
-    description: `List all background tasks with their status. Provide an ID to get detailed output for a specific task.`,
+    description: `List all background tasks with their status. Provide an ID to get detailed output for a specific task. To wait for a background task, pass wait_seconds (max ${MAX_TASK_WAIT_SECONDS}) instead of polling with bash sleep: the call returns as soon as the task (or, without an id, any running task) finishes.`,
     parameters: {
       id: {
         type: "string",
         description: "Optional: specific task ID to get detailed stdout/stderr output",
         required: false
+      },
+      wait_seconds: {
+        type: "number",
+        description: `Optional: wait up to this many seconds (max ${MAX_TASK_WAIT_SECONDS}) for the task with this id \u2014 or, without id, for any running task \u2014 to finish, then report. Returns early on completion.`,
+        required: false
       }
     },
     dangerous: false
   },
   async execute(args) {
     const id = args["id"] ? String(args["id"]) : void 0;
+    const { seconds, clamped } = parseWaitSeconds(args["wait_seconds"]);
+    let note = "";
+    if (seconds > 0) {
+      const started = Date.now();
+      const outcome = await waitForTasks(id, seconds);
+      const waited = ((Date.now() - started) / 1e3).toFixed(1);
+      if (outcome === "timeout") note = `(waited ${waited}s; still running \u2014 call again with wait_seconds to keep waiting)`;
+      else if (outcome === "finished") note = `(waited ${waited}s; task finished)`;
+      else if (outcome === "interrupted") note = `(wait interrupted by user after ${waited}s)`;
+      if (clamped) note += `${note ? " " : ""}(wait_seconds capped at ${MAX_TASK_WAIT_SECONDS})`;
+    }
+    const withNote = (body) => note ? `${note}
+${body}` : body;
     if (id) {
       const output = getTaskOutput(id);
       if (!output) return `Task not found: ${id}`;
@@ -12935,7 +13282,7 @@ ${output.stdout}`);
 \u2500\u2500 stderr \u2500\u2500
 ${output.stderr}`);
       if (!output.stdout && !output.stderr) parts.push("\n(no output yet)");
-      return parts.join("");
+      return withNote(parts.join(""));
     }
     const all = listTasks();
     if (all.length === 0) return "No background tasks.";
@@ -12947,7 +13294,7 @@ ${output.stderr}`);
       lines.push(`  [${t.id}] ${status} (${elapsed.toFixed(1)}s) \u2014 ${t.description}`);
       if (t.exitCode !== null) lines.push(`         exit code: ${t.exitCode}`);
     }
-    return lines.join("\n");
+    return withNote(lines.join("\n"));
   }
 };
 
@@ -17944,7 +18291,7 @@ Cache:  write=${cacheCreate} read=${cacheRead}` : "";
 Cost:   ${formatCost(cost)}` : "";
   let memoryLine = "";
   try {
-    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-WFGBTGWT.js");
+    const { countPendingMemories: countPendingMemories2 } = await import("./persistent-memory-UZIZVHRT.js");
     const pending = countPendingMemories2(ctx.config.getConfigDir());
     if (pending > 0) memoryLine = `
 Memory: \u26A0 ${pending} pending approval \u2014 see the Memory panel or /memory`;
@@ -18932,7 +19279,7 @@ async function handleTest(args, ctx) {
       const isCommand = argStr.includes(" ") || /^(mvn|gradle|npm|pytest|cargo|go)\b/.test(argStr);
       testArgs = isCommand ? { command: argStr } : { filter: argStr };
     }
-    const runTests = ctx.runTests ?? (await import("./run-tests-TUTI7HIN.js")).executeTests;
+    const runTests = ctx.runTests ?? (await import("./run-tests-UXEOFPAW.js")).executeTests;
     const report = await runTests(testArgs);
     ctx.send({ type: "info", message: report });
   } catch (err) {
@@ -19323,7 +19670,7 @@ async function handleMemory(args, ctx) {
   }
   if (intent.kind === "status") {
     const { getChatIndexStatus: getChatIndexStatus2 } = await import("./chat-index-RLVLQRRC.js");
-    const { listMemoryEntries: listMemoryEntries2, isMemoryExpired: isMemoryExpired2, formatMemoryForPrompt: formatMemoryForPrompt2 } = await import("./persistent-memory-WFGBTGWT.js");
+    const { listMemoryEntries: listMemoryEntries2, isMemoryExpired: isMemoryExpired2, formatMemoryForPrompt: formatMemoryForPrompt2 } = await import("./persistent-memory-UZIZVHRT.js");
     const memories = listMemoryEntries2(configDir, { includeExpired: true, includeRejected: true });
     const injected = formatMemoryForPrompt2(configDir, process.cwd(), ctx.config.get("memory")?.maxChars);
     const view = buildMemoryStatusView({
@@ -19346,7 +19693,7 @@ async function handleMemory(args, ctx) {
     return;
   }
   if (intent.kind === "recall") {
-    const { searchPersistentMemories: searchPersistentMemories2, touchMemoryReferences: touchMemoryReferences2 } = await import("./persistent-memory-WFGBTGWT.js");
+    const { searchPersistentMemories: searchPersistentMemories2, touchMemoryReferences: touchMemoryReferences2 } = await import("./persistent-memory-UZIZVHRT.js");
     const { searchChatMemory: searchChatMemory2 } = await import("./chat-index-RLVLQRRC.js");
     const persistentHits = searchPersistentMemories2(configDir, intent.query, process.cwd(), 3);
     if (persistentHits.length > 0) {
@@ -19467,7 +19814,7 @@ async function handleMemory(args, ctx) {
     ctx.handleMemoryManage(intent.action, args[1], intent.action === "expire" ? args[2] : void 0);
   } else if (intent.kind === "export") {
     if (args[1] === "md") {
-      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-WFGBTGWT.js");
+      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-UZIZVHRT.js");
       ctx.send({
         type: "export_data",
         format: "md",
@@ -20473,7 +20820,7 @@ No tools match "${filter}".
           const { join: join27 } = await import("path");
           const { existsSync: existsSync33 } = await import("fs");
           const { getGitRoot: getGitRoot2 } = await import("./git-context-VNCA2GU7.js");
-          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-WJAUJAQQ.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-JZH2QKMQ.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-6CJB5ZMX.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -21392,7 +21739,7 @@ function createReviewCommands() {
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-TUTI7HIN.js");
+          const { executeTests } = await import("./run-tests-UXEOFPAW.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -23616,7 +23963,8 @@ var SessionHandler = class _SessionHandler {
         return;
       }
       case "interjection":
-        this.userInterjection = msg.content;
+        this.userInterjection = this.userInterjection ? `${this.userInterjection}
+${msg.content}` : msg.content;
         return;
     }
   }
@@ -24084,7 +24432,6 @@ ${systemPromptVolatile}` : systemPrompt;
           if (!this.userInterjection) return null;
           const msg = this.userInterjection;
           this.userInterjection = null;
-          this.send({ type: "info", message: `\u26A1 Interjection: "${msg}"` });
           return msg;
         },
         onRoundStart: (round, total) => {
@@ -24943,17 +25290,6 @@ Backup saved: ${result.backupPath}` : "";
   }
 };
 
-// src/core/proxy.ts
-async function setupProxy(configProxy) {
-  const proxyUrl = process.env.HTTPS_PROXY ?? process.env.HTTP_PROXY ?? process.env.https_proxy ?? process.env.http_proxy ?? configProxy;
-  if (!proxyUrl) return;
-  try {
-    const { ProxyAgent, setGlobalDispatcher } = await import("undici");
-    setGlobalDispatcher(new ProxyAgent({ uri: proxyUrl }));
-  } catch {
-  }
-}
-
 // src/web/auth.ts
 import { existsSync as existsSync31, readFileSync as readFileSync22, mkdirSync as mkdirSync16, readdirSync as readdirSync15, openSync, closeSync, unlinkSync as unlinkSync8 } from "fs";
 import { isAbsolute as isAbsolute3, join as join25, relative as relative5 } from "path";
@@ -25394,7 +25730,8 @@ async function startWebServer(options = {}) {
     (id) => ({
       baseUrl: config.get("customBaseUrls")[id],
       timeout: config.get("timeouts")[id],
-      proxy: config.get("proxy")
+      proxy: config.get("proxy"),
+      noProxy: config.get("noProxy")
     }),
     config.get("customProviders"),
     config.getConfigDir()