@devflow-tools/context-engine 0.9.0 → 0.11.0

package/dist/claude-rerank.d.ts

@@ -0,0 +1,15 @@
+import type { LLMClient } from '@devflow-tools/sdk';
+export interface RerankCandidate {
+    id: string;
+    name: string;
+    snippet: string;
+    file?: string;
+    score?: number;
+}
+export declare function setRerankLLMClient(client: LLMClient): void;
+export declare function isRerankAvailable(): boolean;
+export declare function claudeRerank(query: string, candidates: RerankCandidate[], options?: {
+    topK?: number;
+    model?: string;
+}): Promise<RerankCandidate[]>;
+//# sourceMappingURL=claude-rerank.d.ts.map

package/dist/claude-rerank.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-rerank.d.ts","sourceRoot":"","sources":["../src/claude-rerank.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAKpD,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AASD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAE1D;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAwCD,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,eAAe,EAAE,EAC7B,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1C,OAAO,CAAC,eAAe,EAAE,CAAC,CAsC5B"}

package/dist/claude-rerank.js

@@ -0,0 +1,93 @@
+const TIMEOUT_MS = 2000;
+const CACHE_TTL = 5 * 60 * 1000;
+const RERANK_SYSTEM_PROMPT = `You are a code search relevance ranker. Given a user query and
+a list of code search results, return the indices of the most relevant results
+in order of relevance. Only include results that are genuinely relevant to the query.
+Respond with ONLY a JSON array of indices, like [3, 0, 7, 1]. Do not explain.`;
+let llmClient = null;
+export function setRerankLLMClient(client) {
+    llmClient = client;
+}
+export function isRerankAvailable() {
+    return llmClient?.isAvailable ?? false;
+}
+// LRU cache
+const cache = new Map();
+function cacheGet(query) {
+    const key = query.toLowerCase().trim();
+    const entry = cache.get(key);
+    if (entry && Date.now() - entry.ts < CACHE_TTL)
+        return entry.indices;
+    cache.delete(key);
+    return null;
+}
+// Concurrency semaphore
+let activeCalls = 0;
+const MAX_CONCURRENT = 2;
+async function acquireSemaphore() {
+    const start = Date.now();
+    while (activeCalls >= MAX_CONCURRENT) {
+        if (Date.now() - start > 5000)
+            return false;
+        await new Promise(r => setTimeout(r, 100));
+    }
+    activeCalls++;
+    return true;
+}
+function releaseSemaphore() { activeCalls = Math.max(0, activeCalls - 1); }
+// Multi-pattern response parser
+function parseIndices(text, maxIndex) {
+    const patterns = [
+        t => { try {
+            const v = JSON.parse(t);
+            if (Array.isArray(v) && v.every(x => typeof x === 'number'))
+                return v;
+        }
+        catch { } return null; },
+        t => { const m = t.match(/```(?:json)?\s*([\s\S]*?)```/); return m ? parseIndices(m[1], maxIndex) : null; },
+        t => { const m = t.match(/\[([0-9,\s]+)\]/); return m ? m[1].split(',').map(s => parseInt(s.trim())).filter(n => !isNaN(n) && n >= 0 && n < maxIndex) : null; },
+    ];
+    for (const p of patterns) {
+        const result = p(text);
+        if (result !== null && result.length > 0)
+            return result;
+    }
+    return null;
+}
+export async function claudeRerank(query, candidates, options) {
+    const topK = options?.topK ?? 10;
+    if (candidates.length <= topK)
+        return candidates;
+    const cached = cacheGet(query);
+    if (cached)
+        return cached.map(i => candidates[i]).filter(Boolean).slice(0, topK);
+    if (!llmClient?.isAvailable) {
+        return candidates.slice(0, topK);
+    }
+    if (!(await acquireSemaphore())) {
+        return candidates.slice(0, topK);
+    }
+    try {
+        const candidatesJson = candidates.map((c, i) => ({
+            index: i, id: c.id, name: c.name,
+            snippet: c.snippet.slice(0, 150),
+            file: c.file ?? '',
+        }));
+        const response = await llmClient.chat({
+            systemPrompt: RERANK_SYSTEM_PROMPT,
+            messages: [{ role: 'user', content: `Query: ${query}\n\nCandidates:\n${JSON.stringify(candidatesJson)}` }],
+            maxTokens: 256,
+        });
+        const indices = parseIndices(response.content.trim(), candidates.length);
+        if (indices) {
+            cache.set(query.toLowerCase().trim(), { indices, ts: Date.now() });
+            return indices.map(i => candidates[i]).filter(Boolean).slice(0, topK);
+        }
+    }
+    catch { /* silent fallback */ }
+    finally {
+        releaseSemaphore();
+    }
+    return candidates.slice(0, topK);
+}
+//# sourceMappingURL=claude-rerank.js.map

package/dist/claude-rerank.js.map

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

package/dist/context-engine.d.ts

@@ -1,29 +1,37 @@
 import type { ContextRequest, ContextResult, IndexStatus, IDataProvider, TaskContextResult } from "@devflow-tools/sdk";
-import type { MemoryEngine } from "@devflow-tools/memory-engine";
+import type { MemoryEngine, EmbeddingProvider } from "@devflow-tools/memory-engine";
 import type { KnowledgeEngine } from "@devflow-tools/knowledge-engine";
 import type { GraphAdapter } from "./graph-adapter.js";
+import type { IndexerAdapter } from "./indexer-adapter.js";
 import type { CodeGraph } from "@colbymchenry/codegraph";
 export interface ContextEngineDeps {
     cg: CodeGraph;
     data: IDataProvider;
     graph: GraphAdapter;
+    indexer: IndexerAdapter;
     memory: MemoryEngine;
     knowledge: KnowledgeEngine;
+    embedder?: EmbeddingProvider;
 }
 export declare class ContextEngine {
     private cg;
     private data;
     private graph;
+    private indexer;
     private memory;
     private knowledge;
+    private embedder?;
     constructor(deps: ContextEngineDeps);
+    private queryCache;
     index(_projectRoot: string): Promise<void>;
     build(request: ContextRequest): Promise<ContextResult>;
     private logAccuracyQuery;
     buildTaskContext(query: string, options?: {
         maxTokens?: number;
         mode?: "fast" | "deep";
+        sessionId?: string;
     }): Promise<TaskContextResult>;
+    private buildTaskContextLegacy;
     getStatus(): IndexStatus;
 }
 //# sourceMappingURL=context-engine.d.ts.map

package/dist/context-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-engine.d.ts","sourceRoot":"","sources":["../src/context-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EAEb,WAAW,EACX,aAAa,EACb,iBAAiB,EAMlB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAyHzD,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,SAAS,CAAC;IACd,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;CAC5B;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,EAAE,CAAY;IACtB,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,SAAS,CAAkB;gBAEvB,IAAI,EAAE,iBAAiB;IAQ7B,KAAK,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,KAAK,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;YA2N9C,gBAAgB;IAexB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkL3H,SAAS,IAAI,WAAW;CASzB"}
+{"version":3,"file":"context-engine.d.ts","sourceRoot":"","sources":["../src/context-engine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EAEb,WAAW,EACX,aAAa,EACb,iBAAiB,EAMlB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAqLzD,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,SAAS,CAAC;IACd,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,EAAE,CAAY;IACtB,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAoB;gBAEzB,IAAI,EAAE,iBAAiB;IAUnC,OAAO,CAAC,UAAU,CAAkD;IAE9D,KAAK,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,KAAK,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;YAqP9C,gBAAgB;IAexB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;YAoOjI,sBAAsB;IAyLpC,SAAS,IAAI,WAAW;CASzB"}

package/dist/context-engine.js

@@ -2,6 +2,8 @@ import CGModule from "@colbymchenry/codegraph";
 import { parseIntent, expandQuery } from "./intent-parser.js";
 import { fuzzySearch, shouldFallback } from "./fuzzy-fallback.js";
 import { compressToTokenLimit } from "./compressor.js";
+import { claudeRerank } from "./claude-rerank.js";
+import { QueryCache } from "./query-cache.js";
 const CG = CGModule.default ?? CGModule;
 /**
  * Merge the original query with L1 dict expansion and Agent-provided English terms.
@@ -19,6 +21,45 @@ function mergeQueries(original, l1, agentTerms) {
     }
     return [...terms].join(" ");
 }
+function sigmoid(x, midpoint = 0.5, steepness = 6) {
+    return 1 / (1 + Math.exp(-steepness * (x - midpoint)));
+}
+function calculateConfidence(input) {
+    // CodeGraph score: based on provided confidence, node count, and structural signals
+    let cgScore = typeof input.cgConfidence === "number" ? input.cgConfidence : 0;
+    if (cgScore === 0 && input.nodeCount > 0) {
+        // Derive from node count when explicit confidence unavailable
+        cgScore = sigmoid(Math.min(input.nodeCount, 30) / 30, 0.3, 8);
+    }
+    // Bonus for structural richness
+    if (input.hasEdges)
+        cgScore = Math.min(1, cgScore + 0.1);
+    if (input.hasExactMatches)
+        cgScore = Math.min(1, cgScore + 0.15);
+    // Knowledge score: diminishing returns after 5 hits
+    const knowledgeScore = sigmoid(input.knowledgeHitCount / 10, 0.3, 5);
+    // Memory score: diminishing returns
+    const memoryScore = sigmoid(input.memoryHitCount / 10, 0.25, 5);
+    // Node count score
+    const nodeScore = sigmoid(input.nodeCount / 30, 0.3, 5);
+    // Intent confidence
+    const intentScore = input.intentConfidence;
+    const weighted = cgScore * 0.35 +
+        knowledgeScore * 0.25 +
+        memoryScore * 0.2 +
+        nodeScore * 0.1 +
+        intentScore * 0.1;
+    let confidence = weighted;
+    // Diversity bonus: all five signals present
+    const activeSignals = [cgScore > 0, input.knowledgeHitCount > 0, input.memoryHitCount > 0, input.nodeCount > 0, input.intentConfidence > 0].filter(Boolean).length;
+    if (activeSignals >= 4)
+        confidence += 0.05;
+    // Penalty: very low node count with no other signals
+    if (input.nodeCount < 3 && input.knowledgeHitCount === 0 && input.memoryHitCount === 0) {
+        confidence *= 0.5;
+    }
+    return Math.round(Math.min(1, Math.max(0, confidence)) * 100) / 100;
+}
 function getAdaptiveParams(fileCount) {
     if (fileCount <= 200)
         return { depth: 1, searchLimit: 5, maxNodes: 10 };
@@ -103,17 +144,22 @@ export class ContextEngine {
     cg;
     data;
     graph;
+    indexer;
     memory;
     knowledge;
+    embedder;
     constructor(deps) {
         this.cg = deps.cg;
         this.data = deps.data;
         this.graph = deps.graph;
+        this.indexer = deps.indexer;
         this.memory = deps.memory;
         this.knowledge = deps.knowledge;
+        this.embedder = deps.embedder;
     }
+    queryCache = new QueryCache(60_000, 100);
     async index(_projectRoot) {
-        await this.cg.indexAll();
+        await this.indexer.reconcile();
     }
     async build(request) {
         const maxTokens = request.maxTokens ?? 8000;
@@ -147,37 +193,66 @@ export class ContextEngine {
                 }
             }
         }
-        // 2. Knowledge search (DevFlow unique)
-        let knowledgeHits = [];
-        try {
-            const kResults = await this.knowledge.search(request.query, { limit: 10 });
-            knowledgeHits = kResults.map((k) => ({
-                title: k.title,
-                content: k.content,
-                source: k.source,
-            }));
-        }
-        catch {
-            // Knowledge engine may not have data yet
-        }
-        // 3. Memory context (DevFlow unique)
-        let memoryContext;
-        try {
-            const mem = await this.memory.getAll();
-            memoryContext = {
-                project: mem.project,
-                preferences: mem.user.preferences,
-            };
+        // Embedding reranking (if available)
+        if (this.embedder?.isReady()) {
+            try {
+                const nodesList = Array.from(cgResult.nodes.values());
+                const nodeTexts = nodesList.map(n => `${n.name} ${n.signature ?? ''} ${n.kind} ${n.filePath}`);
+                const queryEmbedding = await this.embedder.embed(combinedQuery);
+                const nodeEmbeddings = await this.embedder.embedBatch(nodeTexts);
+                const scoredNodes = nodesList.map((node, i) => {
+                    const nodeEmb = nodeEmbeddings[i];
+                    let dot = 0, normA = 0, normB = 0;
+                    for (let j = 0; j < queryEmbedding.length; j++) {
+                        dot += queryEmbedding[j] * nodeEmb[j];
+                        normA += queryEmbedding[j] * queryEmbedding[j];
+                        normB += nodeEmb[j] * nodeEmb[j];
+                    }
+                    const score = dot / (Math.sqrt(normA) * Math.sqrt(normB));
+                    return { node, score };
+                });
+                scoredNodes.sort((a, b) => b.score - a.score);
+                cgResult.nodes = new Map();
+                const topK = Math.min(scoredNodes.length, request.mode === "deep" ? 30 : adaptive.maxNodes);
+                for (const { node } of scoredNodes.slice(0, topK)) {
+                    cgResult.nodes.set(node.id, node);
+                }
+                cgResult.roots = scoredNodes.slice(0, 3).map(s => s.node.id);
+            }
+            catch { /* fall back to BM25 ranking */ }
         }
-        catch {
-            // Memory may be empty
+        // Claude rerank (second pass, if available)
+        const allNodesList = Array.from(cgResult.nodes.values());
+        if (allNodesList.length > 30) {
+            try {
+                const reranked = await claudeRerank(combinedQuery, allNodesList.map(n => ({ id: n.id, name: n.name, snippet: n.signature ?? '', file: n.filePath })), { topK: 30 });
+                cgResult.nodes = new Map(reranked.map(r => [r.id, allNodesList.find(n => n.id === r.id)]));
+                cgResult.roots = reranked.slice(0, 3).map(r => r.id);
+            }
+            catch { /* keep embedding/bm25 ranking */ }
         }
+        // 2. Knowledge + Memory in parallel
+        const [kResultsRaw, memResultsRaw] = await Promise.all([
+            this.knowledge.search(request.query, { limit: 10 }).catch(() => []),
+            this.memory.search(request.query, { limit: 5 }).catch(() => []),
+        ]);
+        const knowledgeHits = kResultsRaw.map((k) => ({
+            title: k.title,
+            content: k.content,
+            source: k.source,
+        }));
+        const memoryContext = memResultsRaw.length > 0 ? {
+            relevant: memResultsRaw.map((r) => ({
+                content: r.entry.content,
+                category: r.entry.category,
+                score: r.score,
+            })),
+        } : undefined;
         // 4. Build file snippets, layer by quality
         const MIN_CORE_SCORE = 0.7;
         const MIN_WEAK_SCORE = 0.4;
         const L1_TOKEN_RATIO = 0.6;
         const L2_TOKEN_RATIO = 0.3;
-        const EXTERNAL_MAX_RATIO = 0.1;
         const ESTIMATED_TOKENS_PER_CHAR = 0.25;
         function estimateTokens(text) {
             return Math.ceil(text.length * ESTIMATED_TOKENS_PER_CHAR);
@@ -241,7 +316,6 @@ export class ContextEngine {
         let remaining = maxTokens;
         const l1Cap = Math.floor(maxTokens * L1_TOKEN_RATIO);
         const l2Cap = Math.floor(maxTokens * L2_TOKEN_RATIO);
-        const l3Cap = Math.floor(maxTokens * EXTERNAL_MAX_RATIO);
         // L1: by score descending
         let l1Used = 0;
         for (const f of l1Files.sort((a, b) => (b.score ?? 0) - (a.score ?? 0))) {
@@ -264,18 +338,6 @@ export class ContextEngine {
             remaining -= tokens;
             l2Used += tokens;
         }
-        // L3: fill remaining (max 10% budget)
-        let l3Used = 0;
-        for (const f of l3Files) {
-            const tokens = Math.min(estimateTokens(f.snippet), 200);
-            if (remaining < 100)
-                break;
-            if (l3Used + tokens > l3Cap)
-                continue;
-            allFiles.push(f);
-            remaining -= tokens;
-            l3Used += tokens;
-        }
         // fallback: if nothing made it in, push top L1
         if (allFiles.length === 0 && l1Files.length > 0) {
             allFiles.push(l1Files.sort((a, b) => (b.score ?? 0) - (a.score ?? 0))[0]);
@@ -310,19 +372,20 @@ export class ContextEngine {
             file: n.filePath,
             kind: n.kind,
         }));
-        this.logAccuracyQuery(queryId, 'codegraph', request.query, topKResults).catch(() => { });
+        this.logAccuracyQuery(queryId, 'codegraph', request.query, topKResults, request.sessionId).catch(() => { });
         return {
             files: allFiles,
+            knowledgeFiles: l3Files.length > 0 ? l3Files : undefined,
             graph: graphOutput,
             memory: memoryContext,
             confidence: intent.confidence,
             tokenCount,
         };
     }
-    async logAccuracyQuery(id, engine, query, topKResults) {
+    async logAccuracyQuery(id, engine, query, topKResults, sessionId) {
         try {
             const http = await import('node:http');
-            const body = JSON.stringify({ id, sessionId: 'unknown', engine, query, topKResults });
+            const body = JSON.stringify({ id, sessionId: sessionId ?? 'unknown', engine, query, topKResults });
             const req = http.request({
                 hostname: '127.0.0.1', port: 13337, path: '/api/telemetry/accuracy/query',
                 method: 'POST', headers: { 'Content-Type': 'application/json', 'X-API-Key': 'dev-key-000000', 'Content-Length': Buffer.byteLength(body) },
@@ -335,6 +398,212 @@ export class ContextEngine {
         catch { /* best-effort logging */ }
     }
     async buildTaskContext(query, options) {
+        const maxTokens = options?.maxTokens ?? 8000;
+        const mode = options?.mode ?? "fast";
+        const cacheKey = `ctx:${query}:${mode}`;
+        const cached = this.queryCache.get(cacheKey);
+        if (cached)
+            return cached;
+        const intent = parseIntent(query);
+        const taskType = intent.intent;
+        const timing = {};
+        const t0 = Date.now();
+        const [cgResult, knowledgeHits, memoryHits] = await Promise.all([
+            Promise.race([
+                this.cg.buildContext(query, {
+                    searchLimit: mode === "deep" ? 10 : 5,
+                    traversalDepth: mode === "deep" ? 3 : 2,
+                    maxNodes: mode === "deep" ? 50 : 20,
+                    includeCode: false,
+                    format: "json",
+                }),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("buildContext timeout")), 15000)),
+            ]).catch((err) => {
+                console.error("[devflow] cg.buildContext failed, falling back:", err.message);
+                return null;
+            }),
+            Promise.race([
+                this.knowledge.search(query, { limit: 5 }),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("knowledge timeout")), 5000)),
+            ]).catch((err) => {
+                console.error("[devflow] knowledge.search timeout:", err.message);
+                return [];
+            }),
+            Promise.race([
+                this.memory.search(query, { limit: 5 }),
+                new Promise((_, reject) => setTimeout(() => reject(new Error("memory timeout")), 5000)),
+            ]).catch((err) => {
+                console.error("[devflow] memory.search timeout:", err.message);
+                return [];
+            }),
+        ]);
+        timing["1_promise_all"] = Date.now() - t0;
+        console.error("[devflow:timing] Promise.all:", timing["1_promise_all"], "ms");
+        if (!cgResult) {
+            console.error("[devflow] buildContext failed, falling back to manual pipeline");
+            const result = await this.buildTaskContextLegacy(query, options);
+            result._devflow = { fallback: "buildContext-unavailable" };
+            return result;
+        }
+        // buildContext returns JSON string when format="json" — parse it
+        let ctx;
+        if (typeof cgResult === "string") {
+            try {
+                ctx = JSON.parse(cgResult);
+            }
+            catch {
+                console.error("[devflow] buildContext returned unparseable string, falling back");
+                return this.buildTaskContextLegacy(query, options);
+            }
+        }
+        else {
+            ctx = cgResult;
+        }
+        // Fallback: direct searchNodes for query terms that buildContext may have missed
+        // (e.g. hyphenated terms like "post-tool-use" get tokenized and lost in FTS noise)
+        const tFallback = Date.now();
+        const existingFiles = new Set((ctx.nodes ?? []).map((n) => n.filePath));
+        const existingIds = new Set((ctx.nodes ?? []).map((n) => n.id));
+        const queryTerms = query.split(/\s+/).filter(w => w.length > 2).sort((a, b) => b.length - a.length).slice(0, 3);
+        for (const term of queryTerms) {
+            const hits = this.cg.searchNodes(term, { limit: 3 });
+            for (const hit of hits) {
+                if (!existingFiles.has(hit.node.filePath)) {
+                    const fileNodes = this.cg.getNodesInFile(hit.node.filePath);
+                    let firstSymbol = null;
+                    for (const fn of fileNodes) {
+                        if (fn.kind === "file" || fn.kind === "import" || existingIds.has(fn.id))
+                            continue;
+                        ctx.nodes.push(fn);
+                        existingIds.add(fn.id);
+                        if (!firstSymbol)
+                            firstSymbol = fn;
+                    }
+                    existingFiles.add(hit.node.filePath);
+                    // Use a real symbol as entry point, not the file wrapper
+                    if (firstSymbol) {
+                        ctx.entryPoints.push(firstSymbol);
+                    }
+                }
+            }
+        }
+        console.error("[devflow:timing] Fallback searchNodes loop:", Date.now() - tFallback, "ms");
+        timing["2_fallback_loop"] = Date.now() - tFallback;
+        const tSnippet = Date.now();
+        const allNodes = ctx.nodes ?? [];
+        const rootIds = new Set((ctx.entryPoints ?? []).map((ep) => ep.id));
+        const requiredFileSet = new Set();
+        const optionalFileSet = new Set();
+        const keySymbols = [];
+        const entryFileSet = new Set(ctx.entryPoints?.map((ep) => ep.filePath) ?? []);
+        for (const node of allNodes) {
+            const isDirect = rootIds.has(node.id) || entryFileSet.has(node.filePath);
+            (isDirect ? requiredFileSet : optionalFileSet).add(node.filePath);
+            keySymbols.push({
+                name: node.name,
+                file: node.filePath,
+                kind: node.kind,
+                relevance: isDirect ? "direct" : "indirect",
+            });
+        }
+        const cgReasoning = [{
+                source: "graph_root",
+                fileGroup: "codegraph-buildContext",
+                explanation: ctx.summary
+                    ? `CodeGraph: ${ctx.summary}`
+                    : `CodeGraph matched ${allNodes.length} nodes across ${requiredFileSet.size + optionalFileSet.size} files`,
+            }];
+        const knowledgeReasoning = knowledgeHits.map((k) => ({
+            source: "knowledge",
+            fileGroup: k.source ?? "knowledge",
+            explanation: `Knowledge entry "${k.title}" matched query`,
+        }));
+        const memoryReasoning = memoryHits.map((m) => ({
+            source: "memory",
+            fileGroup: m.entry?.category ?? "memory",
+            explanation: `Memory entry matched: ${String(m.entry?.content ?? "").slice(0, 100)}`,
+        }));
+        const allFileSnippets = [];
+        for (const fp of [...requiredFileSet].sort()) {
+            const nodesInFile = allNodes.filter(n => n.filePath === fp);
+            allFileSnippets.push({
+                path: fp,
+                snippet: nodesInFile.map(n => `// ${n.kind}: ${n.name}${n.signature ? ` ${n.signature}` : ""}`).join("\n"),
+                symbols: nodesInFile.map(n => n.name),
+                score: 1.0,
+            });
+        }
+        for (const fp of [...optionalFileSet].sort()) {
+            const nodesInFile = allNodes.filter(n => n.filePath === fp);
+            allFileSnippets.push({
+                path: fp,
+                snippet: nodesInFile.map(n => `// ${n.kind}: ${n.name}${n.signature ? ` ${n.signature}` : ""}`).join("\n"),
+                symbols: nodesInFile.map(n => n.name),
+                score: 0.5,
+            });
+        }
+        const compressed = compressToTokenLimit(allFileSnippets, maxTokens);
+        console.error("[devflow:timing] Snippet building + compress:", Date.now() - tSnippet, "ms");
+        timing["3_snippet_compress"] = Date.now() - tSnippet;
+        const riskHints = generateRiskHints(allNodes);
+        const nextActions = generateNextActions(taskType, keySymbols.slice(0, 5));
+        const result = {
+            taskType,
+            requiredFiles: {
+                files: [...requiredFileSet],
+                symbols: keySymbols.filter(s => s.relevance === "direct").map(s => s.name).slice(0, 30),
+                reasoning: cgReasoning,
+            },
+            optionalFiles: {
+                files: [...optionalFileSet],
+                symbols: keySymbols.filter(s => s.relevance === "indirect").map(s => s.name).slice(0, 30),
+                reasoning: [...knowledgeReasoning, ...memoryReasoning],
+            },
+            keySymbols: keySymbols
+                .sort((a, b) => {
+                // Direct before indirect
+                if (a.relevance === "direct" && b.relevance !== "direct")
+                    return -1;
+                if (a.relevance !== "direct" && b.relevance === "direct")
+                    return 1;
+                // Functions/classes before constants/variables
+                const kindScore = (k) => k === "function" || k === "method" || k === "class" ? 0 :
+                    k === "component" || k === "interface" || k === "type" ? 1 :
+                        k === "variable" || k === "constant" || k === "enum" ? 2 : 3;
+                return kindScore(a.kind) - kindScore(b.kind);
+            })
+                .slice(0, 20),
+            graphSummary: {
+                roots: [...rootIds],
+                traversalDepth: ctx.stats?.traversalDepth ?? 2,
+                relatedNodeCount: allNodes.length,
+            },
+            riskHints,
+            nextActions,
+            reasoning: [...cgReasoning, ...knowledgeReasoning, ...memoryReasoning],
+            confidence: calculateConfidence({
+                cgConfidence: ctx.stats?.confidence,
+                knowledgeHitCount: knowledgeHits.length,
+                memoryHitCount: memoryHits.length,
+                nodeCount: allNodes.length,
+                intentConfidence: intent.confidence,
+                hasEdges: Array.isArray(ctx.edges) && (ctx.edges.length > 0),
+                hasExactMatches: keySymbols.some(s => s.relevance === "direct"),
+            }),
+            tokenCount: compressed.tokenCount,
+        };
+        this.queryCache.set(cacheKey, result);
+        timing["0_total"] = Date.now() - t0;
+        console.error("[devflow:timing] buildTaskContext TOTAL:", timing["0_total"], "ms");
+        result._timing = timing;
+        const queryId = `acc:${Date.now()}:${Math.random().toString(36).slice(2, 9)}`;
+        const topKResults = keySymbols.slice(0, 10).map(s => ({
+            id: s.name, name: s.name, file: s.file, kind: s.kind,
+        }));
+        this.logAccuracyQuery(queryId, "codegraph", query, topKResults, options?.sessionId).catch(() => { });
+        return result;
+    }
+    async buildTaskContextLegacy(query, options) {
         const stats = this.cg.getStats();
         const adaptive = getAdaptiveParams(stats.fileCount ?? 500);
         const maxTokens = options?.maxTokens ?? 8000;
@@ -418,6 +687,12 @@ export class ContextEngine {
             kind: n.kind,
             relevance: (rootIds.has(n.id) ? "direct" : "indirect"),
         }));
+        // Accuracy logging
+        const queryId = `acc:${Date.now()}:${Math.random().toString(36).slice(2, 9)}`;
+        const topKResults = keySymbols.slice(0, 10).map(s => ({
+            id: s.name, name: s.name, file: s.file, kind: s.kind,
+        }));
+        this.logAccuracyQuery(queryId, 'codegraph', query, topKResults, options?.sessionId).catch(() => { });
         // Graph summary
         const graphSummary = {
             roots: cgResult.roots,