amenbo 0.5.1 → 0.6.0

package/dist/server.js

@@ -17,133 +17,42 @@
  */
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import { serveStdio } from "@modelcontextprotocol/server/stdio";
 import { z } from "zod";
 import { handleFetchTool, handleScreenshotTool, politeness, registerCoreShutdownHandlers, resolvePackageVersion, } from "./core.js";
 import { AmenboError } from "./errors.js";
 import { formatLinksResponse } from "./formatting.js";
 import { discoverLinks } from "./links.js";
-// テスト用export(既存スタイルに合わせた最小のテスト可能化。InMemoryTransport経由の
-// MCP progress notifications統合テストでclient.connect()の相手として使う)。
-export const server = new McpServer({ name: "amenbo", version: resolvePackageVersion() });
 /**
  * MCP progress notifications: リクエストにprogressToken(_meta.progressToken)が付いている
  * クライアントに対してのみ、進捗メッセージをホストUIへ通知するコールバックを組み立てる。
  * progressTokenが無い(=進捗通知に対応しない/希望しないクライアント)場合はundefinedを返し、
  * core.ts側の各通知ポイントは呼び出し自体を行わない(条件分岐のみでオーバーヘッドは実質ゼロ)。
  *
- * sendNotificationはtotalを送らない(処理量が事前に不定なため)。失敗はツール本処理を
+ * notifyはtotalを送らない(処理量が事前に不定なため)。失敗はツール本処理を
  * 壊さないようベストエフォートで握りつぶし、原因のみstderrへ記録する。
  */
-function buildProgressNotifier(extra) {
-    const progressToken = extra._meta?.progressToken;
+function buildProgressNotifier(ctx) {
+    const progressToken = ctx.mcpReq._meta?.progressToken;
     if (progressToken === undefined)
         return undefined;
     let progress = 0;
     return (message) => {
         progress += 1;
-        void extra.sendNotification({ method: "notifications/progress", params: { progressToken, progress, message } }).catch((error) => {
+        void ctx.mcpReq.notify({ method: "notifications/progress", params: { progressToken, progress, message } }).catch((error) => {
             console.error("進捗通知(notifications/progress)の送信に失敗しました:", error);
         });
     };
 }
-server.registerTool("fetch", {
-    title: "Fetch a web page as Markdown",
-    description: "Fetch a web page (Japanese-web-native) as low-impact, token-efficient Markdown. Built-in robots.txt compliance, rate limiting, and caching. " +
-        "mode: auto (default; quality score picks Markdown or screenshot) / markdown / outline (heading summary) / screenshot. " +
-        "Refetching a cached URL returns cache: unchanged, or diff (changed sections only), to save tokens. PDF URLs are handled automatically.",
-    inputSchema: {
-        url: z.string().url().describe("Target URL (http/https only; PDF supported)"),
-        mode: z.enum(["auto", "markdown", "outline", "screenshot"]).optional().describe("Default: auto"),
-        selector: z.string().optional().describe("CSS selector to narrow the content"),
-        section: z.string().optional().describe("Section ID obtained from outline mode; returns only that section's Markdown"),
-        page: z.number().int().positive().optional().describe("Page number (default 1)"),
-        max_tokens: z.number().int().positive().optional().describe("Approximate token budget per page (default 8000)"),
-        force_full: z.boolean().optional().describe("Default false. If true, disables diff responses (unchanged/diff) and boilerplate-block removal, always returning the full content"),
-    },
-    annotations: {
-        readOnlyHint: true,
-        openWorldHint: true,
-    },
-}, async ({ url, mode, selector, section, page, max_tokens: maxTokens, force_full: forceFull }, extra) => {
-    try {
-        const onProgress = buildProgressNotifier(extra);
-        const content = await handleFetchTool({ url, mode, selector, section, page, max_tokens: maxTokens, force_full: forceFull, onProgress });
-        return { content };
-    }
-    catch (error) {
-        const message = error instanceof AmenboError ? error.message : `予期しないエラーが発生しました: ${String(error)}`;
-        if (!(error instanceof AmenboError)) {
-            console.error(error);
-        }
-        return { content: [{ type: "text", text: message }], isError: true };
-    }
-});
-server.registerTool("links", {
-    title: "List links from a page (sitemap/RSS-first)",
-    description: "Low-impact link discovery: prefers sitemap.xml / RSS / Atom feeds when available, otherwise extracts in-page links.",
-    inputSchema: {
-        url: z.string().url().describe("Starting URL"),
-        filter: z.string().optional().describe("Substring match against URL/link text, or a glob using *"),
-    },
-    annotations: {
-        readOnlyHint: true,
-        openWorldHint: true,
-    },
-}, async ({ url, filter }, extra) => {
-    try {
-        const onProgress = buildProgressNotifier(extra);
-        const result = await discoverLinks(url, politeness, { ...(filter ? { filter } : {}), onProgress });
-        return { content: [{ type: "text", text: formatLinksResponse(url, result) }] };
-    }
-    catch (error) {
-        const message = error instanceof AmenboError ? error.message : `予期しないエラーが発生しました: ${String(error)}`;
-        if (!(error instanceof AmenboError)) {
-            console.error(error);
-        }
-        return { content: [{ type: "text", text: message }], isError: true };
-    }
-});
-server.registerTool("screenshot", {
-    title: "Capture a tiled screenshot of a web page",
-    description: "For explicit visual inspection. Renders the page with a headless browser and returns tiled PNG screenshots. Built-in robots.txt compliance, rate limiting, and caching.",
-    inputSchema: {
-        url: z.string().url().describe("Target URL (http/https only)"),
-        fullPage: z.boolean().optional().describe("Default true. If false, captures only the first viewport (1 tile)"),
-        width: z.number().int().positive().optional().describe("Tile width in px (default 1280)"),
-        scale: z.number().min(0.5).max(1.0).optional().describe("Resolution scale (0.5-1.0, default 1.0); lower reduces image tokens"),
-    },
-    annotations: {
-        readOnlyHint: true,
-        openWorldHint: true,
-    },
-}, async ({ url, fullPage, width, scale }, extra) => {
-    try {
-        const onProgress = buildProgressNotifier(extra);
-        const content = await handleScreenshotTool({ url, fullPage, width, scale, onProgress });
-        return { content };
-    }
-    catch (error) {
-        const message = error instanceof AmenboError ? error.message : `予期しないエラーが発生しました: ${String(error)}`;
-        if (!(error instanceof AmenboError)) {
-            console.error(error);
-        }
-        return { content: [{ type: "text", text: message }], isError: true };
-    }
-});
-// MCPプロトコル面は既存ツールのtitle/description同様に英語固定のため、この定数は
-// README.en.md の「推奨プロンプト」ブロックと一言一句同期を保つこと(完全一致を
-// tests/serverUsagePrompt.test.ts が検証する)。README.md の日本語ブロックは対応する訳文で、
-// 内容の連動は人が保つ。README側は導入者がコピペで使う独立したドキュメントとして
-// 存在する必要があるため、単一ソース化(README側からこの定数を読み込む等)はしていない。
+/** MCPプロトコル面は英語固定のため、ツールのtitle/description同様この定数も英語で書く。 */
 const USAGE_PROMPT_TEXT = `## Use amenbo for web fetching
 
 - Fetch pages with \`fetch\` (default mode \`auto\`). For pages that look long or where only part
   is needed, first check headings and per-section token counts with \`mode: "outline"\`,
   then fetch only the needed sections via \`section\`
 - Getting \`unchanged\` / \`diff\` when refetching the same URL is normal (no change / changed
-  sections only). Use \`force_full: true\` only when the full text is required
+  sections only). Use \`force_full: true\` only when you need the whole content again instead of a diff
 - When looking for pages within a site, don't guess URLs — enumerate them with \`links\`
   (narrow down with \`filter\`)
 - In environments with a shell, for long pages you only want to keyword-search or for bulk
@@ -157,19 +66,140 @@ const USAGE_PROMPT_TEXT = `## Use amenbo for web fetching
   \`scale: 0.5\` or so reduces image tokens
 - Fetch failures due to robots.txt denial or anti-bot measures are by design (no circumvention).
   Report failures to the user as-is`;
-server.registerPrompt("usage", {
-    title: "How to use amenbo efficiently",
-    description: "Usage conventions for token-efficient, low-impact fetching (progressive disclosure, diff refetch, links).",
-}, () => ({
-    messages: [{ role: "user", content: { type: "text", text: USAGE_PROMPT_TEXT } }],
-}));
+// USAGE_PROMPT_TEXTは README.en.md の「推奨プロンプト」ブロックと一言一句同期を保つこと(完全一致を
+// tests/serverUsagePrompt.test.ts が検証する)。README.md の日本語ブロックは対応する訳文で、
+// 内容の連動は人が保つ。README側は導入者がコピペで使う独立したドキュメントとして
+// 存在する必要があるため、単一ソース化(README側からこの定数を読み込む等)はしていない。
+/**
+ * ツール3個とプロンプト1個を登録したMCPサーバーインスタンスを1つ組み立てる。
+ *
+ * モジュールトップレベルのシングルトンにしていないのは、serveStdioがプロトコル世代
+ * (2025系 / 2026-07-28)を接続の1通目で判定してから世代ごとのインスタンスをpinする都合上、
+ * 1プロセス内でこのファクトリを複数回呼びうるため(同一インスタンスを二度connectすると失敗する)。
+ * テストからはこの関数を直接呼んでInMemoryTransportへ繋ぐ。
+ */
+export function createServer() {
+    const server = new McpServer({ name: "amenbo", version: resolvePackageVersion() });
+    server.registerTool("fetch", {
+        title: "Fetch a web page as Markdown",
+        description: "Fetch a web page (Japanese-web-native) as low-impact, token-efficient Markdown. Built-in robots.txt compliance, rate limiting, and caching. " +
+            "mode: auto (default; quality score picks Markdown or screenshot) / markdown / outline (heading summary) / screenshot. " +
+            "Refetching a cached URL returns cache: unchanged, or diff (changed sections only), to save tokens. PDF URLs are handled automatically.",
+        inputSchema: z.object({
+            url: z.string().url().describe("Target URL (http/https only; PDF supported)"),
+            mode: z.enum(["auto", "markdown", "outline", "screenshot"]).optional().describe("Default: auto"),
+            selector: z.string().optional().describe("CSS selector to narrow the content"),
+            section: z.string().optional().describe("Section ID obtained from outline mode; returns only that section's Markdown"),
+            page: z.number().int().positive().optional().describe("Page number (default 1)"),
+            max_tokens: z.number().int().positive().optional().describe("Approximate token budget per page (default 8000)"),
+            force_full: z.boolean().optional().describe("Default false. If true, disables diff responses (unchanged/diff) and boilerplate-block removal (pagination by max_tokens still applies)"),
+        }),
+        annotations: {
+            readOnlyHint: true,
+            openWorldHint: true,
+        },
+    }, async ({ url, mode, selector, section, page, max_tokens: maxTokens, force_full: forceFull }, ctx) => {
+        try {
+            const onProgress = buildProgressNotifier(ctx);
+            const content = await handleFetchTool({ url, mode, selector, section, page, max_tokens: maxTokens, force_full: forceFull, onProgress });
+            return { content };
+        }
+        catch (error) {
+            const message = error instanceof AmenboError ? error.message : `予期しないエラーが発生しました: ${String(error)}`;
+            if (!(error instanceof AmenboError)) {
+                console.error(error);
+            }
+            return { content: [{ type: "text", text: message }], isError: true };
+        }
+    });
+    server.registerTool("links", {
+        title: "List links from a page (sitemap/RSS-first)",
+        description: "Low-impact link discovery: prefers sitemap.xml / RSS / Atom feeds when available, otherwise extracts in-page links.",
+        inputSchema: z.object({
+            url: z.string().url().describe("Starting URL"),
+            filter: z.string().optional().describe("Substring match against URL/link text, or a glob using *"),
+        }),
+        annotations: {
+            readOnlyHint: true,
+            openWorldHint: true,
+        },
+    }, async ({ url, filter }, ctx) => {
+        try {
+            const onProgress = buildProgressNotifier(ctx);
+            const result = await discoverLinks(url, politeness, { ...(filter ? { filter } : {}), onProgress });
+            return { content: [{ type: "text", text: formatLinksResponse(url, result) }] };
+        }
+        catch (error) {
+            const message = error instanceof AmenboError ? error.message : `予期しないエラーが発生しました: ${String(error)}`;
+            if (!(error instanceof AmenboError)) {
+                console.error(error);
+            }
+            return { content: [{ type: "text", text: message }], isError: true };
+        }
+    });
+    server.registerTool("screenshot", {
+        title: "Capture a tiled screenshot of a web page",
+        description: "For explicit visual inspection. Renders the page with a headless browser and returns tiled PNG screenshots. Built-in robots.txt compliance, rate limiting, and caching.",
+        inputSchema: z.object({
+            url: z.string().url().describe("Target URL (http/https only)"),
+            fullPage: z.boolean().optional().describe("Default true. If false, captures only the first viewport (1 tile)"),
+            width: z.number().int().positive().optional().describe("Tile width in px (default 1280)"),
+            scale: z.number().min(0.5).max(1.0).optional().describe("Resolution scale (0.5-1.0, default 1.0); lower reduces image tokens"),
+        }),
+        annotations: {
+            readOnlyHint: true,
+            openWorldHint: true,
+        },
+    }, async ({ url, fullPage, width, scale }, ctx) => {
+        try {
+            const onProgress = buildProgressNotifier(ctx);
+            const content = await handleScreenshotTool({ url, fullPage, width, scale, onProgress });
+            return { content };
+        }
+        catch (error) {
+            const message = error instanceof AmenboError ? error.message : `予期しないエラーが発生しました: ${String(error)}`;
+            if (!(error instanceof AmenboError)) {
+                console.error(error);
+            }
+            return { content: [{ type: "text", text: message }], isError: true };
+        }
+    });
+    server.registerPrompt("usage", {
+        title: "How to use amenbo efficiently",
+        description: "Usage conventions for token-efficient, low-impact fetching (progressive disclosure, diff refetch, links).",
+    }, () => ({
+        messages: [{ role: "user", content: { type: "text", text: USAGE_PROMPT_TEXT } }],
+    }));
+    return server;
+}
 /** MCP stdioサーバーを起動する。CLI(cli.ts)が引数なし/`serve`サブコマンド時に呼ぶ後方互換経路でもある。 */
 export async function runServer() {
     // レビュー指摘対応: exit/SIGINT/SIGTERMハンドラ(core.ts)はサーバー常駐プロセスでのみ
     // 必要なため、importするだけで走るモジュールトップレベルではなくここで明示的に登録する。
     registerCoreShutdownHandlers();
-    const transport = new StdioServerTransport();
-    await server.connect(transport);
+    serveStdio(() => {
+        // ファクトリの失敗をここで致命扱いにしているのは、serveStdioが同期関数で
+        // 例外をonerrorへ流すだけのため、放置すると「全リクエストが内部エラーを返し続けるのに
+        // 終了コード0で生き続けるプロセス」になるから。組み立てに失敗したサーバーは何も返せない。
+        try {
+            return createServer();
+        }
+        catch (error) {
+            console.error("amenboサーバーの初期化に失敗しました:", error);
+            process.exit(1);
+        }
+    }, {
+        // 既定値と同じだが明示する: 'reject'にすると initialize で口を開ける2025系クライアント
+        // (現行のClaude Desktop/Cline等)が繋がらなくなるため、後方互換を捨てない判断をコードに残す。
+        legacy: "serve",
+        // ここでプロセスを落とさないのは、onerrorが単発の送信失敗と接続レベルの障害を
+        // 区別せず同じ口へ流すため(落とすと送信失敗ごときで常駐サーバーを巻き添えにする)。
+        // 起動不能の検出は上のファクトリ側が担う。トランスポート自体のstart失敗だけは
+        // SDKのAPI上ここへしか現れず切り分けられないため、記録に留める。
+        onerror: (error) => {
+            console.error("MCP stdio接続でエラーが発生しました:", error);
+        },
+    });
 }
 /**
  * このモジュールが直接実行された(node dist/server.js / tsx src/server.ts / binエントリ経由)場合のみ

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/dist/tokens.d.ts

@@ -1,14 +1,27 @@
 /**
- * J5: CJK対応トークン見積り。
+ * J5: 文字クラス別のトークン見積り。
  *
- * 文字クラス別係数(plan.md §2 J5):
- *   - ASCII等(半角英数記号): 1トークン ≒ 3.8文字
- *   - CJK(かな/カナ/漢字/全角記号等): 1文字 ≒ 0.9トークン
+ * 文字クラス別係数:
+ *   - ラテン文字(英数字・ラテン拡張の文字): 1トークン ≒ 3.8文字
+ *   - ASCII記号(約物・記法): 1文字 ≒ 0.5トークン
+ *   - 非ラテン文字(キリル/ギリシャ/ヘブライ/アラビア/デーヴァナーガリー/タイ等): 1文字 ≒ 0.5トークン
+ *   - CJK・ハングル(かな/カナ/漢字/全角記号/ハングル): 1文字 ≒ 0.9トークン
+ *   - 記号・絵文字(約物/矢印/数学記号/ピクトグラム): 1文字 ≒ 1.5トークン
  *
- * 設計判断: plan.mdはASCII/CJKの二区分のみを定義しているため、絵文字・キリル文字等の
- * その他多バイト文字はASCII側の係数で近似する(Phase 1のスコープでは十分な精度と判断)。
+ * 係数はo200k_base(GPT-4o)での実測に、既存係数と同程度(約1.15倍)の安全側マージンを乗せた値。
+ * 実測(1文字あたりトークン数): 英4.78文字/token、日0.79、韓0.75、中0.80、露0.29、
+ * 亜0.35、希0.38、印0.40、泰0.44、ヘブライ0.47、一般約物1.00、矢印/数学1.40、絵文字1.30〜1.80。
+ *
+ * 当初はASCII/CJKの二区分のみで、ハングルを含む非ラテン文字も記号・絵文字もASCII係数で
+ * 近似していたが、韓国語では実トークン量の約1/3、絵文字では約1/7にしか見積もれず、
+ * max_tokens予算が大きく超過していた(言語による不公平は本ツールでは不具合として扱う)。
+ * ASCII記号を文字と分けているのは、`| --- |`のようなMarkdown表の記法が
+ * 文字と同じ密度では圧縮されないため(このツールの主力出力なので実測で最も外れていた)。
+ *
+ * 全クラス適用後の見積り/実測比は、散文で1.14〜2.00倍(安全側)、
+ * 記法が密なMarkdown表で0.71倍(過小側の最悪ケース)。
  */
-/** テキストの概算トークン数を返す(CJK文字クラス別係数)。 */
+/** テキストの概算トークン数を返す(文字クラス別係数)。 */
 export declare function estimateTokens(text: string): number;
 /** Markdownの1ブロック(見出し/段落/リスト項目/表/コードフェンス等)。 */
 export interface Block {

package/dist/tokens.js

@@ -1,19 +1,45 @@
 /**
- * J5: CJK対応トークン見積り。
+ * J5: 文字クラス別のトークン見積り。
  *
- * 文字クラス別係数(plan.md §2 J5):
- *   - ASCII等(半角英数記号): 1トークン ≒ 3.8文字
- *   - CJK(かな/カナ/漢字/全角記号等): 1文字 ≒ 0.9トークン
+ * 文字クラス別係数:
+ *   - ラテン文字(英数字・ラテン拡張の文字): 1トークン ≒ 3.8文字
+ *   - ASCII記号(約物・記法): 1文字 ≒ 0.5トークン
+ *   - 非ラテン文字(キリル/ギリシャ/ヘブライ/アラビア/デーヴァナーガリー/タイ等): 1文字 ≒ 0.5トークン
+ *   - CJK・ハングル(かな/カナ/漢字/全角記号/ハングル): 1文字 ≒ 0.9トークン
+ *   - 記号・絵文字(約物/矢印/数学記号/ピクトグラム): 1文字 ≒ 1.5トークン
  *
- * 設計判断: plan.mdはASCII/CJKの二区分のみを定義しているため、絵文字・キリル文字等の
- * その他多バイト文字はASCII側の係数で近似する(Phase 1のスコープでは十分な精度と判断)。
+ * 係数はo200k_base(GPT-4o)での実測に、既存係数と同程度(約1.15倍)の安全側マージンを乗せた値。
+ * 実測(1文字あたりトークン数): 英4.78文字/token、日0.79、韓0.75、中0.80、露0.29、
+ * 亜0.35、希0.38、印0.40、泰0.44、ヘブライ0.47、一般約物1.00、矢印/数学1.40、絵文字1.30〜1.80。
+ *
+ * 当初はASCII/CJKの二区分のみで、ハングルを含む非ラテン文字も記号・絵文字もASCII係数で
+ * 近似していたが、韓国語では実トークン量の約1/3、絵文字では約1/7にしか見積もれず、
+ * max_tokens予算が大きく超過していた(言語による不公平は本ツールでは不具合として扱う)。
+ * ASCII記号を文字と分けているのは、`| --- |`のようなMarkdown表の記法が
+ * 文字と同じ密度では圧縮されないため(このツールの主力出力なので実測で最も外れていた)。
+ *
+ * 全クラス適用後の見積り/実測比は、散文で1.14〜2.00倍(安全側)、
+ * 記法が密なMarkdown表で0.71倍(過小側の最悪ケース)。
  */
-const ASCII_CHARS_PER_TOKEN = 3.8;
+const LATIN_CHARS_PER_TOKEN = 3.8;
 const CJK_TOKENS_PER_CHAR = 0.9;
+const NON_LATIN_TOKENS_PER_CHAR = 0.5;
+const SYMBOL_TOKENS_PER_CHAR = 1.5;
+const ASCII_PUNCT_TOKENS_PER_CHAR = 0.5;
+/** ラテン文字・ASCII記号の範囲(基本ラテン〜ラテン文字拡張B)。 */
+const LATIN_MAX_CODE_POINT = 0x024f;
+/** 英数字、またはラテン文字(アクセント付きを含む)か判定する。 */
+function isLatinWordCodePoint(cp) {
+    return ((cp >= 0x30 && cp <= 0x39) || // 0-9
+        (cp >= 0x41 && cp <= 0x5a) || // A-Z
+        (cp >= 0x61 && cp <= 0x7a) || // a-z
+        (cp >= 0x00c0 && cp <= LATIN_MAX_CODE_POINT) // ラテン1補助〜ラテン文字拡張B
+    );
+}
 /**
- * コードポイントがCJK(日本語表記に使われる文字)かどうかを判定する。
- * ひらがな・カタカナ・漢字(統合漢字+拡張A)・CJK記号(全角スペースを除く)・
- * 全角英数/記号(半角スペースに相当する全角スペースを除く)・半角カタカナを対象とする。
+ * 1文字あたりのトークン消費が大きい表記のコードポイントか判定する。
+ * ひらがな・カタカナ・漢字(統合漢字+拡張A/B+互換)・CJK記号(全角スペースを除く)・
+ * 全角英数/記号・半角カタカナ・ハングル(音節+字母)を対象とする。
  */
 function isCjkCodePoint(cp) {
     return ((cp >= 0x3040 && cp <= 0x309f) || // ひらがな
@@ -21,34 +47,59 @@ function isCjkCodePoint(cp) {
         (cp >= 0x3400 && cp <= 0x4dbf) || // CJK統合漢字拡張A
         (cp >= 0x4e00 && cp <= 0x9fff) || // CJK統合漢字
         (cp >= 0xf900 && cp <= 0xfaff) || // CJK互換漢字
+        (cp >= 0x20000 && cp <= 0x2fa1f) || // CJK統合漢字拡張B以降
         (cp >= 0x3001 && cp <= 0x303f) || // CJK記号(0x3000の全角スペースは除く)
-        (cp >= 0xff01 && cp <= 0xffef) // 全角英数/記号・半角カタカナ(0xFF00の全角スペースは除く)
+        (cp >= 0xff01 && cp <= 0xffef) || // 全角英数/記号・半角カタカナ(0xFF00の全角スペースは除く)
+        (cp >= 0xac00 && cp <= 0xd7a3) || // ハングル音節
+        (cp >= 0x1100 && cp <= 0x11ff) || // ハングル字母
+        (cp >= 0x3130 && cp <= 0x318f) // ハングル互換字母
     );
 }
-/** テキストのCJK文字数と非CJK文字数を数える。 */
+/**
+ * 約物・矢印・数学記号・ピクトグラムのコードポイントか判定する。
+ * CJK記号(全角約物)は先にCJK側で判定されるため、ここへは来ない。
+ */
+function isSymbolCodePoint(cp) {
+    return ((cp >= 0x2000 && cp <= 0x2bff) || // 一般約物・矢印・数学記号・各種記号・装飾記号
+        (cp >= 0x2e00 && cp <= 0x2e7f) || // 補助句読点
+        cp >= 0x1f000 // 絵文字・ピクトグラム(拡張漢字はCJK側で判定済み)
+    );
+}
+/** テキストを文字クラス別に数える(空白はトークンをほぼ消費しないため数えない)。 */
 function countByClass(text) {
-    let cjk = 0;
-    let other = 0;
+    const counts = { cjk: 0, nonLatin: 0, symbol: 0, latinWord: 0, asciiPunct: 0 };
     for (const ch of text) {
         const cp = ch.codePointAt(0);
-        if (cp === undefined)
+        if (cp === undefined || /\s/u.test(ch))
             continue;
         if (isCjkCodePoint(cp)) {
-            cjk++;
+            counts.cjk++;
+        }
+        else if (isSymbolCodePoint(cp)) {
+            counts.symbol++;
+        }
+        else if (isLatinWordCodePoint(cp)) {
+            counts.latinWord++;
+        }
+        else if (cp > LATIN_MAX_CODE_POINT) {
+            counts.nonLatin++;
         }
-        else if (!/\s/u.test(ch)) {
-            // 空白は係数計算に含めない(トークンをほぼ消費しないため)
-            other++;
+        else {
+            counts.asciiPunct++;
         }
     }
-    return { cjk, other };
+    return counts;
 }
-/** テキストの概算トークン数を返す(CJK文字クラス別係数)。 */
+/** テキストの概算トークン数を返す(文字クラス別係数)。 */
 export function estimateTokens(text) {
     if (text.length === 0)
         return 0;
-    const { cjk, other } = countByClass(text);
-    const tokens = cjk * CJK_TOKENS_PER_CHAR + other / ASCII_CHARS_PER_TOKEN;
+    const { cjk, nonLatin, symbol, latinWord, asciiPunct } = countByClass(text);
+    const tokens = cjk * CJK_TOKENS_PER_CHAR +
+        nonLatin * NON_LATIN_TOKENS_PER_CHAR +
+        symbol * SYMBOL_TOKENS_PER_CHAR +
+        asciiPunct * ASCII_PUNCT_TOKENS_PER_CHAR +
+        latinWord / LATIN_CHARS_PER_TOKEN;
     return Math.ceil(tokens);
 }
 /**

package/dist/tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amenbo",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "mcpName": "io.github.Rererr/amenbo",
   "description": "Skims the web without making waves — a Japanese-web-native MCP server for low-impact, token-efficient web collection: outline→section progressive disclosure and diff-only refetches keep context small",
   "type": "module",
@@ -29,6 +29,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "prepack": "npm run build",
     "dev": "tsx src/server.ts",
     "dev:cli": "tsx src/cli.ts",
     "test": "vitest run",
@@ -36,7 +37,7 @@
   },
   "dependencies": {
     "@joplin/turndown-plugin-gfm": "^1.0.67",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/server": "^2.0.0",
     "@mozilla/readability": "^0.6.0",
     "@napi-rs/canvas": "^1.0.2",
     "encoding-japanese": "^2.2.0",
@@ -49,6 +50,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
+    "@modelcontextprotocol/client": "^2.0.0",
     "@types/encoding-japanese": "^2.2.1",
     "@types/node": "^26.1.1",
     "@types/turndown": "^5.0.6",