@roarpeng/graphflow 1.15.2 → 1.15.4

package/dist/graph/context-slicer.js

@@ -1,435 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_MAX_SIBLING_FILES = exports.DEFAULT_MAX_SYMBOLS_PER_FILE = exports.prepareHitsForPackaging = exports.hasModuleFamilyIntent = exports.expandSiblingDirectoryHits = exports.diversifyHitsBySourceFile = exports.extractFileFromSymbolId = exports.deriveModuleId = exports.modulePathKey = exports.markLayerUsed = exports.canUseLayer = exports.classifyLayer = exports.summarizeNodes = exports.estimateTokens = exports.getEncoder = exports.ARCHITECTURE_QUERY = exports.DEFAULT_EXPANSION_RELATIONS = void 0;
-exports.isPinnedL3Node = isPinnedL3Node;
-exports.expandSubgraph = expandSubgraph;
+exports.DEFAULT_MAX_SIBLING_FILES = exports.DEFAULT_MAX_SYMBOLS_PER_FILE = exports.prepareHitsForPackaging = exports.hasModuleFamilyIntent = exports.expandSiblingDirectoryHits = exports.diversifyHitsBySourceFile = exports.extractFileFromSymbolId = exports.deriveModuleId = exports.modulePathKey = exports.markLayerUsed = exports.canUseLayer = exports.classifyLayer = exports.summarizeNodes = exports.estimateTokens = exports.getEncoder = exports.vectorRecall = exports.expandSubgraph = exports.isPinnedL3Node = exports.ARCHITECTURE_QUERY = exports.DEFAULT_EXPANSION_RELATIONS = void 0;
 exports.buildContextSlice = buildContextSlice;
-exports.vectorRecall = vectorRecall;
 exports.buildLayeredContextPackage = buildLayeredContextPackage;
 exports.createContextRefillManager = createContextRefillManager;
 exports.buildEnhancedContextPackage = buildEnhancedContextPackage;
 const logger_js_1 = require("../utils/logger.js");
-const embeddings_js_1 = require("../learning/embeddings.js");
-const graph_utils_js_1 = require("./graph-utils.js");
-const query_expand_js_1 = require("./query-expand.js");
-const hit_diversify_js_1 = require("./hit-diversify.js");
 const graph_compression_js_1 = require("./graph-compression.js");
 const repo_map_js_1 = require("./repo-map.js");
 const adaptive_budget_js_1 = require("./adaptive-budget.js");
 const symbol_extract_js_1 = require("./symbol-extract.js");
+const context_slicer_utils_js_1 = require("./context-slicer-utils.js");
+const embeddings_js_1 = require("../learning/embeddings.js");
+const context_package_core_js_1 = require("./context-package-core.js");
+Object.defineProperty(exports, "expandSubgraph", { enumerable: true, get: function () { return context_package_core_js_1.expandSubgraph; } });
+Object.defineProperty(exports, "isPinnedL3Node", { enumerable: true, get: function () { return context_package_core_js_1.isPinnedL3Node; } });
+Object.defineProperty(exports, "vectorRecall", { enumerable: true, get: function () { return context_package_core_js_1.vectorRecall; } });
 var context_slicer_types_js_1 = require("./context-slicer-types.js");
 Object.defineProperty(exports, "DEFAULT_EXPANSION_RELATIONS", { enumerable: true, get: function () { return context_slicer_types_js_1.DEFAULT_EXPANSION_RELATIONS; } });
 Object.defineProperty(exports, "ARCHITECTURE_QUERY", { enumerable: true, get: function () { return context_slicer_types_js_1.ARCHITECTURE_QUERY; } });
-const L3_PIN_HINT = /alignment|deviation|goal/i;
-/**
- * Governance pins for L3: Decision/goal nodes that packing must prefer so
- * budget truncation cannot drop alignment / deviation / goal constraints.
- */
-function isPinnedL3Node(node) {
-    if (node.id.startsWith("goal:")) {
-        return true;
-    }
-    if (node.type !== "Decision") {
-        return false;
-    }
-    if (L3_PIN_HINT.test(node.content)) {
-        return true;
-    }
-    if (node.metadata && L3_PIN_HINT.test(JSON.stringify(node.metadata))) {
-        return true;
-    }
-    return false;
-}
-function collectPinnedL3Nodes(ranked, snapshotNodes, added) {
-    const pins = [];
-    const seen = new Set();
-    const consider = (node) => {
-        if (added.has(node.id) || seen.has(node.id) || !isPinnedL3Node(node)) {
-            return;
-        }
-        seen.add(node.id);
-        pins.push(node);
-    };
-    for (const node of ranked)
-        consider(node);
-    if (snapshotNodes) {
-        for (const node of snapshotNodes)
-            consider(node);
-    }
-    return pins;
-}
-function tryAppendL3Node(node, ctx, acc) {
-    if (ctx.maxAnchors !== undefined && ctx.anchorChannel.length >= ctx.maxAnchors) {
-        return "skip";
-    }
-    if (ctx.added.has(node.id)) {
-        return "skip";
-    }
-    if (!(0, context_slicer_utils_js_2.canUseLayer)("L3", ctx.quota, ctx.used)) {
-        return "skip";
-    }
-    const summary = `${node.type}: ${node.content}`;
-    const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-    if (acc.tokens + estimate > ctx.maxTokens) {
-        acc.truncated = true;
-        return "budget";
-    }
-    ctx.summaryChannel.push(summary);
-    ctx.anchorChannel.push({ id: node.id, type: node.type, layer: "L3" });
-    ctx.added.add(node.id);
-    acc.tokens += estimate;
-    (0, context_slicer_utils_js_2.markLayerUsed)("L3", ctx.used);
-    return "packed";
-}
-// ───────────────── Conversation Graph W2a: dialogue nodes in L3 packing ─────────────────
-/** Max matched dialogue turns packed per preview (after effective-turns filter). */
-const DIALOGUE_PACK_MAX_TURNS = 3;
-/**
- * Collect dialogue-turn context for a query (Conversation Graph W2a).
- *
- * - Matches effective (non-superseded) turns whose query/title/summary tokens
- *   overlap the search tokens; never within the same recording session id
- *   chain — matched turns are historical Q&A, including other sessions.
- * - Each packed turn carries an optional correction annotation when the
- *   turn itself supersedes an earlier one ("结论 X 已被修正为 Y").
- * - Falls back to [] on any failure — dialogue packing is additive.
- */
-async function collectDialogueContextLines(client, query, options) {
-    try {
-        const { listDialogueTurns, effectiveTurns, formatSupersessionLine } = await import("../learning/dialogue-thread.js");
-        const allTurns = await listDialogueTurns(client, { limit: 60 });
-        const turns = effectiveTurns(allTurns);
-        if (turns.length === 0)
-            return [];
-        const scoreTokens = (0, graph_utils_js_1.buildSearchScoreTokens)(query, options?.englishQuery);
-        if (scoreTokens.length === 0)
-            return [];
-        const tokenSet = new Set(scoreTokens.map((t) => t.toLowerCase()));
-        const scored = turns
-            .map((turn) => {
-            const haystack = `${turn.userQuery} ${turn.title ?? ""} ${turn.summary ?? ""}`.toLowerCase();
-            let hits = 0;
-            for (const token of tokenSet) {
-                if (haystack.includes(token))
-                    hits += 1;
-            }
-            return { turn, hits };
-        })
-            .filter((s) => s.hits > 0)
-            .sort((a, b) => b.hits - a.hits || b.turn.updatedAt - a.turn.updatedAt)
-            .slice(0, DIALOGUE_PACK_MAX_TURNS);
-        if (scored.length === 0)
-            return [];
-        // Correction chain lookup uses ALL turns (the superseded one is off the
-        // effective list by design — we need it to render "was corrected").
-        const byId = new Map(allTurns.map((t) => [t.id, t]));
-        const lines = [];
-        for (const { turn } of scored) {
-            const correctionTargets = (turn.supersedesTurnIds ?? [])
-                .map((id) => byId.get(id))
-                .filter((t) => Boolean(t));
-            const correctionLine = correctionTargets.length > 0
-                ? formatSupersessionLine(correctionTargets[correctionTargets.length - 1], turn)
-                : undefined;
-            lines.push({
-                kind: "turn",
-                text: turn.title ?? turn.userQuery,
-                node: {
-                    id: turn.id,
-                    type: "Decision",
-                    content: `dialogue-turn #${turn.seq} Q: ${turn.userQuery}`,
-                    metadata: { kind: "dialogue-turn", record: JSON.stringify(turn) },
-                },
-                ...(correctionLine ? { correctionLine } : {}),
-            });
-        }
-        return lines;
-    }
-    catch {
-        return [];
-    }
-}
 // Re-export utility functions that were previously exported
-var context_slicer_utils_js_1 = require("./context-slicer-utils.js");
-Object.defineProperty(exports, "getEncoder", { enumerable: true, get: function () { return context_slicer_utils_js_1.getEncoder; } });
-Object.defineProperty(exports, "estimateTokens", { enumerable: true, get: function () { return context_slicer_utils_js_1.estimateTokens; } });
-Object.defineProperty(exports, "summarizeNodes", { enumerable: true, get: function () { return context_slicer_utils_js_1.summarizeNodes; } });
-Object.defineProperty(exports, "classifyLayer", { enumerable: true, get: function () { return context_slicer_utils_js_1.classifyLayer; } });
-Object.defineProperty(exports, "canUseLayer", { enumerable: true, get: function () { return context_slicer_utils_js_1.canUseLayer; } });
-Object.defineProperty(exports, "markLayerUsed", { enumerable: true, get: function () { return context_slicer_utils_js_1.markLayerUsed; } });
-Object.defineProperty(exports, "modulePathKey", { enumerable: true, get: function () { return context_slicer_utils_js_1.modulePathKey; } });
-Object.defineProperty(exports, "deriveModuleId", { enumerable: true, get: function () { return context_slicer_utils_js_1.deriveModuleId; } });
-Object.defineProperty(exports, "extractFileFromSymbolId", { enumerable: true, get: function () { return context_slicer_utils_js_1.extractFileFromSymbolId; } });
-var hit_diversify_js_2 = require("./hit-diversify.js");
-Object.defineProperty(exports, "diversifyHitsBySourceFile", { enumerable: true, get: function () { return hit_diversify_js_2.diversifyHitsBySourceFile; } });
-Object.defineProperty(exports, "expandSiblingDirectoryHits", { enumerable: true, get: function () { return hit_diversify_js_2.expandSiblingDirectoryHits; } });
-Object.defineProperty(exports, "hasModuleFamilyIntent", { enumerable: true, get: function () { return hit_diversify_js_2.hasModuleFamilyIntent; } });
-Object.defineProperty(exports, "prepareHitsForPackaging", { enumerable: true, get: function () { return hit_diversify_js_2.prepareHitsForPackaging; } });
-Object.defineProperty(exports, "DEFAULT_MAX_SYMBOLS_PER_FILE", { enumerable: true, get: function () { return hit_diversify_js_2.DEFAULT_MAX_SYMBOLS_PER_FILE; } });
-Object.defineProperty(exports, "DEFAULT_MAX_SIBLING_FILES", { enumerable: true, get: function () { return hit_diversify_js_2.DEFAULT_MAX_SIBLING_FILES; } });
-// Import internal helpers (not re-exported)
-const context_slicer_utils_js_2 = require("./context-slicer-utils.js");
-const context_slicer_types_js_2 = require("./context-slicer-types.js");
-async function expandSubgraph(client, seedIds, options) {
-    if (typeof client.getNeighbors !== "function")
-        return [];
-    const hops = options?.hops ?? 1;
-    const maxNodes = options?.maxNodes ?? 20;
-    const relations = options?.relations ?? context_slicer_types_js_2.DEFAULT_EXPANSION_RELATIONS;
-    const excluded = new Set(seedIds);
-    const collected = new Map();
-    let frontier = [...seedIds];
-    for (let depth = 0; depth < hops; depth += 1) {
-        if (frontier.length === 0)
-            break;
-        const neighbors = await client.getNeighbors(frontier, relations, "both");
-        const nextFrontier = [];
-        for (const { node } of neighbors) {
-            if (excluded.has(node.id) || collected.has(node.id))
-                continue;
-            collected.set(node.id, node);
-            nextFrontier.push(node.id);
-            if (collected.size >= maxNodes)
-                break;
-        }
-        if (collected.size >= maxNodes)
-            break;
-        frontier = nextFrontier;
-    }
-    return Array.from(collected.values());
-}
+var context_slicer_utils_js_2 = require("./context-slicer-utils.js");
+Object.defineProperty(exports, "getEncoder", { enumerable: true, get: function () { return context_slicer_utils_js_2.getEncoder; } });
+Object.defineProperty(exports, "estimateTokens", { enumerable: true, get: function () { return context_slicer_utils_js_2.estimateTokens; } });
+Object.defineProperty(exports, "summarizeNodes", { enumerable: true, get: function () { return context_slicer_utils_js_2.summarizeNodes; } });
+Object.defineProperty(exports, "classifyLayer", { enumerable: true, get: function () { return context_slicer_utils_js_2.classifyLayer; } });
+Object.defineProperty(exports, "canUseLayer", { enumerable: true, get: function () { return context_slicer_utils_js_2.canUseLayer; } });
+Object.defineProperty(exports, "markLayerUsed", { enumerable: true, get: function () { return context_slicer_utils_js_2.markLayerUsed; } });
+Object.defineProperty(exports, "modulePathKey", { enumerable: true, get: function () { return context_slicer_utils_js_2.modulePathKey; } });
+Object.defineProperty(exports, "deriveModuleId", { enumerable: true, get: function () { return context_slicer_utils_js_2.deriveModuleId; } });
+Object.defineProperty(exports, "extractFileFromSymbolId", { enumerable: true, get: function () { return context_slicer_utils_js_2.extractFileFromSymbolId; } });
+var hit_diversify_js_1 = require("./hit-diversify.js");
+Object.defineProperty(exports, "diversifyHitsBySourceFile", { enumerable: true, get: function () { return hit_diversify_js_1.diversifyHitsBySourceFile; } });
+Object.defineProperty(exports, "expandSiblingDirectoryHits", { enumerable: true, get: function () { return hit_diversify_js_1.expandSiblingDirectoryHits; } });
+Object.defineProperty(exports, "hasModuleFamilyIntent", { enumerable: true, get: function () { return hit_diversify_js_1.hasModuleFamilyIntent; } });
+Object.defineProperty(exports, "prepareHitsForPackaging", { enumerable: true, get: function () { return hit_diversify_js_1.prepareHitsForPackaging; } });
+Object.defineProperty(exports, "DEFAULT_MAX_SYMBOLS_PER_FILE", { enumerable: true, get: function () { return hit_diversify_js_1.DEFAULT_MAX_SYMBOLS_PER_FILE; } });
+Object.defineProperty(exports, "DEFAULT_MAX_SIBLING_FILES", { enumerable: true, get: function () { return hit_diversify_js_1.DEFAULT_MAX_SIBLING_FILES; } });
 async function buildContextSlice(client, query, maxTokens) {
     const pkg = await buildLayeredContextPackage(client, query, maxTokens);
     return { items: pkg.summaryChannel, tokenEstimate: pkg.tokenEstimate };
 }
-function vectorRecall(nodes, queryEmbedding, topK, minSimilarity) {
-    if (!queryEmbedding || queryEmbedding.length === 0)
-        return [];
-    const scored = [];
-    for (const node of nodes) {
-        const emb = (0, embeddings_js_1.extractEmbedding)(node);
-        if (!emb)
-            continue;
-        const sim = (0, embeddings_js_1.cosineSimilarity)(queryEmbedding, emb);
-        if (sim >= minSimilarity)
-            scored.push({ node, sim });
-    }
-    scored.sort((a, b) => b.sim - a.sim);
-    return scored.slice(0, topK).map((s) => s.node);
-}
-function collectVectorRecallCandidates(client, keywordHits, enableFullGraphVectorRecall) {
-    if (!enableFullGraphVectorRecall) {
-        return keywordHits;
-    }
-    const byId = new Map();
-    for (const hit of keywordHits) {
-        if ((0, embeddings_js_1.extractEmbedding)(hit)) {
-            byId.set(hit.id, hit);
-        }
-    }
-    const snapshot = client.readSnapshot?.();
-    if (!snapshot) {
-        return keywordHits;
-    }
-    for (const node of snapshot.nodes) {
-        if ((0, embeddings_js_1.extractEmbedding)(node)) {
-            byId.set(node.id, node);
-        }
-    }
-    return byId.size > 0 ? Array.from(byId.values()) : keywordHits;
-}
-async function hnswVectorRecall(nodes, queryEmbedding, topK, minSimilarity, hnswIndexPath) {
-    // Memoized per-process + optional disk-persisted index: avoids re-extracting
-    // embeddings for every query and speeds up MCP server restarts.
-    const { getSharedVectorIndex } = await import("../learning/hnsw-index.js");
-    const { index } = getSharedVectorIndex(nodes, hnswIndexPath);
-    const results = await index.search(queryEmbedding, topK, minSimilarity);
-    return results.map((result) => result.node);
-}
 async function buildLayeredContextPackage(client, query, maxTokens, options) {
-    const keywordHits = await (0, query_expand_js_1.collectExpandedKeywordHits)(client, query, options?.workspaceRoot, options?.englishQuery);
+    const keywordHits = await (0, context_package_core_js_1.collectKeywordHits)(client, query, options);
     let hits = keywordHits;
-    if (options?.enableVectorRecall === true && options.embeddingProvider) {
-        try {
-            const queryEmbedding = await options.embeddingProvider.embed(query);
-            const topK = options.vectorTopK ?? 8;
-            const minSim = options.vectorMinSimilarity ?? 0.05;
-            const vectorCandidates = collectVectorRecallCandidates(client, keywordHits, options.enableFullGraphVectorRecall === true);
-            const vectorHits = await hnswVectorRecall(vectorCandidates, queryEmbedding, topK, minSim, options?.hnswIndexPath);
-            hits = (0, embeddings_js_1.reciprocalRankFusion)([keywordHits, vectorHits]);
-        }
-        catch (error) {
-            logger_js_1.logger.warn({ error }, "Vector recall failed in buildLayeredContextPackage");
-            hits = keywordHits;
-        }
+    const fused = await (0, context_package_core_js_1.fuseVectorRecallIfEnabled)(client, query, keywordHits, options, "buildLayeredContextPackage");
+    if (fused) {
+        hits = fused;
     }
     const snapshotNodes = client.readSnapshot?.()?.nodes;
-    hits = (0, hit_diversify_js_1.prepareHitsForPackaging)(hits, {
-        query,
-        ...(options?.englishQuery !== undefined ? { englishQuery: options.englishQuery } : {}),
-        ...(snapshotNodes !== undefined ? { allNodes: snapshotNodes } : {}),
-    });
-    const summaryChannel = [];
-    const anchorChannel = [];
-    let tokens = 0;
-    let truncated = false;
-    const quota = {
-        l1: options?.layerQuota?.l1 ?? Number.POSITIVE_INFINITY,
-        l2: options?.layerQuota?.l2 ?? Number.POSITIVE_INFINITY,
-        l3: options?.layerQuota?.l3 ?? Number.POSITIVE_INFINITY,
-    };
-    const used = { l1: 0, l2: 0, l3: 0 };
-    const added = new Set();
-    const hitById = new Map();
-    for (const hit of hits) {
-        hitById.set(hit.id, hit);
-        const layer = (0, context_slicer_utils_js_2.classifyLayer)(hit);
-        if (!(0, context_slicer_utils_js_2.canUseLayer)(layer, quota, used)) {
-            continue;
-        }
-        const summary = `${hit.type}: ${hit.content}`;
-        const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-        if (tokens + estimate > maxTokens) {
-            truncated = true;
-            break;
-        }
-        summaryChannel.push(summary);
-        anchorChannel.push({ id: hit.id, type: hit.type, layer });
-        added.add(hit.id);
-        tokens += estimate;
-        (0, context_slicer_utils_js_2.markLayerUsed)(layer, used);
-    }
-    if (!truncated) {
-        const moduleIds = new Set();
-        for (const anchor of anchorChannel) {
-            if (anchor.layer !== "L1" || (anchor.type !== "File" && anchor.type !== "Symbol")) {
-                continue;
-            }
-            const moduleId = (0, context_slicer_utils_js_2.deriveModuleId)(anchor, hitById.get(anchor.id));
-            if (moduleId) {
-                moduleIds.add(moduleId);
-            }
-        }
-        let moduleNodes = [];
-        if (moduleIds.size > 0 && typeof client.getNodesByIds === "function") {
-            moduleNodes = await client.getNodesByIds(Array.from(moduleIds));
-        }
-        for (const moduleId of moduleIds) {
-            if (added.has(moduleId))
-                continue;
-            if (!(0, context_slicer_utils_js_2.canUseLayer)("L2", quota, used))
-                break;
-            const node = moduleNodes.find((n) => n.id === moduleId) ??
-                ({ id: moduleId, type: "Module", content: moduleId.slice("module:".length) });
-            const summary = `${node.type}: ${node.content}`;
-            const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-            if (tokens + estimate > maxTokens) {
-                truncated = true;
-                break;
-            }
-            summaryChannel.push(summary);
-            anchorChannel.push({ id: node.id, type: node.type, layer: "L2" });
-            added.add(node.id);
-            tokens += estimate;
-            (0, context_slicer_utils_js_2.markLayerUsed)("L2", used);
-        }
-    }
-    const archIntent = context_slicer_types_js_2.ARCHITECTURE_QUERY.test((0, graph_utils_js_1.composeContextQuery)(query, options?.englishQuery));
-    if (options?.enableAlwaysOnLayers || archIntent) {
-        const l3Candidates = (0, graph_utils_js_1.rankNodesForContextQuery)((await client.queryByKeyword(query)).filter((n) => n.type === "Skill" || n.type === "Decision"), query, {
-            scoreTokens: (0, graph_utils_js_1.buildSearchScoreTokens)(query, options?.englishQuery),
-            matchQueries: options?.englishQuery?.trim()
-                ? [query, options.englishQuery.trim()]
-                : [query],
-            ...(options?.englishQuery !== undefined ? { englishQuery: options.englishQuery } : {}),
-        });
-        const snapshotForPins = client.readSnapshot?.()?.nodes;
-        const acc = { tokens, truncated };
-        const packCtx = { summaryChannel, anchorChannel, added, quota, used, maxTokens };
-        const pins = collectPinnedL3Nodes(l3Candidates, snapshotForPins, added);
-        for (const node of pins) {
-            if (tryAppendL3Node(node, packCtx, acc) === "budget")
-                break;
-        }
-        tokens = acc.tokens;
-        truncated = acc.truncated;
-        if (!truncated) {
-            let l3Added = pins.filter((n) => added.has(n.id)).length;
-            for (const node of l3Candidates) {
-                if (l3Added >= 2)
-                    break;
-                if (isPinnedL3Node(node))
-                    continue;
-                const result = tryAppendL3Node(node, packCtx, acc);
-                if (result === "budget")
-                    break;
-                if (result === "packed")
-                    l3Added += 1;
-            }
-            tokens = acc.tokens;
-            truncated = acc.truncated;
-        }
-    }
-    // Conversation Graph W2a: pack matched dialogue turns (effective ones plus
-    // a correction-chain annotation) under the same L3 quota + token budget as
-    // every other node — dialogue anchors are never exempt from budgeting.
-    if (!truncated) {
-        const dialogueAcc = { tokens, truncated };
-        const dialoguePackCtx = { summaryChannel, anchorChannel, added, quota, used, maxTokens };
-        const dialogueLines = await collectDialogueContextLines(client, query, options);
-        for (const line of dialogueLines) {
-            if (line.kind === "summary") {
-                const estimate = (0, context_slicer_utils_js_2.estimateTokens)(line.text);
-                if (dialogueAcc.tokens + estimate > maxTokens) {
-                    dialogueAcc.truncated = true;
-                    break;
-                }
-                dialogueAcc.tokens += estimate;
-            }
-            else if (line.kind === "turn" && line.node) {
-                if (tryAppendL3Node(line.node, dialoguePackCtx, dialogueAcc) === "budget") {
-                    break;
-                }
-                if (line.correctionLine) {
-                    const estimate = (0, context_slicer_utils_js_2.estimateTokens)(line.correctionLine);
-                    if (dialogueAcc.tokens + estimate > maxTokens) {
-                        dialogueAcc.truncated = true;
-                        break;
-                    }
-                    dialoguePackCtx.summaryChannel.push(line.correctionLine);
-                    dialogueAcc.tokens += estimate;
-                }
-            }
-        }
-        tokens = dialogueAcc.tokens;
-        truncated = dialogueAcc.truncated;
-    }
-    const enableExpansion = options?.enableEdgeExpansion !== false;
-    if (enableExpansion && !truncated && typeof client.getNeighbors === "function") {
-        const seedIds = anchorChannel.slice(0, 5).map((a) => a.id);
-        if (seedIds.length > 0) {
-            const expanded = await expandSubgraph(client, seedIds, { hops: 1 });
-            for (const node of expanded) {
-                if (added.has(node.id))
-                    continue;
-                const layer = (0, context_slicer_utils_js_2.classifyLayer)(node);
-                if (!(0, context_slicer_utils_js_2.canUseLayer)(layer, quota, used))
-                    continue;
-                const summary = `${node.type}: ${node.content}`;
-                const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-                if (tokens + estimate > maxTokens) {
-                    truncated = true;
-                    break;
-                }
-                summaryChannel.push(summary);
-                anchorChannel.push({ id: node.id, type: node.type, layer });
-                added.add(node.id);
-                tokens += estimate;
-                (0, context_slicer_utils_js_2.markLayerUsed)(layer, used);
-            }
-        }
-    }
-    return { summaryChannel, anchorChannel, tokenEstimate: tokens, truncated };
+    hits = (0, context_package_core_js_1.preparePackageHits)(hits, query, options, snapshotNodes);
+    const state = (0, context_package_core_js_1.createPackState)(maxTokens, options);
+    const budget = { tokens: 0, truncated: false };
+    (0, context_package_core_js_1.packPrimaryHits)(hits, state, budget);
+    await (0, context_package_core_js_1.injectL2Modules)(client, hits, state, budget, "continue");
+    await (0, context_package_core_js_1.injectL3SkillsAndPins)(client, query, options, snapshotNodes, state, budget);
+    await (0, context_package_core_js_1.injectDialogueTurns)(client, query, options, state, budget);
+    await (0, context_package_core_js_1.injectNeighborExpansion)(client, options, state, budget);
+    return (0, context_package_core_js_1.toLayeredPackage)(state, budget);
 }
 function createContextRefillManager(client, maxTokens, options) {
     const seenAnchors = new Set();
@@ -451,7 +79,7 @@ function createContextRefillManager(client, maxTokens, options) {
                         continue;
                     }
                     const line = `${hit.id} | ${hit.type}: ${hit.content}`;
-                    const estimate = (0, context_slicer_utils_js_2.estimateTokens)(line);
+                    const estimate = (0, context_slicer_utils_js_1.estimateTokens)(line);
                     if (tokens + estimate > maxTokens) {
                         return items;
                     }
@@ -474,6 +102,8 @@ function createContextRefillManager(client, maxTokens, options) {
  *   3. Graph compression: connected subgraph + PageRank re-ranking
  *   4. Layer quotas + token budgeting
  *   5. Edge expansion
+ *
+ * Shared recall/pack steps live in `context-package-core` (same as layered).
  */
 async function buildEnhancedContextPackage(client, query, task, maxTokens, options) {
     // Step 0: Adaptive budget estimation.
@@ -487,7 +117,7 @@ async function buildEnhancedContextPackage(client, query, task, maxTokens, optio
         try {
             const repoMap = await (0, repo_map_js_1.buildRepoMap)(client);
             const mapStr = (0, repo_map_js_1.formatRepoMapString)(repoMap);
-            const tokens = (0, context_slicer_utils_js_2.estimateTokens)(mapStr);
+            const tokens = (0, context_slicer_utils_js_1.estimateTokens)(mapStr);
             if (tokens < maxTokens) {
                 return {
                     summaryChannel: [mapStr],
@@ -502,7 +132,7 @@ async function buildEnhancedContextPackage(client, query, task, maxTokens, optio
         }
     }
     // Step 2: Keyword retrieval (CJK-aware multi-query RRF when workspaceRoot is set).
-    const keywordHits = await (0, query_expand_js_1.collectExpandedKeywordHits)(client, query, options?.workspaceRoot, options?.englishQuery);
+    const keywordHits = await (0, context_package_core_js_1.collectKeywordHits)(client, query, options);
     let hits = keywordHits;
     // Step 2b: Symbol-aware boosting — extract camelCase/PascalCase tokens from
     // the task description and fetch matching symbol nodes to improve recall.
@@ -513,19 +143,9 @@ async function buildEnhancedContextPackage(client, query, task, maxTokens, optio
             hits = (0, embeddings_js_1.reciprocalRankFusion)([hits, symbolHits]);
         }
     }
-    if (options?.enableVectorRecall === true && options.embeddingProvider) {
-        try {
-            const queryEmbedding = await options.embeddingProvider.embed(query);
-            const topK = options.vectorTopK ?? 8;
-            const minSim = options.vectorMinSimilarity ?? 0.05;
-            const vectorCandidates = collectVectorRecallCandidates(client, keywordHits, options.enableFullGraphVectorRecall === true);
-            const vectorHits = await hnswVectorRecall(vectorCandidates, queryEmbedding, topK, minSim, options?.hnswIndexPath);
-            hits = (0, embeddings_js_1.reciprocalRankFusion)([keywordHits, vectorHits]);
-        }
-        catch (error) {
-            logger_js_1.logger.warn({ error }, "Vector recall failed in buildEnhancedContextPackage");
-            hits = keywordHits;
-        }
+    const fused = await (0, context_package_core_js_1.fuseVectorRecallIfEnabled)(client, query, keywordHits, options, "buildEnhancedContextPackage");
+    if (fused) {
+        hits = fused;
     }
     if (options?.enableGraphCompression && hits.length > 0) {
         try {
@@ -544,217 +164,15 @@ async function buildEnhancedContextPackage(client, query, task, maxTokens, optio
         }
     }
     const snapshotNodes = client.readSnapshot?.()?.nodes;
-    hits = (0, hit_diversify_js_1.prepareHitsForPackaging)(hits, {
-        query,
-        ...(options?.englishQuery !== undefined ? { englishQuery: options.englishQuery } : {}),
-        ...(snapshotNodes !== undefined ? { allNodes: snapshotNodes } : {}),
-    });
-    // Step 4: Build layered package with anchor cap.
+    hits = (0, context_package_core_js_1.preparePackageHits)(hits, query, options, snapshotNodes);
     const maxAnchors = options?.maxAnchors ?? 15;
-    const summaryChannel = [];
-    const anchorChannel = [];
-    let tokens = 0;
-    let truncated = false;
-    const quota = {
-        l1: options?.layerQuota?.l1 ?? Number.POSITIVE_INFINITY,
-        l2: options?.layerQuota?.l2 ?? Number.POSITIVE_INFINITY,
-        l3: options?.layerQuota?.l3 ?? Number.POSITIVE_INFINITY,
-    };
-    const used = { l1: 0, l2: 0, l3: 0 };
-    const added = new Set();
-    const hitById = new Map();
-    for (const hit of hits)
-        hitById.set(hit.id, hit);
-    for (const hit of hits) {
-        if (anchorChannel.length >= maxAnchors) {
-            truncated = true;
-            break;
-        }
-        const layer = (0, context_slicer_utils_js_2.classifyLayer)(hit);
-        if (!(0, context_slicer_utils_js_2.canUseLayer)(layer, quota, used))
-            continue;
-        const summary = `${hit.type}: ${hit.content}`;
-        const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-        if (tokens + estimate > maxTokens) {
-            truncated = true;
-            break;
-        }
-        summaryChannel.push(summary);
-        anchorChannel.push({ id: hit.id, type: hit.type, layer });
-        added.add(hit.id);
-        tokens += estimate;
-        (0, context_slicer_utils_js_2.markLayerUsed)(layer, used);
-    }
-    // Step 4b: L2 module injection — aggregate file/symbol hits into module overviews.
-    if (!truncated && anchorChannel.length < maxAnchors) {
-        const moduleIds = new Set();
-        for (const anchor of anchorChannel) {
-            if (anchor.layer !== "L1" || (anchor.type !== "File" && anchor.type !== "Symbol"))
-                continue;
-            const moduleId = (0, context_slicer_utils_js_2.deriveModuleId)(anchor, hitById.get(anchor.id));
-            if (moduleId)
-                moduleIds.add(moduleId);
-        }
-        let moduleNodes = [];
-        if (moduleIds.size > 0 && typeof client.getNodesByIds === "function") {
-            moduleNodes = await client.getNodesByIds(Array.from(moduleIds));
-        }
-        for (const moduleId of moduleIds) {
-            if (added.has(moduleId) || anchorChannel.length >= maxAnchors)
-                break;
-            if (!(0, context_slicer_utils_js_2.canUseLayer)("L2", quota, used))
-                break;
-            const node = moduleNodes.find((n) => n.id === moduleId) ??
-                ({ id: moduleId, type: "Module", content: moduleId.slice("module:".length) });
-            const summary = `${node.type}: ${node.content}`;
-            const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-            if (tokens + estimate > maxTokens) {
-                truncated = true;
-                break;
-            }
-            summaryChannel.push(summary);
-            anchorChannel.push({ id: node.id, type: node.type, layer: "L2" });
-            added.add(node.id);
-            tokens += estimate;
-            (0, context_slicer_utils_js_2.markLayerUsed)("L2", used);
-        }
-    }
-    // Step 4c: L3 skill/decision injection — always-on when enableAlwaysOnLayers,
-    // otherwise only for architecture queries. Pin goal/alignment/deviation
-    // Decision nodes first so budget truncation cannot drop them.
-    const archIntent = context_slicer_types_js_2.ARCHITECTURE_QUERY.test((0, graph_utils_js_1.composeContextQuery)(query, options?.englishQuery));
-    if (anchorChannel.length < maxAnchors && (options?.enableAlwaysOnLayers || archIntent)) {
-        const l3Candidates = (0, graph_utils_js_1.rankNodesForContextQuery)((await client.queryByKeyword(query)).filter((n) => n.type === "Skill" || n.type === "Decision"), query, {
-            scoreTokens: (0, graph_utils_js_1.buildSearchScoreTokens)(query, options?.englishQuery),
-            matchQueries: options?.englishQuery?.trim()
-                ? [query, options.englishQuery.trim()]
-                : [query],
-            ...(options?.englishQuery !== undefined ? { englishQuery: options.englishQuery } : {}),
-        });
-        const acc = { tokens, truncated };
-        const packCtx = {
-            summaryChannel,
-            anchorChannel,
-            added,
-            quota,
-            used,
-            maxTokens,
-            maxAnchors,
-        };
-        const pins = collectPinnedL3Nodes(l3Candidates, snapshotNodes, added);
-        for (const node of pins) {
-            if (tryAppendL3Node(node, packCtx, acc) === "budget")
-                break;
-        }
-        tokens = acc.tokens;
-        truncated = acc.truncated;
-        if (!truncated) {
-            let l3Added = pins.filter((n) => added.has(n.id)).length;
-            for (const node of l3Candidates) {
-                if (l3Added >= 2 || anchorChannel.length >= maxAnchors)
-                    break;
-                if (isPinnedL3Node(node))
-                    continue;
-                const result = tryAppendL3Node(node, packCtx, acc);
-                if (result === "budget")
-                    break;
-                if (result === "packed")
-                    l3Added += 1;
-            }
-            tokens = acc.tokens;
-            truncated = acc.truncated;
-        }
-    }
-    // Step 5: Import-based multi-hop expansion + same-file symbol boosting.
-    // Find files that import the anchored files, AND add symbols from anchored
-    // files to improve symbol-level recall.
-    if (!truncated && anchorChannel.length < maxAnchors) {
-        const seedFilePaths = [];
-        for (const anchor of anchorChannel) {
-            if (anchor.type === "File" && anchor.id.startsWith("file:")) {
-                seedFilePaths.push(anchor.id.slice("file:".length));
-            }
-            else if (anchor.type === "Symbol") {
-                const fp = (0, context_slicer_utils_js_2.extractFileFromSymbolId)(anchor.id);
-                if (fp)
-                    seedFilePaths.push(fp);
-            }
-        }
-        // 5a: Same-file symbol boosting — add symbols from anchored files
-        if (seedFilePaths.length > 0 && snapshotNodes) {
-            for (const node of snapshotNodes) {
-                if (added.has(node.id) || anchorChannel.length >= maxAnchors)
-                    continue;
-                if (node.type !== "Symbol")
-                    continue;
-                const nodeFile = (0, context_slicer_utils_js_2.extractFileFromSymbolId)(node.id);
-                if (!nodeFile)
-                    continue;
-                const inSeedFile = seedFilePaths.some(sp => nodeFile.includes(sp.replace(/\.(ts|tsx|js|jsx|py|go|rs)$/, "")) ||
-                    sp.replace(/\.(ts|tsx|js|jsx|py|go|rs)$/, "").includes(nodeFile.replace(/\.(ts|tsx|js|jsx|py|go|rs)$/, "")));
-                if (!inSeedFile)
-                    continue;
-                const layer = (0, context_slicer_utils_js_2.classifyLayer)(node);
-                const summary = `${node.type}: ${node.content}`;
-                const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-                if (tokens + estimate > maxTokens) {
-                    truncated = true;
-                    break;
-                }
-                summaryChannel.push(summary);
-                anchorChannel.push({ id: node.id, type: node.type, layer });
-                added.add(node.id);
-                tokens += estimate;
-                (0, context_slicer_utils_js_2.markLayerUsed)(layer, used);
-            }
-        }
-        // 5b: Import-based expansion
-        if (seedFilePaths.length > 0 && anchorChannel.length < maxAnchors) {
-            const importHits = await (0, symbol_extract_js_1.collectImportRelatedFiles)(client, seedFilePaths, 5);
-            for (const node of importHits) {
-                if (added.has(node.id) || anchorChannel.length >= maxAnchors)
-                    continue;
-                const layer = (0, context_slicer_utils_js_2.classifyLayer)(node);
-                const summary = `${node.type}: ${node.content}`;
-                const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-                if (tokens + estimate > maxTokens) {
-                    truncated = true;
-                    break;
-                }
-                summaryChannel.push(summary);
-                anchorChannel.push({ id: node.id, type: node.type, layer });
-                added.add(node.id);
-                tokens += estimate;
-                (0, context_slicer_utils_js_2.markLayerUsed)(layer, used);
-            }
-        }
-    }
-    // Step 6: Edge expansion (respects anchor cap).
-    const enableExpansion = options?.enableEdgeExpansion !== false;
-    if (enableExpansion && !truncated && anchorChannel.length < maxAnchors && typeof client.getNeighbors === "function") {
-        const seedIds = anchorChannel.slice(0, 5).map((a) => a.id);
-        if (seedIds.length > 0) {
-            const expanded = await expandSubgraph(client, seedIds, { hops: 1 });
-            for (const node of expanded) {
-                if (added.has(node.id) || anchorChannel.length >= maxAnchors)
-                    continue;
-                const layer = (0, context_slicer_utils_js_2.classifyLayer)(node);
-                if (!(0, context_slicer_utils_js_2.canUseLayer)(layer, quota, used))
-                    continue;
-                const summary = `${node.type}: ${node.content}`;
-                const estimate = (0, context_slicer_utils_js_2.estimateTokens)(summary);
-                if (tokens + estimate > maxTokens) {
-                    truncated = true;
-                    break;
-                }
-                summaryChannel.push(summary);
-                anchorChannel.push({ id: node.id, type: node.type, layer });
-                added.add(node.id);
-                tokens += estimate;
-                (0, context_slicer_utils_js_2.markLayerUsed)(layer, used);
-            }
-        }
-    }
-    return { summaryChannel, anchorChannel, tokenEstimate: tokens, truncated };
+    const state = (0, context_package_core_js_1.createPackState)(maxTokens, options, maxAnchors);
+    const budget = { tokens: 0, truncated: false };
+    (0, context_package_core_js_1.packPrimaryHits)(hits, state, budget);
+    await (0, context_package_core_js_1.injectL2Modules)(client, hits, state, budget, "break");
+    await (0, context_package_core_js_1.injectL3SkillsAndPins)(client, query, options, snapshotNodes, state, budget);
+    await (0, context_package_core_js_1.injectSameFileAndImportExpansion)(client, snapshotNodes, state, budget);
+    await (0, context_package_core_js_1.injectNeighborExpansion)(client, options, state, budget);
+    return (0, context_package_core_js_1.toLayeredPackage)(state, budget);
 }
 //# sourceMappingURL=context-slicer.js.map