maestro-flow 0.5.34 → 0.5.36

package/dist/src/commands/search.d.ts

@@ -1,8 +1,14 @@
 /**
- * Search Command — Unified knowledge search across specs, knowhow, issues, and more.
+ * Search Command — Unified knowledge search across wiki + code.
  *
- * Uses WikiIndexer BM25F search with deduplication and type filtering.
- * Optional --code flag adds CodeGraph AST results in a separate section.
+ * Default: mixed results (wiki + code interleaved by normalized score).
+ * --code: separate section display (backward compat).
+ * --wiki-only: wiki results only (no code search).
+ *
+ * Scoring: multi-signal normalization inspired by codebase-memory-mcp.
+ *   Wiki:  BM25F score + type boost (spec > knowhow > note)
+ *   Code:  BM25 score + kind boost + name-match bonus
+ *   Merge: percentile-aware normalization + source weight
  */
 import type { Command } from 'commander';
 import type { WikiEntry, WikiNodeType } from '#maestro-dashboard/wiki/wiki-types.js';
@@ -38,6 +44,22 @@ export interface UnifiedSearchOptions {
  * Unified knowledge search — BM25F ranking via WikiIndexer, with type/category
  * filtering and per-source deduplication.
  */
-export declare function runUnifiedSearch(q: string, opts: UnifiedSearchOptions): Promise<SearchResult[]>;
+export interface SearchMeta {
+    embeddingUsed: boolean;
+    embeddingDocs: number;
+}
+export declare function getLastSearchMeta(): SearchMeta;
+export declare function runUnifiedSearch(q: string, opts: UnifiedSearchOptions & {
+    skipEmbedding?: boolean;
+}): Promise<SearchResult[]>;
 export declare function registerSearchCommand(program: Command): void;
+export interface MergedResult {
+    source: 'wiki' | 'code';
+    kind: string;
+    name: string;
+    detail: string;
+    normalizedScore: number;
+    snippet?: string;
+    signature?: string;
+}
 //# sourceMappingURL=search.d.ts.map

package/dist/src/commands/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/commands/search.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAMrF,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,2CAA2C;AAC3C,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,2EAA2E;AAC3E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAoBD;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA6CrG;AAgDD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA0G5D"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/commands/search.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAOrF,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,2CAA2C;AAC3C,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,2EAA2E;AAC3E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAoBD;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB;AAGD,wBAAgB,iBAAiB,IAAI,UAAU,CAA4B;AAE3E,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,GAAG;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CA+DnI;AAgDD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsO5D;AAkCD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}

package/dist/src/commands/search.js

@@ -1,13 +1,20 @@
 /**
- * Search Command — Unified knowledge search across specs, knowhow, issues, and more.
+ * Search Command — Unified knowledge search across wiki + code.
  *
- * Uses WikiIndexer BM25F search with deduplication and type filtering.
- * Optional --code flag adds CodeGraph AST results in a separate section.
+ * Default: mixed results (wiki + code interleaved by normalized score).
+ * --code: separate section display (backward compat).
+ * --wiki-only: wiki results only (no code search).
+ *
+ * Scoring: multi-signal normalization inspired by codebase-memory-mcp.
+ *   Wiki:  BM25F score + type boost (spec > knowhow > note)
+ *   Code:  BM25 score + kind boost + name-match bonus
+ *   Merge: percentile-aware normalization + source weight
  */
 import { resolve } from 'node:path';
 import { truncate, extractSnippet, highlightTerms } from '../utils/cli-format.js';
 import { WikiIndexer } from '#maestro-dashboard/wiki/wiki-indexer.js';
 import { loadWorkspaceConfig, resolveWorkspaceLinks } from '../config/index.js';
+import { tryDaemonSearch, startDaemon, stopDaemon, readDaemonInfo, isDaemonAlive, getDaemonPath } from '../search/daemon.js';
 // Valid type filter values — matches WikiNodeType.
 const VALID_TYPES = ['project', 'roadmap', 'spec', 'issue', 'knowhow', 'note', 'domain'];
 // ── Lazy offline client ────────────────────────────────────────────────
@@ -25,15 +32,30 @@ function getIndexer() {
     }
     return _indexer;
 }
-/**
- * Unified knowledge search — BM25F ranking via WikiIndexer, with type/category
- * filtering and per-source deduplication.
- */
+let _lastSearchMeta = { embeddingUsed: false, embeddingDocs: 0 };
+export function getLastSearchMeta() { return _lastSearchMeta; }
 export async function runUnifiedSearch(q, opts) {
     const limit = opts.limit > 0 ? opts.limit : 20;
-    const indexer = getIndexer();
     const candidateLimit = Math.max(limit * 3, 60);
-    const scored = await indexer.searchWithScores(q, candidateLimit);
+    // Try daemon first (warm ONNX model, no cold-start penalty)
+    const workflowRoot = resolve('.workflow');
+    const daemonResult = await tryDaemonSearch(workflowRoot, q, candidateLimit, opts.skipEmbedding);
+    let scored;
+    let embeddingUsed;
+    let embeddingDocs;
+    if (daemonResult?.ok && daemonResult.results) {
+        scored = daemonResult.results;
+        embeddingUsed = daemonResult.embeddingUsed ?? false;
+        embeddingDocs = daemonResult.embeddingDocs ?? 0;
+    }
+    else {
+        const indexer = getIndexer();
+        const result = await indexer.searchWithMeta(q, candidateLimit, { skipEmbedding: opts.skipEmbedding });
+        scored = result.results;
+        embeddingUsed = result.embeddingUsed;
+        embeddingDocs = result.embeddingDocs;
+    }
+    _lastSearchMeta = { embeddingUsed, embeddingDocs };
     let filtered = scored;
     if (opts.type) {
         filtered = filtered.filter(r => r.entry.type === opts.type);
@@ -54,13 +76,14 @@ export async function runUnifiedSearch(q, opts) {
         if (deduped.length >= limit)
             break;
     }
+    const maxScore = deduped.length > 0 ? deduped[0].score : 1;
     const results = deduped.map(({ entry, score }) => ({
         id: entry.id,
         type: entry.type,
         title: entry.title,
         category: entry.category,
         summary: entry.summary,
-        score,
+        score: maxScore > 0 ? score / maxScore : score,
         snippet: extractSnippet(entry.body, q),
         source: entry.source,
         workspace: entry.source.workspace,
@@ -124,142 +147,385 @@ async function runCodeSearch(q, limit) {
 export function registerSearchCommand(program) {
     program
         .command('search <query...>')
-        .description('Unified knowledge search across specs, knowhow, issues, and more')
+        .description('Unified knowledge search across wiki + code (mixed by default)')
         .option('--type <type>', `Filter by type: ${VALID_TYPES.join(', ')}`)
         .option('--category <cat>', 'Filter by category (e.g. coding, arch, debug, test, review, learning)')
-        .option('--code', 'Include CodeGraph code results')
-        .option('--all', 'Search all sources (wiki + code) with normalized ranking')
+        .option('--code', 'Show wiki and code in separate sections (legacy display)')
+        .option('--all', 'Alias for default mixed mode (backward compat)')
+        .option('--wiki-only', 'Search wiki only, skip code results')
         .option('--workspace <name>', 'Filter results to a specific linked workspace')
+        .option('--no-emb', 'Skip embedding, use BM25 only')
         .option('--limit <n>', 'Max results', '20')
         .option('--json', 'Output as JSON')
         .action(async (queryParts, opts) => {
         const q = queryParts.join(' ');
         const limit = parseInt(opts.limit, 10) || 20;
-        const includeCode = opts.code || opts.all;
+        const wikiOnly = opts.wikiOnly === true;
+        const separateSections = opts.code === true && !opts.all;
         if (opts.type && !VALID_TYPES.includes(opts.type)) {
             console.error(`Error: --type must be one of ${VALID_TYPES.join(', ')} (got "${opts.type}")`);
             process.exit(1);
         }
-        let wikiResults = await runUnifiedSearch(q, { type: opts.type, category: opts.category, workspace: opts.workspace, limit });
-        const codeResults = includeCode ? await runCodeSearch(q, limit) : [];
-        // --all: normalize and merge scores for unified ranking
-        if (opts.all) {
-            const merged = mergeAndNormalize(wikiResults, codeResults, limit);
+        const skipEmbedding = opts.emb === false;
+        const wikiResults = await runUnifiedSearch(q, { type: opts.type, category: opts.category, workspace: opts.workspace, limit, skipEmbedding });
+        const codeResults = wikiOnly ? [] : await runCodeSearch(q, limit);
+        const meta = getLastSearchMeta();
+        const embTag = meta.embeddingUsed ? `+emb(${meta.embeddingDocs})` : 'bm25';
+        const isTTY = process.stdout.isTTY === true;
+        const qTerms = q.toLowerCase().split(/\s+/).filter(Boolean);
+        // --code (without --all): legacy separate-section display
+        if (separateSections) {
             if (opts.json) {
-                console.log(JSON.stringify({ query: q, count: merged.length, results: merged }, null, 2));
+                console.log(JSON.stringify({ query: q, wikiCount: wikiResults.length, codeCount: codeResults.length, wikiResults, codeResults }, null, 2));
                 return;
             }
-            console.log(`Search: "${q}" (${merged.length} results, all sources)`);
-            if (merged.length === 0) {
+            console.log(`Search: "${q}" (${wikiResults.length} wiki + ${codeResults.length} code, ${embTag})`);
+            if (wikiResults.length === 0 && codeResults.length === 0) {
                 console.log('  No matches found.');
                 return;
             }
-            const isTTY = process.stdout.isTTY === true;
-            const qTerms = q.toLowerCase().split(/\s+/).filter(Boolean);
-            for (const r of merged) {
-                const name = isTTY ? highlightTerms(r.name, qTerms) : r.name;
-                const scoreTag = `  (${r.normalizedScore.toFixed(2)})`;
-                console.log(`  [${r.source}] [${r.kind}]  ${name}  ${r.detail}${scoreTag}`);
+            if (wikiResults.length > 0) {
+                console.log('  [Wiki Results]');
+                for (const r of wikiResults) {
+                    printWikiResult(r, '    ', isTTY, qTerms);
+                }
+            }
+            if (codeResults.length > 0) {
+                console.log('  [Code Results]');
+                for (const r of codeResults) {
+                    printCodeResult(r, '    ', isTTY, qTerms);
+                }
             }
             return;
         }
+        // Default / --all / --wiki-only: mixed interleaved results
+        const merged = mergeAndNormalize(wikiResults, codeResults, limit, q);
+        const wikiCount = merged.filter(r => r.source === 'wiki').length;
+        const codeCount = merged.filter(r => r.source === 'code').length;
         if (opts.json) {
-            const output = { query: q };
-            if (includeCode) {
-                output.wikiResults = wikiResults;
-                output.codeResults = codeResults;
-                output.wikiCount = wikiResults.length;
-                output.codeCount = codeResults.length;
-            }
-            else {
-                output.count = wikiResults.length;
-                output.results = wikiResults;
-            }
-            console.log(JSON.stringify(output, null, 2));
+            console.log(JSON.stringify({ query: q, wikiCount, codeCount, count: merged.length, results: merged }, null, 2));
             return;
         }
-        const isTTY = process.stdout.isTTY === true;
-        const qTerms = q.toLowerCase().split(/\s+/).filter(Boolean);
-        if (includeCode && codeResults.length > 0) {
-            console.log(`Search: "${q}" (${wikiResults.length} wiki + ${codeResults.length} code results)`);
-        }
-        else {
-            console.log(`Search: "${q}" (${wikiResults.length} results)`);
+        const countParts = [];
+        if (wikiCount > 0)
+            countParts.push(`wiki ${wikiCount}个`);
+        if (codeCount > 0)
+            countParts.push(`代码 ${codeCount}个`);
+        const countSummary = countParts.length > 0
+            ? `${countParts.join(' + ')} = ${merged.length} results`
+            : '0 results';
+        console.log(`Search: "${q}" (${countSummary}, ${embTag})`);
+        if (qTerms.length > 4) {
+            console.log(`  Hint: ${qTerms.length} terms — split into 1-3 keyword queries for better precision`);
         }
-        if (wikiResults.length === 0 && codeResults.length === 0) {
+        if (merged.length === 0) {
             console.log('  No matches found.');
             return;
         }
-        if (wikiResults.length > 0) {
-            if (includeCode)
-                console.log('  [Wiki Results]');
-            for (const r of wikiResults) {
-                const indent = includeCode ? '    ' : '  ';
-                const typeTag = `[${r.type}]`;
-                const catTag = r.category ? ` ${r.category}` : '';
-                const wsTag = r.workspace ? ` [ws:${r.workspace}]` : '';
-                const scoreTag = r.score !== null ? `  (${r.score.toFixed(2)})` : '';
-                const title = isTTY ? highlightTerms(r.title, qTerms) : r.title;
-                console.log(`${indent}${typeTag}${catTag}${wsTag}  ${r.id}  ${title}${scoreTag}`);
+        for (const r of merged) {
+            const name = isTTY ? highlightTerms(r.name, qTerms) : r.name;
+            const scoreTag = `  (${r.normalizedScore.toFixed(4)})`;
+            if (r.source === 'wiki') {
+                console.log(`  [wiki:${r.kind}]  ${name}  ${r.detail}${scoreTag}`);
                 if (r.snippet) {
                     const snippet = isTTY ? highlightTerms(r.snippet, qTerms) : r.snippet;
-                    console.log(`${indent}  ${snippet}`);
+                    console.log(`    ${snippet}`);
                 }
-                else if (r.summary) {
-                    const summary = isTTY ? highlightTerms(truncate(r.summary, 80), qTerms) : truncate(r.summary, 80);
-                    console.log(`${indent}  ${summary}`);
+            }
+            else {
+                const sigTag = r.signature ? `  ${truncate(r.signature, 60)}` : '';
+                console.log(`  [code:${r.kind}]  ${name}  ${r.detail}${sigTag}${scoreTag}`);
+            }
+        }
+    });
+    // ── Search daemon management ───────────────────────────────────────────
+    program
+        .command('search-daemon')
+        .description('Manage the resident search daemon (warm ONNX model)')
+        .argument('<action>', 'start | stop | status')
+        .action(async (action) => {
+        const workflowRoot = resolve('.workflow');
+        if (action === 'start' || action === 'start-daemon') {
+            const info = readDaemonInfo(workflowRoot);
+            if (info && isDaemonAlive(info)) {
+                console.log(`Search daemon already running (pid=${info.pid}, port=${info.port})`);
+                return;
+            }
+            console.log('Starting search daemon...');
+            const projectPath = process.cwd();
+            const wsConfig = loadWorkspaceConfig(projectPath);
+            const resolved = resolveWorkspaceLinks(projectPath, wsConfig);
+            const linkedWorkspaces = resolved
+                .filter(lw => lw.valid)
+                .map(lw => ({ name: lw.name, workflowRoot: lw.workflowRoot, shareTypes: lw.share }));
+            const { port } = await startDaemon(workflowRoot, { workflowRoot, linkedWorkspaces });
+            console.log(`Search daemon started (pid=${process.pid}, port=${port})`);
+            // Keep process alive
+            return;
+        }
+        if (action === 'stop') {
+            const stopped = stopDaemon(workflowRoot);
+            console.log(stopped ? 'Search daemon stopped.' : 'No daemon running.');
+            return;
+        }
+        if (action === 'status') {
+            const info = readDaemonInfo(workflowRoot);
+            if (!info) {
+                console.log('Search daemon: not running');
+                return;
+            }
+            const alive = isDaemonAlive(info);
+            console.log(`Search daemon: ${alive ? 'running' : 'stale (pid dead)'}  pid=${info.pid}  port=${info.port}  started=${info.startedAt}`);
+            if (!alive)
+                try {
+                    const { unlinkSync } = await import('node:fs');
+                    unlinkSync(getDaemonPath(workflowRoot));
                 }
+                catch { }
+            return;
+        }
+        console.error(`Unknown action: ${action}. Use: start, stop, status`);
+    });
+    // Hidden flag for hook-spawned daemon startup
+    program
+        .command('search-start-daemon', { hidden: true })
+        .action(async () => {
+        const workflowRoot = resolve('.workflow');
+        const projectPath = process.cwd();
+        const wsConfig = loadWorkspaceConfig(projectPath);
+        const resolved = resolveWorkspaceLinks(projectPath, wsConfig);
+        const linkedWorkspaces = resolved
+            .filter(lw => lw.valid)
+            .map(lw => ({ name: lw.name, workflowRoot: lw.workflowRoot, shareTypes: lw.share }));
+        try {
+            await startDaemon(workflowRoot, { workflowRoot, linkedWorkspaces });
+        }
+        catch {
+            process.exit(0);
+        }
+    });
+    program
+        .command('embedding')
+        .description('Embedding model status, warmup, and rebuild')
+        .argument('[action]', 'status (default), warmup, rebuild', 'status')
+        .action(async (action) => {
+        const workflowRoot = resolve('.workflow');
+        const { isAvailable, getUnavailableReason, loadEmbeddingIndex, embedTexts, getDeviceSummary, detectDevice } = await import('#maestro-dashboard/wiki/embedding.js');
+        if (action === 'status') {
+            const avail = await isAvailable();
+            console.log(`Transformers: ${avail ? 'available' : 'NOT available (' + (getUnavailableReason?.() ?? 'unknown') + ')'}`);
+            if (avail) {
+                await detectDevice();
+                console.log(`Device: ${getDeviceSummary()}`);
+            }
+            const idx = loadEmbeddingIndex(workflowRoot);
+            if (idx) {
+                console.log(`Index: ${idx.docIds.length} docs, dim=${idx.dimension}, model=${idx.modelId}`);
+                console.log(`Built: ${new Date(idx.builtAt).toISOString()}, device=${idx.deviceUsed}`);
+                if (idx.buildTimeMs)
+                    console.log(`Build time: ${idx.buildTimeMs}ms`);
+            }
+            else {
+                console.log('Index: not built (will build on first search)');
             }
+            return;
         }
-        if (codeResults.length > 0) {
-            console.log('  [Code Results]');
-            for (const r of codeResults) {
-                const scoreTag = r.score !== null ? `  (${r.score.toFixed(2)})` : '';
-                const name = isTTY ? highlightTerms(r.name, qTerms) : r.name;
-                console.log(`    [${r.kind}] ${name}  ${r.filePath}${scoreTag}`);
+        if (action === 'warmup') {
+            const avail = await isAvailable();
+            if (!avail) {
+                console.error(`Embedding unavailable: ${getUnavailableReason?.() ?? 'unknown'}`);
+                process.exit(1);
             }
+            console.log('Warming up model...');
+            const t0 = Date.now();
+            await embedTexts(['warmup']);
+            console.log(`Model ready (${getDeviceSummary()}, ${Date.now() - t0}ms)`);
+            return;
         }
+        if (action === 'rebuild') {
+            const avail = await isAvailable();
+            if (!avail) {
+                console.error(`Embedding unavailable: ${getUnavailableReason?.() ?? 'unknown'}`);
+                process.exit(1);
+            }
+            console.log('Rebuilding embedding index...');
+            const { WikiIndexer } = await import('#maestro-dashboard/wiki/wiki-indexer.js');
+            const { loadWorkspaceConfig, resolveWorkspaceLinks } = await import('../config/index.js');
+            const projectPath = process.cwd();
+            const wsConfig = loadWorkspaceConfig(projectPath);
+            const resolved = resolveWorkspaceLinks(projectPath, wsConfig);
+            const linkedWorkspaces = resolved.filter(lw => lw.valid).map(lw => ({ name: lw.name, workflowRoot: lw.workflowRoot, shareTypes: lw.share }));
+            const indexer = new WikiIndexer({ workflowRoot, linkedWorkspaces });
+            const t0 = Date.now();
+            const { results, embeddingUsed, embeddingDocs } = await indexer.searchWithMeta('warmup', 1);
+            if (embeddingUsed) {
+                console.log(`Index rebuilt: ${embeddingDocs} docs (${Date.now() - t0}ms)`);
+            }
+            else {
+                console.log(`Rebuild failed — check with: maestro embedding status`);
+            }
+            return;
+        }
+        console.error(`Unknown action: ${action}. Use: status, warmup, rebuild`);
+        process.exit(1);
     });
 }
-function getMinMax(scores) {
-    let min = Infinity;
-    let max = -Infinity;
-    for (const s of scores) {
-        if (s < min)
-            min = s;
-        if (s > max)
-            max = s;
+// ── Display helpers ──────────────────────────────────────────────────
+function printWikiResult(r, indent, isTTY, qTerms) {
+    const typeTag = `[${r.type}]`;
+    const catTag = r.category ? ` ${r.category}` : '';
+    const wsTag = r.workspace ? ` [ws:${r.workspace}]` : '';
+    const scoreTag = r.score !== null ? `  (${r.score.toFixed(4)})` : '';
+    const title = isTTY ? highlightTerms(r.title, qTerms) : r.title;
+    console.log(`${indent}${typeTag}${catTag}${wsTag}  ${r.id}  ${title}${scoreTag}`);
+    if (r.snippet) {
+        const snippet = isTTY ? highlightTerms(r.snippet, qTerms) : r.snippet;
+        console.log(`${indent}  ${snippet}`);
+    }
+    else if (r.summary) {
+        const summary = isTTY ? highlightTerms(truncate(r.summary, 80), qTerms) : truncate(r.summary, 80);
+        console.log(`${indent}  ${summary}`);
     }
-    return { min, max };
 }
-function mergeAndNormalize(wiki, code, limit) {
-    const WIKI_WEIGHT = 0.6;
-    const CODE_WEIGHT = 0.4;
-    const wikiScores = wiki.map(r => r.score ?? 0);
-    const codeScores = code.map(r => r.score ?? 0);
-    const wikiMM = wikiScores.length > 0 ? getMinMax(wikiScores) : { min: 0, max: 0 };
-    const codeMM = codeScores.length > 0 ? getMinMax(codeScores) : { min: 0, max: 0 };
-    const wikiRange = wikiMM.max - wikiMM.min || 1;
-    const codeRange = codeMM.max - codeMM.min || 1;
-    const merged = [];
-    for (const r of wiki) {
+function printCodeResult(r, indent, isTTY, qTerms) {
+    const scoreTag = r.score !== null ? `  (${r.score.toFixed(4)})` : '';
+    const name = isTTY ? highlightTerms(r.name, qTerms) : r.name;
+    const sigTag = r.signature ? `  ${truncate(r.signature, 60)}` : '';
+    console.log(`${indent}[${r.kind}] ${name}  ${r.filePath}${sigTag}${scoreTag}`);
+}
+const WIKI_TYPE_BOOST = {
+    spec: 1.15,
+    domain: 1.10,
+    knowhow: 1.05,
+    project: 0.95,
+    roadmap: 0.95,
+    issue: 0.85,
+    note: 0.80,
+};
+const CODE_KIND_BOOST = {
+    class: 1.20,
+    interface: 1.15,
+    function: 1.10,
+    method: 1.10,
+    component: 1.08,
+    route: 1.12,
+    type_alias: 1.05,
+    enum: 1.05,
+    constant: 1.00,
+    variable: 0.90,
+    field: 0.85,
+    property: 0.80,
+};
+function isCodeIdentifier(query) {
+    const trimmed = query.trim();
+    if (/^[a-z]+[A-Z]/.test(trimmed))
+        return true;
+    if (/^[A-Z][a-z]+[A-Z]/.test(trimmed))
+        return true;
+    if (/^[A-Z]{2,}[a-z]/.test(trimmed))
+        return true;
+    if (/^[a-z]+_[a-z]+/.test(trimmed))
+        return true;
+    if (/^[A-Z][a-zA-Z]+$/.test(trimmed) && !trimmed.includes(' '))
+        return true;
+    return false;
+}
+function splitCamelSnake(s) {
+    return s
+        .replace(/([a-z])([A-Z])/g, '$1 $2')
+        .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
+        .split(/[\s_\-.]+/)
+        .map(t => t.toLowerCase())
+        .filter(t => t.length > 0);
+}
+function codeNameMatchBonus(codeName, query) {
+    const nameLower = codeName.toLowerCase();
+    const queryLower = query.toLowerCase().trim();
+    if (!queryLower)
+        return 0;
+    if (nameLower === queryLower)
+        return 50;
+    if (nameLower.startsWith(queryLower))
+        return 30;
+    if (queryLower.startsWith(nameLower))
+        return 20;
+    if (nameLower.includes(queryLower) || queryLower.includes(nameLower))
+        return 10;
+    const queryTokens = splitCamelSnake(query);
+    const nameTokens = splitCamelSnake(codeName);
+    if (queryTokens.length === 0)
+        return 0;
+    const matched = queryTokens.filter(qt => nameTokens.some(nt => nt.includes(qt) || qt.includes(nt)));
+    if (matched.length === queryTokens.length)
+        return 15 + 5 * matched.length;
+    if (matched.length > 0)
+        return 5 * matched.length;
+    return 0;
+}
+function rankNormalize(items) {
+    if (items.length === 0)
+        return [];
+    const n = items.length;
+    const sorted = [...items].sort((a, b) => b.score - a.score);
+    const result = new Array(n);
+    let i = 0;
+    while (i < n) {
+        let j = i;
+        while (j < n - 1 && sorted[j + 1].score === sorted[j].score)
+            j++;
+        const avgRank = (i + j) / 2;
+        const normalizedRank = 1 - avgRank / n;
+        for (let k = i; k <= j; k++) {
+            result[sorted[k].index] = normalizedRank;
+        }
+        i = j + 1;
+    }
+    return result;
+}
+function mergeAndNormalize(wiki, code, limit, query) {
+    const q = query ?? '';
+    const isIdQuery = isCodeIdentifier(q);
+    const hasStrongCodeMatch = code.length > 0 && code.some(r => codeNameMatchBonus(r.name, q) >= 15);
+    const WIKI_WEIGHT = isIdQuery ? 0.4 : hasStrongCodeMatch ? 0.5 : 0.6;
+    const CODE_WEIGHT = isIdQuery ? 0.6 : hasStrongCodeMatch ? 0.5 : 0.4;
+    const codeNames = new Set(code.map(r => r.name.toLowerCase()));
+    const wikiScored = wiki.map((r, i) => {
         const raw = r.score ?? 0;
+        let typeBoost = WIKI_TYPE_BOOST[r.type] ?? 1.0;
+        if (r.id.startsWith('kg-') && codeNames.has(r.title.toLowerCase())) {
+            typeBoost *= 0.7;
+        }
+        return { ...r, finalScore: raw * typeBoost, index: i };
+    });
+    const codeScored = code.map((r, i) => {
+        const raw = r.score ?? 0;
+        const kindBoost = CODE_KIND_BOOST[r.kind] ?? 1.0;
+        const nameBonus = codeNameMatchBonus(r.name, q);
+        return { ...r, finalScore: raw * kindBoost + nameBonus, index: i };
+    });
+    const wikiRanks = rankNormalize(wikiScored.map(r => ({ index: r.index, score: r.finalScore })));
+    const codeRanks = rankNormalize(codeScored.map(r => ({ index: r.index, score: r.finalScore })));
+    const merged = [];
+    for (let i = 0; i < wikiScored.length; i++) {
+        const r = wikiScored[i];
         merged.push({
             source: 'wiki',
             kind: r.type,
             name: r.title,
             detail: r.category ? `${r.category}  ${r.id}` : r.id,
-            normalizedScore: ((raw - wikiMM.min) / wikiRange) * WIKI_WEIGHT,
+            normalizedScore: wikiRanks[i] * WIKI_WEIGHT,
+            snippet: r.snippet ?? undefined,
         });
     }
-    for (const r of code) {
-        const raw = r.score ?? 0;
+    for (let i = 0; i < codeScored.length; i++) {
+        const r = codeScored[i];
         merged.push({
             source: 'code',
             kind: r.kind,
             name: r.name,
             detail: r.filePath,
-            normalizedScore: ((raw - codeMM.min) / codeRange) * CODE_WEIGHT,
+            normalizedScore: codeRanks[i] * CODE_WEIGHT,
+            signature: r.signature,
         });
     }
     merged.sort((a, b) => b.normalizedScore - a.normalizedScore);