@akanjs/cli 3.1.0-rc.12 → 3.1.0-rc.13

package/.build-stamp

@@ -1 +1 @@
-45dc4be5e34b35b9eaac8daa987756f8464382b61a5afdc7f0d60d658b487b2f
+7bcd4fe279524ed2759e02783eb078a66b8ee0e6acee19a817c2f751ecba695a

package/{CodeAgent-fhrb6xyw.js → CodeAgent-n3tzjm91.js}

@@ -1,8 +1,8 @@
 // @bun
 import {
   CodeAgent2
-} from "./index-zjgs0t7s.js";
-import"./index-ht15pm08.js";
+} from "./index-1djcjcre.js";
+import"./index-dye8pnxx.js";
 import"./index-7md2g9vw.js";
 export {
   CodeAgent2 as CodeAgent

package/{CodeTui-ntnda5dn.js → CodeTui-fnm9ft4d.js}

@@ -5,7 +5,7 @@ import {
   McpTokenStore,
   McpSignIn,
   AkanCodeCompaction2
-} from "./index-ht15pm08.js";
+} from "./index-dye8pnxx.js";
 import {
   CodeTuiLines2,
   CodeTuiAgents2,

package/akanCode.js

@@ -28,7 +28,7 @@ import {
   CodeMailbox2,
   CodeSessionFork2,
   CodeAgent2
-} from "./index-zjgs0t7s.js";
+} from "./index-1djcjcre.js";
 import {
   akanCodeDefaultModel2,
   akanCodeModel2,
@@ -40,7 +40,7 @@ import {
   SubagentPool2,
   akanCodePaths2,
   AkanCodeCompaction2
-} from "./index-ht15pm08.js";
+} from "./index-dye8pnxx.js";
 import"./index-7md2g9vw.js";
 import {
   CodeAgentRpcHost2

package/{code.command-3sxektnr.js → code.command-130bdmhe.js}

@@ -19,7 +19,7 @@ class CodeRunner extends runner("code") {
   async serve(options, listen) {
     await import("./consoleToStderr-h5bryj94.js");
     const [{ CodeAgent }, { CodeAgentRpcHost }, { CodeAgentRpcListener }] = await Promise.all([
-      import("./CodeAgent-fhrb6xyw.js"),
+      import("./CodeAgent-n3tzjm91.js"),
       import("./CodeAgentRpcHost-9g27hmer.js"),
       import("./CodeAgentRpcListener-7p7z5dd7.js")
     ]);
@@ -34,8 +34,8 @@ class CodeRunner extends runner("code") {
   }
   async tui(options, seed) {
     const [{ CodeAgent }, { CodeTui }] = await Promise.all([
-      import("./CodeAgent-fhrb6xyw.js"),
-      import("./CodeTui-ntnda5dn.js")
+      import("./CodeAgent-n3tzjm91.js"),
+      import("./CodeTui-fnm9ft4d.js")
     ]);
     const agentOptions = await CodeRunner.#agentOptions(options, false);
     let resume = options.resume;
@@ -67,7 +67,7 @@ class CodeRunner extends runner("code") {
     }
   }
   async run(prompt, options) {
-    const { CodeAgent } = await import("./CodeAgent-fhrb6xyw.js");
+    const { CodeAgent } = await import("./CodeAgent-n3tzjm91.js");
     const agent = await CodeAgent.create(await CodeRunner.#agentOptions(options, false));
     const printer = new CodeAgentStreamPrinter2({ json: options.json, thinking: options.thinking });
     agent.on((event) => printer.print(event));

package/{index-zjgs0t7s.js → index-1djcjcre.js}

@@ -5,7 +5,7 @@ import {
   McpServerConfig,
   McpSignIn,
   AkanCodeCompaction2
-} from "./index-ht15pm08.js";
+} from "./index-dye8pnxx.js";
 import {
   stripAnsi
 } from "./index-7md2g9vw.js";
@@ -319,7 +319,7 @@ import {
   DefaultResourceLoader
 } from "@earendil-works/pi-coding-agent";
 import {
-  codeAgentClip as codeAgentClip5,
+  codeAgentClip as codeAgentClip6,
   codeAgentLabelChars as codeAgentLabelChars2,
   codeAgentRenderAnswer,
   codeAgentSessionName as codeAgentSessionName2
@@ -1396,11 +1396,120 @@ class SessionToolPack2 {
 }
 
 // pkgs/@akanjs/devkit/codeAgent/tools/WebToolPack.ts
-import { codeAgentClip as codeAgentClip3, codeAgentOutputChars as codeAgentOutputChars3 } from "akanjs/common";
+import { isIP } from "net";
+import { codeAgentClip as codeAgentClip4 } from "akanjs/common";
 import { Type as Type6 } from "typebox";
 
+// pkgs/@akanjs/devkit/codeAgent/tools/DeepSeekWeb.ts
+import { codeAgentClip as codeAgentClip3 } from "akanjs/common";
+
+class DeepSeekWeb {
+  static baseUrl = "https://api.deepseek.com/v1/tools";
+  static maxQueryChars = 128;
+  static summaryChars = 600;
+  static #retryable = {
+    search: [408, 429, 500, 502, 503, 504],
+    fetch: [429]
+  };
+  static #attempts = 3;
+  #key;
+  #baseUrl;
+  constructor(key, baseUrl = DeepSeekWeb.baseUrl) {
+    this.#key = key;
+    this.#baseUrl = baseUrl;
+  }
+  static async fromRuntime(runtime, proxied) {
+    if (proxied)
+      return;
+    const key = (await runtime.getAuth("deepseek").catch(() => {
+      return;
+    }))?.auth.apiKey;
+    return key ? new DeepSeekWeb(key) : undefined;
+  }
+  async search(query, count, signal) {
+    if ([...query].length > DeepSeekWeb.maxQueryChars)
+      throw new Error(`DeepSeek search takes at most ${DeepSeekWeb.maxQueryChars} characters; shorten the query.`);
+    const body = await this.#call("search", { query, count }, 20000, signal);
+    const byUrl = new Map;
+    for (const result of body.results ?? []) {
+      const url = DeepSeekWeb.#cleanUrl(result.url);
+      if (!byUrl.has(url))
+        byUrl.set(url, { ...result, url });
+    }
+    return [...byUrl.values()].map((result) => {
+      const date = result.date ? ` \xB7 ${result.date.slice(0, 10)}` : "";
+      const summary = DeepSeekWeb.unescape(result.summary || result.snippet || "").replace(/\s+/g, " ").trim();
+      return `- ${result.title}
+  ${result.url}${date}
+  ${codeAgentClip3(summary, DeepSeekWeb.summaryChars)}`;
+    }).join(`
+`);
+  }
+  async fetch(url, signal) {
+    const page = await this.#call("fetch", { url }, 30000, signal);
+    return { title: page.title ?? "", content: DeepSeekWeb.unescape(page.content ?? "") };
+  }
+  static unescape(markdown) {
+    const escaped = markdown.match(/\\[!-/:-@[-`{-~]/g)?.length ?? 0;
+    const punctuation = markdown.match(/[!-/:-@[-`{-~]/g)?.length ?? 0;
+    if (!escaped || escaped < (punctuation - escaped) / 2)
+      return markdown;
+    return markdown.replace(/\\([!-/:-@[-`{-~])/g, "$1");
+  }
+  async#call(tool, body, timeoutMs, signal) {
+    for (let attempt = 1;; attempt++) {
+      const response = await fetch(`${this.#baseUrl}/${tool}`, {
+        method: "POST",
+        headers: { authorization: `Bearer ${this.#key}`, "content-type": "application/json" },
+        body: JSON.stringify(body),
+        signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(timeoutMs)]) : AbortSignal.timeout(timeoutMs)
+      });
+      if (response.ok)
+        return await response.json();
+      if (!DeepSeekWeb.#retryable[tool].includes(response.status) || attempt >= DeepSeekWeb.#attempts) {
+        const error = await response.json().catch(() => {
+          return;
+        });
+        throw new Error(`DeepSeek ${tool} answered ${response.status}: ${error?.error?.message ?? response.statusText}`);
+      }
+      await DeepSeekWeb.#wait(DeepSeekWeb.#delayOf(response, attempt), signal);
+    }
+  }
+  static #delayOf(response, attempt) {
+    const retryAfter = Number(response.headers.get("retry-after"));
+    return Number.isFinite(retryAfter) && retryAfter > 0 ? Math.min(retryAfter, 5) * 1000 : 1000 * 2 ** (attempt - 1);
+  }
+  static #wait(ms, signal) {
+    return new Promise((resolve) => {
+      const timer = setTimeout(resolve, ms);
+      signal?.addEventListener("abort", () => {
+        clearTimeout(timer);
+        resolve();
+      }, { once: true });
+    });
+  }
+  static #cleanUrl(url) {
+    try {
+      const parsed = new URL(url);
+      for (const name of [...parsed.searchParams.keys()])
+        if (name.startsWith("utm_"))
+          parsed.searchParams.delete(name);
+      if (/^#\d+$/.test(parsed.hash))
+        parsed.hash = "";
+      return parsed.toString();
+    } catch {
+      return url;
+    }
+  }
+}
+
+// pkgs/@akanjs/devkit/codeAgent/tools/WebToolPack.ts
 class WebToolPack2 {
+  static pageChars = 1e4;
+  static maxResults = 10;
+  static #rememberedPages = 16;
   #options;
+  #pages = new Map;
   constructor(options) {
     this.#options = options;
   }
@@ -1439,7 +1548,7 @@ class WebToolPack2 {
     const names = [];
     if (this.#options.profile.tools.web.fetch)
       names.push("web_fetch");
-    if (this.#options.profile.tools.web.search && WebToolPack2.#provider())
+    if (this.#options.profile.tools.web.search && this.#searcher())
       names.push("web_search");
     return names;
   }
@@ -1451,58 +1560,124 @@ class WebToolPack2 {
   #register(pi) {
     if (this.#options.profile.tools.web.fetch)
       this.#registerFetch(pi);
-    const provider = WebToolPack2.#provider();
-    if (this.#options.profile.tools.web.search && provider)
-      this.#registerSearch(pi, provider);
+    const searcher = this.#searcher();
+    if (this.#options.profile.tools.web.search && searcher)
+      this.#registerSearch(pi, searcher);
   }
   #registerFetch(pi) {
     const allowHosts = this.#options.profile.network.allowHosts;
     pi.registerTool({
       name: "web_fetch",
       label: "Fetch",
-      description: "Fetch a URL and return its readable text. HTML is stripped to text; the result is truncated.",
+      description: `Fetch a URL and return its readable text, ${WebToolPack2.pageChars} characters at a time. A longer page ends with the offset that continues it.`,
       promptSnippet: "web_fetch: fetch a URL and return its readable text",
-      parameters: Type6.Object({ url: Type6.String({ description: "Absolute http(s) URL." }) }),
-      execute: async (_id, params) => {
+      parameters: Type6.Object({
+        url: Type6.String({ description: "Absolute http(s) URL." }),
+        offset: Type6.Optional(Type6.Number({ description: "Character offset a previous call named, to read on." }))
+      }),
+      execute: async (_id, params, signal) => {
         const refusal = WebToolPack2.#refuseHost(params.url, allowHosts);
         if (refusal)
           return { content: [{ type: "text", text: refusal }], details: undefined, isError: true };
-        const response = await fetch(params.url, { signal: AbortSignal.timeout(20000), redirect: "follow" });
-        const text = WebToolPack2.#readable(await response.text());
+        const offset = Math.max(0, Math.floor(params.offset ?? 0));
+        const cached = offset ? this.#pages.get(params.url) : undefined;
+        const page = cached ?? await this.#read(params.url, signal);
+        if (page.ok)
+          this.#remember(params.url, page);
         return {
-          content: [
-            { type: "text", text: `${response.status} ${params.url}
-
-${codeAgentClip3(text, codeAgentOutputChars3)}` }
-          ],
+          content: [{ type: "text", text: WebToolPack2.#window(params.url, page, offset) }],
           details: undefined,
-          isError: !response.ok
+          isError: !page.ok
         };
       }
     });
   }
-  #registerSearch(pi, provider) {
+  #registerSearch(pi, searcher) {
+    const hint = searcher.name === "deepseek" ? ` Keep the query within ${DeepSeekWeb.maxQueryChars} characters; site:, -site: and quoted phrases work.` : "";
     pi.registerTool({
       name: "web_search",
       label: "Search",
-      description: `Search the web (${provider.name}) and return the top results as title, url and snippet.`,
+      description: `Search the web (${searcher.name}) and return the top results as title, url and summary.${hint}`,
       promptSnippet: "web_search: search the web and return titles, urls and snippets",
       parameters: Type6.Object({
         query: Type6.String(),
-        count: Type6.Optional(Type6.Number({ description: "How many results, default 5." }))
+        count: Type6.Optional(Type6.Number({ description: `How many results, default 5, at most ${WebToolPack2.maxResults}.` }))
       }),
-      execute: async (_id, params) => {
-        const key = process.env[provider.envKey] ?? "";
-        const results = await provider.search(key, params.query, params.count ?? 5);
-        return {
-          content: [{ type: "text", text: codeAgentClip3(results || "(no results)", codeAgentOutputChars3) }],
-          details: undefined
-        };
+      execute: async (_id, params, signal) => {
+        const count = Math.min(Math.max(Math.round(params.count ?? 5), 1), WebToolPack2.maxResults);
+        try {
+          const results = await searcher.search(params.query, count, signal);
+          return {
+            content: [{ type: "text", text: codeAgentClip4(results || "(no results)", WebToolPack2.pageChars) }],
+            details: undefined
+          };
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          return { content: [{ type: "text", text: message }], details: undefined, isError: true };
+        }
       }
     });
   }
-  static #provider() {
-    return WebToolPack2.providers.find((provider) => !!process.env[provider.envKey]);
+  #searcher() {
+    const provider = WebToolPack2.providers.find((entry) => !!process.env[entry.envKey]);
+    if (provider)
+      return {
+        name: provider.name,
+        search: (query, count) => provider.search(process.env[provider.envKey] ?? "", query, count)
+      };
+    const deepseek = this.#options.deepseek;
+    return deepseek ? { name: "deepseek", search: (query, count, signal) => deepseek.search(query, count, signal) } : undefined;
+  }
+  async#read(url, signal) {
+    const deepseek = this.#options.deepseek;
+    if (deepseek && !WebToolPack2.#isLocal(new URL(url).hostname)) {
+      try {
+        const page = await deepseek.fetch(url, signal);
+        return { status: 200, ok: true, title: page.title, text: page.content };
+      } catch (error) {
+        if (signal?.aborted)
+          throw error;
+      }
+    }
+    const response = await fetch(url, {
+      signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(20000)]) : AbortSignal.timeout(20000),
+      redirect: "follow"
+    });
+    return { status: response.status, ok: response.ok, title: "", text: WebToolPack2.#readable(await response.text()) };
+  }
+  #remember(url, page) {
+    this.#pages.delete(url);
+    this.#pages.set(url, page);
+    const oldest = this.#pages.keys().next().value;
+    if (this.#pages.size > WebToolPack2.#rememberedPages && oldest)
+      this.#pages.delete(oldest);
+  }
+  static #window(url, page, offset) {
+    const head = [`${page.status} ${url}`, page.title].filter(Boolean).join(`
+`);
+    const total = page.text.length;
+    if (offset && offset >= total)
+      return `${head}
+
+Offset ${offset} is past the end; the page has ${total} characters.`;
+    const end = Math.min(offset + WebToolPack2.pageChars, total);
+    const rest = end < total ? `
+
+[characters ${offset}\u2013${end} of ${total}; offset ${end} reads on]` : "";
+    return `${head}
+
+${page.text.slice(offset, end)}${rest}`;
+  }
+  static #isLocal(hostname) {
+    const host = hostname.replace(/^\[|\]$/g, "").toLowerCase();
+    const family = isIP(host);
+    if (family === 6)
+      return host === "::1" || /^(f[cd]|fe[89ab])/.test(host);
+    if (family === 4) {
+      const [a = 0, b = 0] = host.split(".").map(Number);
+      return a === 0 || a === 10 || a === 127 || a === 100 && b >= 64 && b <= 127 || a === 169 && b === 254 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168;
+    }
+    return !host.includes(".") || /\.(localhost|local|internal|lan|home\.arpa)$/.test(host);
   }
   static #refuseHost(url, allowHosts) {
     let parsed;
@@ -1534,7 +1709,7 @@ class AkanCodePlugins2 {
     });
     const dispose = () => mcp?.close();
     const mcpStatus = mcp?.status ?? [];
-    const web = new WebToolPack2({ profile: options.profile });
+    const web = new WebToolPack2({ profile: options.profile, deepseek: options.deepseek });
     const sessions = new SessionToolPack2({
       workspaceRoot: options.workspace.workspaceRoot,
       cwd: options.cwd,
@@ -1669,9 +1844,9 @@ class CodeAgentAsks2 {
 
 // pkgs/@akanjs/devkit/codeAgent/agent/CodeAgentEventMapper.ts
 import {
-  codeAgentClip as codeAgentClip4,
+  codeAgentClip as codeAgentClip5,
   codeAgentLabelChars,
-  codeAgentOutputChars as codeAgentOutputChars4
+  codeAgentOutputChars as codeAgentOutputChars3
 } from "akanjs/common";
 
 // pkgs/@akanjs/devkit/codeAgent/agent/stringArg.ts
@@ -1731,7 +1906,7 @@ class CodeAgentEventMapper2 {
             type: "tool_progress",
             turnId: this.#turnId,
             toolCallId: event.toolCallId,
-            text: codeAgentClip4(CodeAgentEventMapper2.#renderToolText(event.partialResult), codeAgentLabelChars)
+            text: codeAgentClip5(CodeAgentEventMapper2.#renderToolText(event.partialResult), codeAgentLabelChars)
           }
         ];
       case "tool_execution_end":
@@ -1802,8 +1977,8 @@ class CodeAgentEventMapper2 {
       turnId: this.#turnId,
       tool,
       outcome: reason ? "blocked" : event.isError ? "error" : "ok",
-      output: codeAgentClip4(full, codeAgentOutputChars4),
-      truncated: full.length > codeAgentOutputChars4
+      output: codeAgentClip5(full, codeAgentOutputChars3),
+      truncated: full.length > codeAgentOutputChars3
     };
   }
   noteOutcome(reason) {
@@ -1832,7 +2007,7 @@ class CodeAgentEventMapper2 {
       name,
       op: toolOps[name] ?? "other",
       ...path ? { path } : {},
-      title: codeAgentClip4(`${name}${CodeAgentEventMapper2.#renderArgs(args)}`, codeAgentLabelChars)
+      title: codeAgentClip5(`${name}${CodeAgentEventMapper2.#renderArgs(args)}`, codeAgentLabelChars)
     };
   }
   #mapDelta(event) {
@@ -1859,7 +2034,7 @@ class CodeAgentEventMapper2 {
     if (!entries.length)
       return "";
     const rendered = entries.map(([key, value]) => `${key}=${CodeAgentEventMapper2.#renderArgValue(value)}`).join(" ");
-    return `(${codeAgentClip4(rendered, 120)})`;
+    return `(${codeAgentClip5(rendered, 120)})`;
   }
   static #renderArgValue(value) {
     if (Array.isArray(value))
@@ -1868,7 +2043,7 @@ class CodeAgentEventMapper2 {
       const keys = Object.keys(value).length;
       return `{${keys} key${keys === 1 ? "" : "s"}}`;
     }
-    return codeAgentClip4(String(value), 60);
+    return codeAgentClip5(String(value), 60);
   }
   static #renderContent(content) {
     if (typeof content === "string")
@@ -2320,7 +2495,8 @@ class CodeAgent2 {
     const agent = new CodeAgent2(options.profile);
     const autoCompactAt = AkanCodeCompaction2.normalize(options.autoCompactAt);
     const settingsManager = AkanCodeServices2.settings();
-    const modelRuntime = await AkanCodeServices2.runtime(workspaceRoot, CodeAgentProxy.fromEnv(options.profile));
+    const proxy = CodeAgentProxy.fromEnv(options.profile);
+    const modelRuntime = await AkanCodeServices2.runtime(workspaceRoot, proxy);
     const model = await akanCodeModel2(modelRuntime, options.model);
     const compaction = settingsManager.getCompactionSettings(model);
     const modelWarnings = akanCodeModelWarnings2(model, compaction.reserveTokens + compaction.keepRecentTokens);
@@ -2330,6 +2506,7 @@ class CodeAgent2 {
       profile: options.profile,
       apps: options.apps ?? [],
       canSeeImages: akanCodeModelSupportsImages2(model),
+      deepseek: await DeepSeekWeb.fromRuntime(modelRuntime, !!proxy),
       depth: options.depth ?? 0,
       ...options.subagentSpend ? { subagentSpend: options.subagentSpend } : {},
       currentSessionId: () => agent.sessionId,
@@ -2724,7 +2901,7 @@ Continue the task.`);
       approvalId,
       toolCallId,
       name,
-      summary: codeAgentClip5(summary, codeAgentLabelChars2),
+      summary: codeAgentClip6(summary, codeAgentLabelChars2),
       policy: this.#profile.approval
     };
     this.#emit({ type: "approval", request });

package/{index-ht15pm08.js → index-dye8pnxx.js}

@@ -179,7 +179,7 @@ class SubagentPool2 {
     }
   }
   async#run(id, kind, prompt, signal) {
-    const { CodeAgent } = await import("./CodeAgent-fhrb6xyw.js");
+    const { CodeAgent } = await import("./CodeAgent-n3tzjm91.js");
     const budget = this.#options.parent.tools.subagent;
     const child = SubagentPool2.childOf(this.#options.parent, kind);
     const agent = await CodeAgent.create({

package/index.js

@@ -15,7 +15,7 @@ import path from "path";
 var commandModules = {
   workspace: async () => (await import("./workspace.command-6qfgq4b4.js")).WorkspaceCommand,
   agent: async () => (await import("./agent.command-3qxf4xcj.js")).AgentCommand,
-  code: async () => (await import("./code.command-3sxektnr.js")).CodeCommand,
+  code: async () => (await import("./code.command-130bdmhe.js")).CodeCommand,
   application: async () => (await import("./application.command-m1kcd7jf.js")).ApplicationCommand,
   library: async () => (await import("./library.command-erp2f56n.js")).LibraryCommand,
   localRegistry: async () => (await import("./localRegistry.command-y176p558.js")).LocalRegistryCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "3.1.0-rc.12",
+  "version": "3.1.0-rc.13",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -39,7 +39,7 @@
     "@earendil-works/pi-tui": "1.3.0",
     "@inquirer/prompts": "^8.7.3",
     "@tailwindcss/node": "^4.3.3",
-    "akanjs": "3.1.0-rc.12",
+    "akanjs": "3.1.0-rc.13",
     "chalk": "^6.0.1",
     "commander": "^15.0.0",
     "dayjs": "^1.11.23",