@cesarandreslopez/occ 0.8.9 → 0.8.11

package/dist/src/utils.js

@@ -1,6 +1,5 @@
 import fg from 'fast-glob';
 import ignore from 'ignore';
-import officeparser from 'officeparser';
 import path from 'node:path';
 import { readFile } from 'node:fs/promises';
 import { z } from 'zod';
@@ -122,6 +121,39 @@ export function abortIfNeeded(signal) {
         throw new OccAbortError();
     }
 }
+/**
+ * Map `items` through an async `fn` with at most `concurrency` calls in flight.
+ *
+ * Results are returned in input order (each worker writes into its item's slot).
+ * Non-finite `concurrency` (NaN/Infinity) falls back to 1. The signal is checked
+ * before each item is dispatched; an abort surfaces as OccAbortError. The first
+ * rejection from `fn` propagates and stops further dispatch (in-flight items may
+ * still complete) — callers that need per-item error capture should catch inside `fn`.
+ */
+export async function mapWithConcurrency(items, concurrency, fn, signal) {
+    const results = new Array(items.length);
+    if (items.length === 0)
+        return results;
+    const safeConcurrency = Number.isFinite(concurrency) ? Math.floor(concurrency) : 1;
+    const workerCount = Math.max(1, Math.min(safeConcurrency, items.length));
+    let cursor = 0;
+    let failed = false;
+    async function worker() {
+        while (!failed && cursor < items.length) {
+            abortIfNeeded(signal);
+            const index = cursor++;
+            try {
+                results[index] = await fn(items[index], index);
+            }
+            catch (error) {
+                failed = true;
+                throw error;
+            }
+        }
+    }
+    await Promise.all(Array.from({ length: workerCount }, () => worker()));
+    return results;
+}
 export function sanitizeForkExecArgv(execArgv = process.execArgv) {
     const sanitized = [];
     for (let i = 0; i < execArgv.length; i++) {
@@ -149,8 +181,65 @@ export async function writeStream(stream, text) {
         });
     });
 }
+/** Noisy pdf.js output prefixes suppressed while parsing PDFs (font parsing, deprecated API, etc.). */
+export const PDF_LOG_SUPPRESSED_PREFIXES = ['Warning: ', 'Info: ', 'Deprecated API usage: '];
+// Reference-counted console.log suppression shared by every PDF call site so
+// concurrent (and nested) suppressed sections never clobber each other's restore:
+// the original console.log is captured once when the depth goes 0 → 1 and
+// restored only when the last active section ends (depth back to 0).
+const activeSuppressionPrefixLists = [];
+let consoleLogSuppressionDepth = 0;
+let savedOriginalConsoleLog;
+/**
+ * Run `fn` while console.log lines starting with any of `prefixes` are dropped.
+ * Lines that match no active prefix list pass through unchanged. Safe to overlap
+ * and nest across concurrent callers.
+ */
+export async function suppressConsoleLogWhile(prefixes, fn) {
+    if (consoleLogSuppressionDepth++ === 0) {
+        const originalLog = console.log;
+        savedOriginalConsoleLog = originalLog;
+        console.log = (...args) => {
+            const first = args[0];
+            if (typeof first === 'string'
+                && activeSuppressionPrefixLists.some(list => list.some(prefix => first.startsWith(prefix)))) {
+                return;
+            }
+            originalLog.apply(console, args);
+        };
+    }
+    activeSuppressionPrefixLists.push(prefixes);
+    try {
+        return await fn();
+    }
+    finally {
+        const index = activeSuppressionPrefixLists.indexOf(prefixes);
+        if (index >= 0)
+            activeSuppressionPrefixLists.splice(index, 1);
+        if (--consoleLogSuppressionDepth === 0 && savedOriginalConsoleLog) {
+            console.log = savedOriginalConsoleLog;
+            savedOriginalConsoleLog = undefined;
+        }
+    }
+}
+/**
+ * Rethrow a lazy `import()` failure with the offending package named, so a
+ * missing/broken heavy dependency surfaces as an actionable diagnostic instead
+ * of a generic per-file parse failure.
+ */
+export function wrapDependencyLoadError(pkg, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`occ dependency '${pkg}' failed to load: ${message}`, { cause: error });
+}
+let officeparserModule;
+async function loadOfficeparser() {
+    officeparserModule ??= import('officeparser')
+        .catch((error) => wrapDependencyLoadError('officeparser', error));
+    return officeparserModule;
+}
 export async function extractOfficeText(input) {
-    const raw = await officeparser.parseOffice(input);
+    const { OfficeParser } = await loadOfficeparser();
+    const raw = await OfficeParser.parseOffice(input);
     if (typeof raw === 'string')
         return raw;
     if (raw && typeof raw.toText === 'function') {

package/dist/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,WAAW,CAAC;AAC3B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,YAAY,MAAM,cAAc,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,CAAC;IACpB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9B,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACtC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnF,MAAM,KAAK,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACxC,OAAO,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,CAA4B;IACvD,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IACzB,OAAO,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,UAAoB;IACvD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAC3B,OAAO,CAAC,MAAM,UAAU,EAAE,EAAE,MAAM,UAAU,KAAK,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAA2B;IACvD,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;CACX,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAa,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAU,CAAC;AAE5G,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAmBvD,SAAS,iBAAiB,CAAC,OAAgB,EAAE,MAAqD;IAChG,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,MAAM,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IACnC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,eAAe,CAAC,YAAoB,EAAE,QAAgB;IAC7D,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC;AACvG,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,OAAe,EACf,UAAoB;IAEpB,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,CAAC,YAAY,EAAE,eAAe,CAAC,EAAE;QAC/D,GAAG,EAAE,OAAO;QACZ,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;QACf,GAAG,EAAE,IAAI;QACT,mBAAmB,EAAE,KAAK;QAC1B,MAAM,EAAE,oBAAoB,CAAC,UAAU,CAAC;QACxC,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC7E,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjD,OAAO;YACL,QAAQ,EAAE,qBAAqB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/E,OAAO,EAAE,MAAM,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC1E,CAAC;IACJ,CAAC,CAAC,CAAC,CAAC;IAEJ,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7E,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QAChF,OAAO,SAAS,GAAG,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAe,EACf,UAAgC,EAAE;IAElC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW;QAC3C,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,2BAA2B,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;QAC/E,CAAC,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC;QAClE,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,cAAc,GAAG,OAAO,CAAC,qBAAqB,IAAI,OAAO,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC;QAC9F,CAAC,CAAC,MAAM,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC;QACzE,CAAC,CAAC,IAAI,CAAC;IAET,OAAO;QACL,OAAO,CAAC,YAAoB;YAC1B,MAAM,cAAc,GAAG,qBAAqB,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACjF,IAAI,WAAW,GAAG,KAAK,CAAC;YAExB,KAAK,MAAM,KAAK,IAAI,iBAAiB,EAAE,CAAC;gBACtC,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC;oBAAE,SAAS;gBAC/D,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;oBAC5C,CAAC,CAAC,cAAc;oBAChB,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACpD,WAAW,GAAG,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/E,CAAC;YAED,IAAI,aAAa,EAAE,CAAC;gBAClB,WAAW,GAAG,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;YACnF,CAAC;YAED,IAAI,cAAc,GAAG,KAAK,CAAC;YAC3B,IAAI,cAAc,EAAE,CAAC;gBACnB,cAAc,GAAG,iBAAiB,CAAC,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;YACjF,CAAC;YAED,OAAO,WAAW,IAAI,cAAc,CAAC;QACvC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAoB;IAChD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,aAAa,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,WAAqB,OAAO,CAAC,QAAQ;IACxE,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,GAAG,KAAK,cAAc,EAAE,CAAC;YAC3B,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC;YAAE,SAAS;QAC9C,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAClC,OAAO,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAA6B,EAAE,IAAY;IAC3E,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAoB,EAAE,EAAE;YAC1C,IAAI,KAAK;gBAAE,MAAM,CAAC,KAAK,CAAC,CAAC;;gBACpB,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAAsB;IAC5D,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAClD,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IACxC,IAAI,GAAG,IAAI,OAAQ,GAA4B,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QACtE,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAE,GAAgC,CAAC,MAAM,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/dist/src/workspace/bundle.d.ts

@@ -1,3 +1,4 @@
+import { type CodeIndexStore, type StoreStrategy } from '../code/store.js';
 import { type DocumentChunk, type DocumentChunkOptions } from '../doc/chunk.js';
 import type { CodebaseIndex, ContentMode } from '../code/types.js';
 import type { CodebaseIndexSlim } from '../code/slim.js';
@@ -26,6 +27,29 @@ export interface WorkspaceBundleOptions {
     maxDocumentChunks?: number;
     maxCodeDocumentReferences?: number;
     chunk?: Pick<DocumentChunkOptions, 'maxTokens' | 'overlapTokens' | 'countTokens'>;
+    /**
+     * Persistent code-index cache directory. When set (and no `store` is
+     * provided), the bundle resolves its code index through
+     * `openCodeIndexStore` instead of `buildCodebaseIndexIsolated`: cache hits
+     * skip parsing entirely, and cache misses build **in-process** (no
+     * subprocess isolation — this is an explicit opt-in). Cache entries are
+     * keyed by `(contentMode, build-option fingerprint)`, so the bundle options
+     * must match the consumer's own store options to share an entry — when in
+     * doubt, pass `store` directly (recommended).
+     */
+    cacheDir?: string;
+    /** Store strategy used with `cacheDir`/`store` (default `'ensure-fresh'`). */
+    cacheStrategy?: StoreStrategy;
+    /**
+     * Bring-your-own code index store. Takes precedence over `cacheDir`; the
+     * bundle never disposes a caller-provided store.
+     */
+    store?: CodeIndexStore;
+    /**
+     * Run the description / analysis / documents / code phases concurrently
+     * (default `true`). `false` restores the literal sequential path.
+     */
+    concurrentPhases?: boolean;
     signal?: AbortSignal;
     onProgress?: OnProgress;
 }

package/dist/src/workspace/bundle.js

@@ -4,9 +4,20 @@ import { describeWorkspace } from './describe.js';
 import { inspectWorkspaceDocumentSet } from './documents.js';
 import { buildCodebaseIndexIsolated } from '../code/isolated.js';
 import { previewCodebaseSize } from '../code/preview.js';
-import { chunkDocument } from '../doc/chunk.js';
-import { abortIfNeeded, normalizeRelativePath } from '../utils.js';
+import { openCodeIndexStore } from '../code/store.js';
+import { slimifyIndex } from '../code/slim.js';
+import { chunkDocument, chunkDocumentFromMarkdown } from '../doc/chunk.js';
+import { abortIfNeeded, mapWithConcurrency, normalizeRelativePath } from '../utils.js';
+import { isOccAbortError } from '../errors.js';
 const DEFAULT_EXCLUDE_DIR = ['node_modules', '.git', 'dist', 'vendor', 'build', 'coverage', 'target'];
+// Step descriptors shared by the sequential and concurrent phase paths.
+const STEP_DESCRIPTION = { phase: 'description', detail: 'Describe workspace' };
+const STEP_ANALYSIS = { phase: 'stats', detail: 'Analyze workspace totals' };
+const STEP_DOCUMENTS = { phase: 'inspect', detail: 'Inspect documents' };
+const STEP_CODE_PREVIEW = { phase: 'code-preview', detail: 'Preview code index size' };
+const STEP_CODE_INDEX = { phase: 'index', detail: 'Build code index' };
+const STEP_DOCUMENT_CHUNK = { phase: 'document-chunk', detail: 'Chunk documents' };
+const STEP_OUTLINE = { phase: 'outline', detail: 'Build workspace outline' };
 function reportStep(onProgress, step, completed, total, startedAt) {
     onProgress?.({
         phase: step.phase,
@@ -87,6 +98,9 @@ function buildOutline(rootDir, description, documents, codeIndex) {
     }
     return root;
 }
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 function detectCodeDocumentReferences(codeIndex, documents, limit) {
     if (!codeIndex || !documents || limit <= 0)
         return [];
@@ -101,6 +115,23 @@ function detectCodeDocumentReferences(codeIndex, documents, limit) {
         seenNames.add(node.name);
         return true;
     }).slice(0, 1_000);
+    // Compile each symbol pattern once instead of per line.
+    const compiled = symbols.map((symbol) => ({
+        symbol,
+        pattern: new RegExp(`\\b${escapeRegExp(symbol.name)}\\b`),
+    }));
+    // One alternation over all (longest-first, already-escaped) names, used
+    // purely as a per-line skip filter — extraction still runs the per-symbol
+    // patterns, so output order and the limit early-return are unchanged.
+    let prescreen = null;
+    if (symbols.length > 0) {
+        try {
+            prescreen = new RegExp(`\\b(?:${symbols.map((symbol) => escapeRegExp(symbol.name)).join('|')})\\b`);
+        }
+        catch {
+            prescreen = null; // Fall back to scanning every line with the compiled patterns.
+        }
+    }
     const references = [];
     for (const doc of documents.documents) {
         if (!doc.markdownContent)
@@ -110,8 +141,9 @@ function detectCodeDocumentReferences(codeIndex, documents, limit) {
             const line = lines[lineIndex];
             if (!line.trim())
                 continue;
-            for (const symbol of symbols) {
-                const pattern = new RegExp(`\\b${symbol.name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`);
+            if (prescreen && !prescreen.test(line))
+                continue;
+            for (const { symbol, pattern } of compiled) {
                 if (!pattern.test(line))
                     continue;
                 references.push({
@@ -134,32 +166,56 @@ async function buildDocumentChunks(documents, options, onProgress) {
     if (!documents)
         return [];
     const maxChunks = options.maxDocumentChunks ?? 500;
-    const chunks = [];
-    for (let index = 0; index < documents.documents.length; index++) {
-        abortIfNeeded(options.signal);
-        const doc = documents.documents[index];
+    const total = documents.documents.length;
+    let completed = 0;
+    let accumulatedChunks = 0;
+    // Workers skip documents once the running chunk total reaches the cap, so
+    // conversion stops near it instead of chunking every document (documents
+    // already in flight still finish — up to the concurrency width of overshoot).
+    // Items are dispatched in document order, so every document that contributed
+    // to the total precedes any skipped one; flattening in document order plus
+    // the post-join slice stays the authoritative cap, and the returned chunks
+    // are identical to chunking everything.
+    const perDocument = await mapWithConcurrency(documents.documents, 5, async (doc) => {
+        if (accumulatedChunks >= maxChunks)
+            return undefined;
+        let docChunks;
         try {
-            const docChunks = await chunkDocument(doc.filePath, {
-                ...options.chunk,
-                relativePath: doc.relativePath,
-            });
-            chunks.push(...docChunks);
-            if (chunks.length >= maxChunks)
-                return chunks.slice(0, maxChunks);
+            docChunks = doc.markdownContent != null
+                // Markdown was already produced by document inspection — reuse it
+                // instead of re-reading and re-converting the file. Per-document
+                // values are spread last so caller chunk options cannot clobber them.
+                ? chunkDocumentFromMarkdown(doc.markdownContent, {
+                    ...options.chunk,
+                    filePath: doc.filePath,
+                    relativePath: doc.relativePath,
+                })
+                : await chunkDocument(doc.filePath, {
+                    ...options.chunk,
+                    relativePath: doc.relativePath,
+                });
         }
         catch {
             // Document conversion errors are already represented in inspectDocuments.
         }
+        if (docChunks)
+            accumulatedChunks += docChunks.length;
         onProgress?.({
             phase: 'document-chunk',
-            total: documents.documents.length,
-            completed: index + 1,
+            total,
+            completed: ++completed,
             detail: doc.relativePath,
             currentPath: doc.filePath,
             scope: 'document',
         });
+        return docChunks;
+    }, options.signal);
+    const chunks = [];
+    for (const docChunks of perDocument) {
+        if (docChunks)
+            chunks.push(...docChunks);
     }
-    return chunks;
+    return chunks.slice(0, maxChunks);
 }
 export async function bundleWorkspace(rootDir, options = {}) {
     const startedAt = Date.now();
@@ -170,103 +226,253 @@ export async function bundleWorkspace(rootDir, options = {}) {
     const includeCode = options.includeCode !== false;
     const includeDocumentChunks = options.includeDocumentChunks ?? false;
     const includeCodeDocumentReferences = options.includeCodeDocumentReferences ?? true;
+    const concurrentPhases = options.concurrentPhases !== false;
     const onProgress = options.onProgress;
     const errors = [];
     const shared = commonWorkspaceOptions(options);
     const steps = [
-        ...(includeDescription ? [{ phase: 'description', detail: 'Describe workspace' }] : []),
-        ...(includeAnalysis ? [{ phase: 'stats', detail: 'Analyze workspace totals' }] : []),
-        ...(includeDocuments ? [{ phase: 'inspect', detail: 'Inspect documents' }] : []),
-        ...(includeCode ? [{ phase: 'code-preview', detail: 'Preview code index size' }] : []),
-        ...(includeCode ? [{ phase: 'index', detail: 'Build code index' }] : []),
-        ...(includeDocumentChunks ? [{ phase: 'document-chunk', detail: 'Chunk documents' }] : []),
-        { phase: 'outline', detail: 'Build workspace outline' },
+        ...(includeDescription ? [STEP_DESCRIPTION] : []),
+        ...(includeAnalysis ? [STEP_ANALYSIS] : []),
+        ...(includeDocuments ? [STEP_DOCUMENTS] : []),
+        ...(includeCode ? [STEP_CODE_PREVIEW] : []),
+        ...(includeCode ? [STEP_CODE_INDEX] : []),
+        ...(includeDocumentChunks ? [STEP_DOCUMENT_CHUNK] : []),
+        STEP_OUTLINE,
     ];
     let completedSteps = 0;
+    const scopedCodeProgress = (event) => onProgress?.({ ...event, scope: event.scope ?? 'code' });
+    // Resolves the code index either through a persistent store (cacheDir/store
+    // options — cache hits skip parsing, misses build in-process) or through the
+    // pre-existing isolated subprocess build.
+    const acquireCodeIndex = async () => {
+        const slim = options.slimCodeIndex ?? true;
+        if (options.store || options.cacheDir) {
+            const store = options.store ?? openCodeIndexStore({
+                repoRoot: resolvedRoot,
+                cacheDir: options.cacheDir,
+                excludeDir: shared.excludeDir,
+                noGitignore: shared.noGitignore,
+                ignorePatterns: shared.ignorePatterns,
+                overlayIgnorePatterns: shared.overlayIgnorePatterns,
+                contentMode: options.contentMode ?? (slim ? 'none' : 'excerpt'),
+                maxFiles: options.maxCodeFiles,
+                maxBytes: options.maxCodeBytes,
+                onBudgetExceeded: 'truncate',
+            });
+            const session = await store.getSession({
+                strategy: options.cacheStrategy ?? 'ensure-fresh',
+                signal: options.signal,
+                onProgress: scopedCodeProgress,
+            });
+            return slim ? slimifyIndex(session.getIndex()) : session.getIndex();
+        }
+        return buildCodebaseIndexIsolated({
+            repoRoot: resolvedRoot,
+            ...shared,
+            contentMode: options.contentMode ?? (slim ? 'none' : 'excerpt'),
+            maxFiles: options.maxCodeFiles,
+            maxBytes: options.maxCodeBytes,
+            onBudgetExceeded: 'truncate',
+            slim,
+            signal: options.signal,
+        }, scopedCodeProgress);
+    };
     reportStep(onProgress, { phase: 'bundle', detail: 'Workspace bundle started' }, completedSteps, steps.length, startedAt);
     let description;
-    if (includeDescription) {
-        abortIfNeeded(options.signal);
-        try {
-            description = await describeWorkspace(resolvedRoot, shared);
-        }
-        catch (err) {
-            const error = err;
-            errors.push({ scope: 'description', path: resolvedRoot, message: error.message });
-        }
-        reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
-    }
     let analysis;
-    if (includeAnalysis) {
-        abortIfNeeded(options.signal);
-        try {
-            analysis = await analyzeWorkspace(resolvedRoot, {
-                ...shared,
-                includeDocuments,
-                includeCode,
-            }, (event) => onProgress?.({ ...event, scope: event.scope ?? 'workspace' }));
-        }
-        catch (err) {
+    let documents;
+    let codePreview;
+    let codeIndex;
+    if (concurrentPhases) {
+        // Phases run concurrently as error-capturing tasks. Errors are collected
+        // per phase and assembled post-join in the canonical sequential order
+        // (description, analysis, documents, code-preview, code) so errors[]
+        // content and order match the concurrentPhases: false path. Step
+        // completion order may vary; the shared counter stays monotonic and inner
+        // per-phase events are already scope-tagged. Once the signal aborts, tasks
+        // skip un-started phase bodies and suppress further step emissions; the
+        // post-join abortIfNeeded turns the abort into a rejection.
+        let caughtAbort;
+        const phaseErrors = {
+            'description': [],
+            'analysis': [],
+            'documents': [],
+            'code-preview': [],
+            'code': [],
+        };
+        const capture = (scope, err) => {
+            if (isOccAbortError(err)) {
+                caughtAbort ??= err;
+                return;
+            }
             const error = err;
-            errors.push({ scope: 'analysis', path: resolvedRoot, message: error.message });
+            phaseErrors[scope].push({ scope, path: resolvedRoot, message: error.message });
+        };
+        const tasks = [];
+        if (includeDescription) {
+            tasks.push((async () => {
+                if (options.signal?.aborted)
+                    return; // already aborted — skip the phase entirely
+                try {
+                    description = await describeWorkspace(resolvedRoot, shared);
+                }
+                catch (err) {
+                    capture('description', err);
+                }
+                if (options.signal?.aborted)
+                    return; // aborted mid-phase — suppress the completion event
+                reportStep(onProgress, STEP_DESCRIPTION, ++completedSteps, steps.length, startedAt);
+            })());
         }
-        reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
-    }
-    let documents;
-    if (includeDocuments) {
-        abortIfNeeded(options.signal);
-        try {
-            documents = await inspectWorkspaceDocumentSet(resolvedRoot, {
-                ...shared,
-                includeMarkdown: includeCodeDocumentReferences,
-                includeDataFiles: options.includeDataFiles,
-                maxFiles: options.maxDocumentFiles,
-                maxReferenceFiles: options.maxReferenceFiles,
-            }, (event) => onProgress?.({ ...event, scope: event.scope ?? 'document' }));
+        if (includeAnalysis) {
+            tasks.push((async () => {
+                if (options.signal?.aborted)
+                    return; // already aborted — skip the phase entirely
+                try {
+                    analysis = await analyzeWorkspace(resolvedRoot, {
+                        ...shared,
+                        includeDocuments,
+                        includeCode,
+                    }, (event) => onProgress?.({ ...event, scope: event.scope ?? 'workspace' }));
+                }
+                catch (err) {
+                    capture('analysis', err);
+                }
+                if (options.signal?.aborted)
+                    return; // aborted mid-phase — suppress the completion event
+                reportStep(onProgress, STEP_ANALYSIS, ++completedSteps, steps.length, startedAt);
+            })());
         }
-        catch (err) {
-            const error = err;
-            errors.push({ scope: 'documents', path: resolvedRoot, message: error.message });
+        if (includeDocuments) {
+            tasks.push((async () => {
+                if (options.signal?.aborted)
+                    return; // already aborted — skip the phase entirely
+                try {
+                    documents = await inspectWorkspaceDocumentSet(resolvedRoot, {
+                        ...shared,
+                        includeMarkdown: includeCodeDocumentReferences,
+                        includeDataFiles: options.includeDataFiles,
+                        maxFiles: options.maxDocumentFiles,
+                        maxReferenceFiles: options.maxReferenceFiles,
+                    }, (event) => onProgress?.({ ...event, scope: event.scope ?? 'document' }));
+                }
+                catch (err) {
+                    capture('documents', err);
+                }
+                if (options.signal?.aborted)
+                    return; // aborted mid-phase — suppress the completion event
+                reportStep(onProgress, STEP_DOCUMENTS, ++completedSteps, steps.length, startedAt);
+            })());
         }
-        reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
-    }
-    let codePreview;
-    let codeIndex;
-    if (includeCode) {
+        if (includeCode) {
+            // Code preview then index — sequential within this task.
+            tasks.push((async () => {
+                if (options.signal?.aborted)
+                    return; // already aborted — skip the phase entirely
+                try {
+                    codePreview = await previewCodebaseSize({
+                        repoRoot: resolvedRoot,
+                        ...shared,
+                        maxFiles: options.maxCodeFiles,
+                        maxBytes: options.maxCodeBytes,
+                        signal: options.signal,
+                    });
+                }
+                catch (err) {
+                    capture('code-preview', err);
+                }
+                if (options.signal?.aborted)
+                    return; // aborted mid-phase — suppress events and skip the index build
+                reportStep(onProgress, STEP_CODE_PREVIEW, ++completedSteps, steps.length, startedAt);
+                if (options.signal?.aborted)
+                    return; // abort fired from the preview step emission
+                try {
+                    codeIndex = await acquireCodeIndex();
+                }
+                catch (err) {
+                    capture('code', err);
+                }
+                if (options.signal?.aborted)
+                    return; // aborted mid-phase — suppress the completion event
+                reportStep(onProgress, STEP_CODE_INDEX, ++completedSteps, steps.length, startedAt);
+            })());
+        }
+        await Promise.all(tasks);
+        errors.push(...phaseErrors.description, ...phaseErrors.analysis, ...phaseErrors.documents, ...phaseErrors['code-preview'], ...phaseErrors.code);
         abortIfNeeded(options.signal);
-        try {
-            codePreview = await previewCodebaseSize({
-                repoRoot: resolvedRoot,
-                ...shared,
-                maxFiles: options.maxCodeFiles,
-                maxBytes: options.maxCodeBytes,
-                signal: options.signal,
-            });
+        if (caughtAbort)
+            throw caughtAbort;
+    }
+    else {
+        if (includeDescription) {
+            abortIfNeeded(options.signal);
+            try {
+                description = await describeWorkspace(resolvedRoot, shared);
+            }
+            catch (err) {
+                const error = err;
+                errors.push({ scope: 'description', path: resolvedRoot, message: error.message });
+            }
+            reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
         }
-        catch (err) {
-            const error = err;
-            errors.push({ scope: 'code-preview', path: resolvedRoot, message: error.message });
+        if (includeAnalysis) {
+            abortIfNeeded(options.signal);
+            try {
+                analysis = await analyzeWorkspace(resolvedRoot, {
+                    ...shared,
+                    includeDocuments,
+                    includeCode,
+                }, (event) => onProgress?.({ ...event, scope: event.scope ?? 'workspace' }));
+            }
+            catch (err) {
+                const error = err;
+                errors.push({ scope: 'analysis', path: resolvedRoot, message: error.message });
+            }
+            reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
         }
-        reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
-        abortIfNeeded(options.signal);
-        try {
-            const slim = options.slimCodeIndex ?? true;
-            codeIndex = await buildCodebaseIndexIsolated({
-                repoRoot: resolvedRoot,
-                ...shared,
-                contentMode: options.contentMode ?? (slim ? 'none' : 'excerpt'),
-                maxFiles: options.maxCodeFiles,
-                maxBytes: options.maxCodeBytes,
-                onBudgetExceeded: 'truncate',
-                slim,
-                signal: options.signal,
-            }, (event) => onProgress?.({ ...event, scope: event.scope ?? 'code' }));
+        if (includeDocuments) {
+            abortIfNeeded(options.signal);
+            try {
+                documents = await inspectWorkspaceDocumentSet(resolvedRoot, {
+                    ...shared,
+                    includeMarkdown: includeCodeDocumentReferences,
+                    includeDataFiles: options.includeDataFiles,
+                    maxFiles: options.maxDocumentFiles,
+                    maxReferenceFiles: options.maxReferenceFiles,
+                }, (event) => onProgress?.({ ...event, scope: event.scope ?? 'document' }));
+            }
+            catch (err) {
+                const error = err;
+                errors.push({ scope: 'documents', path: resolvedRoot, message: error.message });
+            }
+            reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
         }
-        catch (err) {
-            const error = err;
-            errors.push({ scope: 'code', path: resolvedRoot, message: error.message });
+        if (includeCode) {
+            abortIfNeeded(options.signal);
+            try {
+                codePreview = await previewCodebaseSize({
+                    repoRoot: resolvedRoot,
+                    ...shared,
+                    maxFiles: options.maxCodeFiles,
+                    maxBytes: options.maxCodeBytes,
+                    signal: options.signal,
+                });
+            }
+            catch (err) {
+                const error = err;
+                errors.push({ scope: 'code-preview', path: resolvedRoot, message: error.message });
+            }
+            reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
+            abortIfNeeded(options.signal);
+            try {
+                codeIndex = await acquireCodeIndex();
+            }
+            catch (err) {
+                const error = err;
+                errors.push({ scope: 'code', path: resolvedRoot, message: error.message });
+            }
+            reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
         }
-        reportStep(onProgress, steps[completedSteps], ++completedSteps, steps.length, startedAt);
     }
     const documentChunks = includeDocumentChunks
         ? await buildDocumentChunks(documents, options, onProgress)