kiri-mcp-server 0.5.0 → 0.6.0

package/dist/server/scoring.js

@@ -12,7 +12,7 @@ function validateWeights(weights, profileName) {
     if (typeof weights !== "object" || weights === null) {
         throw new Error(`Profile '${profileName}' must be an object`);
     }
-    const required = ["textMatch", "editingPath", "dependency", "proximity", "structural"];
+    const required = ["textMatch", "pathMatch", "editingPath", "dependency", "proximity", "structural"];
     const obj = weights;
     for (const key of required) {
         const value = obj[key];
@@ -28,8 +28,9 @@ function loadProfilesFromConfig() {
     }
     try {
         // 環境変数でカスタムパスを指定可能
+        // 本番環境（npm install）では dist/config/ を、開発環境では config/ を参照
         const configPath = process.env.KIRI_SCORING_CONFIG ??
-            join(fileURLToPath(import.meta.url), "../../../config/scoring-profiles.yml");
+            join(fileURLToPath(import.meta.url), "../../config/scoring-profiles.yml");
         const configContent = readFileSync(configPath, "utf-8");
         const parsed = parseSimpleYaml(configContent);
         // 必須プロファイルの検証とウェイトのバリデーション
@@ -56,6 +57,7 @@ function loadProfilesFromConfig() {
         profilesCache = {
             default: {
                 textMatch: 1.0,
+                pathMatch: 1.5,
                 editingPath: 2.0,
                 dependency: 0.5,
                 proximity: 0.25,
@@ -63,6 +65,7 @@ function loadProfilesFromConfig() {
             },
             bugfix: {
                 textMatch: 1.0,
+                pathMatch: 1.5,
                 editingPath: 1.8,
                 dependency: 0.7,
                 proximity: 0.35,
@@ -70,6 +73,7 @@ function loadProfilesFromConfig() {
             },
             testfail: {
                 textMatch: 1.0,
+                pathMatch: 1.5,
                 editingPath: 1.6,
                 dependency: 0.85,
                 proximity: 0.3,
@@ -77,6 +81,7 @@ function loadProfilesFromConfig() {
             },
             typeerror: {
                 textMatch: 1.0,
+                pathMatch: 1.5,
                 editingPath: 1.4,
                 dependency: 0.6,
                 proximity: 0.4,
@@ -84,6 +89,7 @@ function loadProfilesFromConfig() {
             },
             feature: {
                 textMatch: 1.0,
+                pathMatch: 1.5,
                 editingPath: 1.5,
                 dependency: 0.45,
                 proximity: 0.5,
@@ -108,4 +114,3 @@ export function loadScoringProfile(profileName) {
     }
     return profiles.default;
 }
-//# sourceMappingURL=scoring.js.map

package/dist/shared/duckdb.js

@@ -20,7 +20,6 @@ function assertNoUndefined(sql, params) {
     }
 }
 export class DuckDBClient {
-    database;
     constructor(path) {
         this.database = new duckdb.Database(path);
     }
@@ -118,4 +117,3 @@ export class DuckDBClient {
         });
     }
 }
-//# sourceMappingURL=duckdb.js.map

package/dist/shared/embedding.js

@@ -1,9 +1,23 @@
 import { createHash } from "node:crypto";
 const DEFAULT_DIMS = 64;
+/**
+ * 埋め込み生成用のトークン化
+ * keyword extractionと同じ戦略を使用してハイフン区切り用語を保持
+ */
 function tokenize(text) {
+    const strategy = process.env.KIRI_TOKENIZATION_STRATEGY?.toLowerCase();
+    // レガシーモード: ハイフンも分割（従来の動作）
+    if (strategy === "legacy") {
+        return text
+            .toLowerCase()
+            .split(/[^\p{L}\p{N}_]+/u)
+            .map((token) => token.trim())
+            .filter((token) => token.length > 0);
+    }
+    // phrase-aware または hybrid モード: ハイフンを保持
     return text
         .toLowerCase()
-        .split(/[^\p{L}\p{N}_]+/u)
+        .split(/[^\p{L}\p{N}_-]+/u)
         .map((token) => token.trim())
         .filter((token) => token.length > 0);
 }
@@ -82,4 +96,3 @@ export function structuralSimilarity(a, b) {
 /** @deprecated Use structuralSimilarity() instead. Kept for backward compatibility. */
 export const cosineSimilarity = structuralSimilarity;
 export const EMBEDDING_DIMS = DEFAULT_DIMS;
-//# sourceMappingURL=embedding.js.map

package/dist/shared/tokenizer.js

@@ -2,4 +2,3 @@ export function encode(text) {
     const codePoints = Array.from(text);
     return codePoints.map((_, index) => index);
 }
-//# sourceMappingURL=tokenizer.js.map

package/dist/shared/utils/simpleYaml.js

@@ -87,4 +87,3 @@ export function parseSimpleYaml(content) {
     }
     return root;
 }
-//# sourceMappingURL=simpleYaml.js.map

package/dist/src/server/handlers.d.ts.map

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

package/dist/src/server/handlers.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { generateEmbedding, structuralSimilarity } from "../shared/embedding.js";
-import { encode as encodeGPT } from "../shared/tokenizer.js";
+import { encode as encodeGPT, tokenizeText } from "../shared/tokenizer.js";
 import { coerceProfileName, loadScoringProfile } from "./scoring.js";
 const DEFAULT_SEARCH_LIMIT = 50;
 const DEFAULT_SNIPPET_WINDOW = 150;
@@ -73,22 +73,126 @@ function normalizeBundleLimit(limit) {
     }
     return Math.min(Math.max(1, Math.floor(limit)), MAX_BUNDLE_LIMIT);
 }
+/**
+ * トークン化戦略を取得
+ * 環境変数またはデフォルト値から決定
+ */
+function getTokenizationStrategy() {
+    const strategy = process.env.KIRI_TOKENIZATION_STRATEGY?.toLowerCase();
+    if (strategy === "legacy" || strategy === "hybrid") {
+        return strategy;
+    }
+    return "phrase-aware"; // デフォルト
+}
+/**
+ * 引用符で囲まれたフレーズを抽出
+ * 例: 'search "page-agent handler" test' → ["page-agent handler"]
+ */
+function extractQuotedPhrases(text) {
+    const phrases = [];
+    const quotePattern = /"([^"]+)"|'([^']+)'/g;
+    let match;
+    let remaining = text;
+    // eslint-disable-next-line no-cond-assign
+    while ((match = quotePattern.exec(text)) !== null) {
+        const phrase = (match[1] || match[2] || "").trim().toLowerCase();
+        if (phrase.length >= 3) {
+            phrases.push(phrase);
+        }
+        remaining = remaining.replace(match[0], " ");
+    }
+    return { phrases, remaining };
+}
+/**
+ * 複合用語を抽出（ハイフンまたはアンダースコア区切り）
+ * Unicode文字に対応（日本語、中国語などの複合用語もサポート）
+ * 例: "page-agent lambda-handler" → ["page-agent", "lambda-handler"]
+ * 例: "user_profile file_embedding" → ["user_profile", "file_embedding"]
+ * 例: "app-日本語" → ["app-日本語"]
+ */
+function extractCompoundTerms(text) {
+    // Unicode対応: ハイフン(-)とアンダースコア(_)の両方をサポート
+    // snake_case (Python/Rust) と kebab-case を同等に扱う
+    // 注: \b はアンダースコアを単語文字として扱うため、アンダースコアでは機能しない
+    // そのため、明示的な境界チェックを使用
+    const compoundPattern = /(?:^|\s|[^\p{L}\p{N}_-])([\p{L}\p{N}]+(?:[-_][\p{L}\p{N}]+)+)(?=\s|[^\p{L}\p{N}_-]|$)/giu;
+    const matches = Array.from(text.matchAll(compoundPattern)).map((m) => m[1]);
+    return matches
+        .map((term) => term.toLowerCase())
+        .filter((term) => term.length >= 3 && !STOP_WORDS.has(term));
+}
+/**
+ * パスライクな用語を抽出
+ * Unicode文字に対応
+ * 例: "lambda/page-agent/handler" → ["lambda", "page-agent", "handler"]
+ */
+function extractPathSegments(text) {
+    // Unicode対応: パスセグメントでもUnicode文字をサポート
+    const pathPattern = /\b[\p{L}\p{N}_-]+(?:\/[\p{L}\p{N}_-]+)+\b/giu;
+    const matches = text.match(pathPattern) || [];
+    const segments = [];
+    for (const path of matches) {
+        const parts = path.toLowerCase().split("/");
+        for (const part of parts) {
+            if (part.length >= 3 && !STOP_WORDS.has(part) && !segments.includes(part)) {
+                segments.push(part);
+            }
+        }
+    }
+    return segments;
+}
+/**
+ * 通常の単語を抽出
+ * 共有トークン化ユーティリティを使用
+ */
+function extractRegularWords(text, strategy) {
+    const words = tokenizeText(text, strategy).filter((word) => word.length >= 3 && !STOP_WORDS.has(word));
+    return words;
+}
+/**
+ * テキストからキーワード、フレーズ、パスセグメントを抽出
+ * トークン化戦略に基づいて、ハイフン区切り用語の処理方法を変更
+ */
 function extractKeywords(text) {
-    const words = text
-        .toLowerCase()
-        .split(/[^a-z0-9_]+/iu)
-        .map((word) => word.trim())
-        .filter((word) => word.length >= 3 && !STOP_WORDS.has(word));
-    const unique = [];
-    for (const word of words) {
-        if (!unique.includes(word)) {
-            unique.push(word);
-            if (unique.length >= MAX_KEYWORDS) {
+    const strategy = getTokenizationStrategy();
+    const result = {
+        phrases: [],
+        keywords: [],
+        pathSegments: [],
+    };
+    // Phase 1: 引用符で囲まれたフレーズを抽出
+    const { phrases: quotedPhrases, remaining: afterQuotes } = extractQuotedPhrases(text);
+    result.phrases.push(...quotedPhrases);
+    // Phase 2: パスセグメントを抽出
+    const pathSegments = extractPathSegments(afterQuotes);
+    result.pathSegments.push(...pathSegments);
+    // Phase 3: 複合用語を抽出（ハイフン/アンダースコア区切り）（phrase-aware または hybrid モード）
+    if (strategy === "phrase-aware" || strategy === "hybrid") {
+        const compoundTerms = extractCompoundTerms(afterQuotes);
+        result.phrases.push(...compoundTerms);
+        // hybrid モードの場合、複合用語を分割したキーワードも追加
+        if (strategy === "hybrid") {
+            for (const term of compoundTerms) {
+                // ハイフンとアンダースコアの両方で分割
+                const parts = term
+                    .split(/[-_]/)
+                    .filter((part) => part.length >= 3 && !STOP_WORDS.has(part));
+                result.keywords.push(...parts);
+            }
+        }
+    }
+    // Phase 4: 通常の単語を抽出
+    const regularWords = extractRegularWords(afterQuotes, strategy);
+    // 重複を除去しながら、最大キーワード数まで追加
+    for (const word of regularWords) {
+        if (!result.keywords.includes(word) && !result.phrases.includes(word)) {
+            result.keywords.push(word);
+            if (result.keywords.length >= MAX_KEYWORDS) {
                 break;
             }
         }
     }
-    return unique;
+    return result;
 }
 function ensureCandidate(map, filePath) {
     let candidate = map.get(filePath);
@@ -321,13 +425,41 @@ function applyFileTypeBoost(path, baseScore, profile = "default") {
  * @param row - ファイル情報（path, ext）
  * @param profile - ブーストプロファイル
  */
-function applyBoostProfile(candidate, row, profile) {
+function applyBoostProfile(candidate, row, profile, extractedTerms, pathMatchWeight) {
     if (profile === "none") {
         return;
     }
     const { path, ext } = row;
     const lowerPath = path.toLowerCase();
     const fileName = path.split("/").pop() ?? "";
+    // パスベースのスコアリング: goalのキーワード/フレーズがファイルパスに含まれる場合にブースト
+    if (extractedTerms && pathMatchWeight && pathMatchWeight > 0) {
+        // フレーズがパスに完全一致する場合（最高の重み）
+        for (const phrase of extractedTerms.phrases) {
+            if (lowerPath.includes(phrase)) {
+                candidate.score += pathMatchWeight * 1.5; // 1.5倍のブースト
+                candidate.reasons.add(`path-phrase:${phrase}`);
+                break; // 最初のマッチのみ適用
+            }
+        }
+        // パスセグメントがマッチする場合（中程度の重み）
+        const pathParts = lowerPath.split("/");
+        for (const segment of extractedTerms.pathSegments) {
+            if (pathParts.includes(segment)) {
+                candidate.score += pathMatchWeight;
+                candidate.reasons.add(`path-segment:${segment}`);
+                break; // 最初のマッチのみ適用
+            }
+        }
+        // 通常のキーワードがパスに含まれる場合（低い重み）
+        for (const keyword of extractedTerms.keywords) {
+            if (lowerPath.includes(keyword)) {
+                candidate.score += pathMatchWeight * 0.5; // 0.5倍のブースト
+                candidate.reasons.add(`path-keyword:${keyword}`);
+                break; // 最初のマッチのみ適用
+            }
+        }
+    }
     // Blacklisted directories that are almost always irrelevant for code context
     const blacklistedDirs = [
         ".cursor/",
@@ -425,7 +557,7 @@ function applyBoostProfile(candidate, row, profile) {
         // Penalize documentation and other non-code files
         const docExtensions = [".md", ".yaml", ".yml", ".mdc", ".json"];
         if (docExtensions.some((docExt) => path.endsWith(docExt))) {
-            candidate.score -= 1.0; // Strong penalty to overcome structural similarity
+            candidate.score -= 2.0; // Strong penalty to overcome doc-heavy keyword matches
             candidate.reasons.add("penalty:doc-file");
         }
         // Boost implementation files, with more specific paths getting higher scores
@@ -649,18 +781,25 @@ export async function contextBundle(context, params) {
     }
     const semanticSeed = keywordSources.join(" ");
     const queryEmbedding = generateEmbedding(semanticSeed)?.values ?? null;
-    let keywords = extractKeywords(semanticSeed);
-    if (keywords.length === 0 && artifacts.editing_path) {
+    const extractedTerms = extractKeywords(semanticSeed);
+    // フォールバック: editing_pathからキーワードを抽出
+    if (extractedTerms.phrases.length === 0 &&
+        extractedTerms.keywords.length === 0 &&
+        artifacts.editing_path) {
         const pathSegments = artifacts.editing_path
             .split(/[/_.-]/)
             .map((segment) => segment.toLowerCase())
             .filter((segment) => segment.length >= 3 && !STOP_WORDS.has(segment));
-        keywords = pathSegments.slice(0, MAX_KEYWORDS);
+        extractedTerms.pathSegments.push(...pathSegments.slice(0, MAX_KEYWORDS));
     }
     const candidates = new Map();
     const stringMatchSeeds = new Set();
     const fileCache = new Map();
-    for (const keyword of keywords) {
+    // フレーズマッチング（高い重み: textMatch × 2）- 統合クエリでパフォーマンス改善
+    if (extractedTerms.phrases.length > 0) {
+        const phrasePlaceholders = extractedTerms.phrases
+            .map(() => "b.content ILIKE '%' || ? || '%'")
+            .join(" OR ");
         const rows = await db.all(`
         SELECT f.path, f.lang, f.ext, f.is_binary, b.content, fe.vector_json, fe.dims AS vector_dims
         FROM file f
@@ -670,21 +809,90 @@ export async function contextBundle(context, params) {
          AND fe.path = f.path
         WHERE f.repo_id = ?
           AND f.is_binary = FALSE
-          AND b.content ILIKE '%' || ? || '%'
+          AND (${phrasePlaceholders})
         ORDER BY f.path
         LIMIT ?
-      `, [repoId, keyword, MAX_MATCHES_PER_KEYWORD]);
+      `, [repoId, ...extractedTerms.phrases, MAX_MATCHES_PER_KEYWORD * extractedTerms.phrases.length]);
+        const boostProfile = params.boost_profile ?? "default";
         for (const row of rows) {
             if (row.content === null) {
                 continue;
             }
+            // どのフレーズにマッチしたかをチェック
+            const lowerContent = row.content.toLowerCase();
+            const matchedPhrases = extractedTerms.phrases.filter((phrase) => lowerContent.includes(phrase));
+            if (matchedPhrases.length === 0) {
+                continue; // Should not happen, but defensive check
+            }
             const candidate = ensureCandidate(candidates, row.path);
-            candidate.score += weights.textMatch;
-            candidate.reasons.add(`text:${keyword}`);
-            // Apply boost profile to prioritize/penalize files based on type and location
-            const boostProfile = params.boost_profile ?? "default";
-            applyBoostProfile(candidate, row, boostProfile);
-            const { line } = buildPreview(row.content, keyword);
+            // 各マッチしたフレーズに対してスコアリング
+            for (const phrase of matchedPhrases) {
+                // フレーズマッチは通常の2倍のスコア
+                candidate.score += weights.textMatch * 2.0;
+                candidate.reasons.add(`phrase:${phrase}`);
+            }
+            // Apply boost profile once per file
+            applyBoostProfile(candidate, row, boostProfile, extractedTerms, weights.pathMatch);
+            // Use first matched phrase for preview (guaranteed to exist due to length check above)
+            const { line } = buildPreview(row.content, matchedPhrases[0]);
+            candidate.matchLine =
+                candidate.matchLine === null ? line : Math.min(candidate.matchLine, line);
+            candidate.content ??= row.content;
+            candidate.lang ??= row.lang;
+            candidate.ext ??= row.ext;
+            candidate.totalLines ??= row.content.length === 0 ? 0 : row.content.split(/\r?\n/).length;
+            candidate.embedding ??= parseEmbedding(row.vector_json ?? null, row.vector_dims ?? null);
+            stringMatchSeeds.add(row.path);
+            if (!fileCache.has(row.path)) {
+                fileCache.set(row.path, {
+                    content: row.content,
+                    lang: row.lang,
+                    ext: row.ext,
+                    totalLines: candidate.totalLines ?? 0,
+                    embedding: candidate.embedding,
+                });
+            }
+        }
+    }
+    // キーワードマッチング（通常の重み）- 統合クエリでパフォーマンス改善
+    if (extractedTerms.keywords.length > 0) {
+        const keywordPlaceholders = extractedTerms.keywords
+            .map(() => "b.content ILIKE '%' || ? || '%'")
+            .join(" OR ");
+        const rows = await db.all(`
+        SELECT f.path, f.lang, f.ext, f.is_binary, b.content, fe.vector_json, fe.dims AS vector_dims
+        FROM file f
+        JOIN blob b ON b.hash = f.blob_hash
+        LEFT JOIN file_embedding fe
+          ON fe.repo_id = f.repo_id
+         AND fe.path = f.path
+        WHERE f.repo_id = ?
+          AND f.is_binary = FALSE
+          AND (${keywordPlaceholders})
+        ORDER BY f.path
+        LIMIT ?
+      `, [repoId, ...extractedTerms.keywords, MAX_MATCHES_PER_KEYWORD * extractedTerms.keywords.length]);
+        const boostProfile = params.boost_profile ?? "default";
+        for (const row of rows) {
+            if (row.content === null) {
+                continue;
+            }
+            // どのキーワードにマッチしたかをチェック
+            const lowerContent = row.content.toLowerCase();
+            const matchedKeywords = extractedTerms.keywords.filter((keyword) => lowerContent.includes(keyword));
+            if (matchedKeywords.length === 0) {
+                continue; // Should not happen, but defensive check
+            }
+            const candidate = ensureCandidate(candidates, row.path);
+            // 各マッチしたキーワードに対してスコアリング
+            for (const keyword of matchedKeywords) {
+                candidate.score += weights.textMatch;
+                candidate.reasons.add(`text:${keyword}`);
+            }
+            // Apply boost profile once per file
+            applyBoostProfile(candidate, row, boostProfile, extractedTerms, weights.pathMatch);
+            // Use first matched keyword for preview (guaranteed to exist due to length check above)
+            const { line } = buildPreview(row.content, matchedKeywords[0]);
             candidate.matchLine =
                 candidate.matchLine === null ? line : Math.min(candidate.matchLine, line);
             candidate.content ??= row.content;