@sdsrs/codeagent 0.2.1 → 0.4.0

package/README.md

@@ -21,16 +21,23 @@ devx chat
 CodeAgent 的核心是 **Context Broker** —— 一个 5 步管线，在每次 LLM 调用前自动聚合精准上下文：
 
 ```
-UserQuery → QueryParser → 并行查询(Code Graph + Memory + Orchestration) → Merge → Compress → ContextPack
+UserQuery → QueryParser → 真正异步并行查询(Code Graph + Memory + Orchestration) → 去重合并 → 智能压缩 → ContextPack
 ```
 
+**关键特性：**
+- 真正的异步并行 — 使用 `execSafeAsync` + `Promise.allSettled`，非假并行
+- 智能 Token 预算 — 动态重分配空源预算，bugWarnings 封顶保护，跨源文件去重
+- 阶段感知记忆检索 — 按 implement/debug/brainstorm 等阶段过滤记忆类型
+- 全面优雅降级 — 任何外部工具缺失不阻塞，降级到空上下文
+- 配置文件生效 — `config set` 的值自动成为 CLI 默认值
+
 它消费 3 个已有系统但不合并代码，通过 CLI 调用保持松耦合：
 
 | 系统 | 语言 | 职责 | 调用方式 |
 |------|------|------|---------|
-| [Code Graph MCP](https://github.com/sdsrs/code-graph-mcp) | Rust | AST 解析、混合搜索、调用图、影响分析 | CLI (`code-graph-mcp`) |
-| [claude-mem-lite](https://github.com/sdsrs/claude-mem-lite) | Node.js | 类型化记忆、FTS5+向量召回 | CLI (`claude-mem-lite`) |
-| [GSD-Lite](https://github.com/sdsrs/gsd-lite) / Superpowers | Node.js | 编排状态机、阶段管理 | 读 state.json / 读 skills 目录 |
+| [Code Graph MCP](https://github.com/sdsrss/code-graph-mcp) | Rust | AST 解析、混合搜索、调用图、影响分析 | CLI (`code-graph-mcp`) |
+| [claude-mem-lite](https://github.com/sdsrss/claude-mem-lite) | Node.js | 类型化记忆、FTS5+向量召回 | CLI (`claude-mem-lite`) |
+| [GSD-Lite](https://github.com/sdsrss/gsd-lite) / Superpowers | Node.js | 编排状态机、阶段管理 | 读 state.json / 读 skills 目录 |
 
 ## 双模式运行
 
@@ -90,6 +97,7 @@ npm run install-hooks:global
 |------|---------|------|
 | `UserPromptSubmit` | 每次用户输入 | Context Broker 生成 ContextPack → 注入到 prompt |
 | `SessionStart` | 会话开始 | 注入项目概要 + 活跃编排状态 |
+| `PostCompact` | 上下文压缩后 | 重注入编排状态 + bug 警告，防止压缩丢失 |
 | `Stop` | 会话结束 | 从对话中提取关键发现 → 写入记忆 |
 
 ## 其他命令
@@ -120,7 +128,10 @@ codeagent session delete <id>             # 删除会话
 
 ### 配置
 
+配置值自动成为 CLI 命令的默认值（命令行参数仍然优先）：
+
 ```bash
+codeagent config set provider api                # 默认使用 API provider
 codeagent config set orchestration superpowers   # 切换编排引擎
 codeagent config set model claude-opus-4-6       # 设置模型
 codeagent config set maxBudgetUsd 5.0            # 设置预算上限
@@ -193,6 +204,7 @@ src/
 ├── hooks/                  # Claude Code 生命周期 hooks
 │   ├── user-prompt.ts      # UserPromptSubmit → Broker → 注入
 │   ├── session-start.ts    # SessionStart → 项目概要
+│   ├── post-compact.ts     # PostCompact → 恢复编排状态 + bug 警告
 │   └── stop.ts             # Stop → 记忆写入
 │
 ├── skills/                 # Claude Code Skills
@@ -239,11 +251,11 @@ if (hasContent(pack)) {
 ## 开发
 
 ```bash
-git clone https://github.com/sdsrs/codeagent.git
+git clone https://github.com/sdsrss/codeagent.git
 cd codeagent
 npm install
 npm run build
-npm test                    # 66 tests (unit + integration)
+npm test                    # 172 tests (unit + integration)
 npm run dev                 # watch mode
 ```
 

package/dist/adapters/__tests__/code-graph.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=code-graph.test.d.ts.map

package/dist/adapters/__tests__/code-graph.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"code-graph.test.d.ts","sourceRoot":"","sources":["../../../src/adapters/__tests__/code-graph.test.ts"],"names":[],"mappings":""}

package/dist/adapters/__tests__/code-graph.test.js

@@ -0,0 +1,118 @@
+import { describe, it, expect } from 'vitest';
+import { parseRelevantFiles, parseSymbols, getRepoMapAsync } from '../code-graph.js';
+describe('getRepoMapAsync', () => {
+    it('returns empty string when .code-graph/index.db does not exist', async () => {
+        const result = await getRepoMapAsync('/tmp/nonexistent-repo-xyz');
+        expect(result).toBe('');
+    });
+    it('returns a string (resolves without throwing) for valid path without db', async () => {
+        // Even if the CLI fails, should resolve — never reject
+        const result = await getRepoMapAsync('/tmp');
+        expect(typeof result).toBe('string');
+    });
+});
+describe('parseRelevantFiles', () => {
+    it('extracts file paths from code-graph output', () => {
+        const raw = `
+Results for "context broker":
+  src/broker/broker.ts — ContextBroker class, main pipeline
+  src/broker/compressor.ts — budget enforcement
+  src/utils/exec.ts — subprocess execution
+`;
+        const files = parseRelevantFiles(raw);
+        expect(files.length).toBeGreaterThanOrEqual(3);
+        expect(files.map(f => f.path)).toContain('src/broker/broker.ts');
+        expect(files.map(f => f.path)).toContain('src/broker/compressor.ts');
+    });
+    it('deduplicates file paths', () => {
+        const raw = `
+  src/broker/broker.ts — first hit
+  src/broker/broker.ts — second hit
+`;
+        const files = parseRelevantFiles(raw);
+        const paths = files.map(f => f.path);
+        expect(new Set(paths).size).toBe(paths.length);
+    });
+    it('excludes version-like patterns and URLs', () => {
+        const raw = `
+  v1.2.3/something.ts should be excluded
+  https://example.com/file.ts should be excluded
+  node_modules/pkg/index.js should be excluded
+  src/real/file.ts should be included
+`;
+        const files = parseRelevantFiles(raw);
+        const paths = files.map(f => f.path);
+        expect(paths).toContain('src/real/file.ts');
+        expect(paths.some(p => p.includes('node_modules'))).toBe(false);
+    });
+    it('returns empty array for empty input', () => {
+        expect(parseRelevantFiles('')).toEqual([]);
+    });
+    it('caps at 10 files', () => {
+        const lines = Array.from({ length: 20 }, (_, i) => `  src/file${i}/module.ts — hit`);
+        const files = parseRelevantFiles(lines.join('\n'));
+        expect(files.length).toBeLessThanOrEqual(10);
+    });
+    it('extracts descriptive reason from structured format', () => {
+        const raw = `src/broker/broker.ts — ContextBroker pipeline orchestration
+src/adapters/memory.ts — memory query adapter`;
+        const files = parseRelevantFiles(raw);
+        expect(files).toHaveLength(2);
+        expect(files[0].reason).toBe('ContextBroker pipeline orchestration');
+        expect(files[1].reason).toBe('memory query adapter');
+    });
+    it('falls back to static reason for unstructured paths', () => {
+        const raw = `Found in src/utils/exec.ts and src/utils/tokens.ts`;
+        const files = parseRelevantFiles(raw);
+        expect(files.length).toBeGreaterThan(0);
+        expect(files[0].reason).toBe('code-graph search hit');
+    });
+});
+describe('parseSymbols', () => {
+    it('extracts function and class symbols', () => {
+        const raw = `
+function buildContextPack() { ... }
+class ContextBroker { ... }
+interface AgentProvider { ... }
+`;
+        const symbols = parseSymbols(raw);
+        expect(symbols.map(s => s.name)).toContain('buildContextPack');
+        expect(symbols.map(s => s.name)).toContain('ContextBroker');
+        expect(symbols.map(s => s.name)).toContain('AgentProvider');
+    });
+    it('deduplicates symbols by name', () => {
+        const raw = `
+function foo() {}
+function foo() {}
+`;
+        const symbols = parseSymbols(raw);
+        expect(symbols.filter(s => s.name === 'foo').length).toBe(1);
+    });
+    it('returns empty array for empty input', () => {
+        expect(parseSymbols('')).toEqual([]);
+    });
+    it('caps at 15 symbols', () => {
+        const lines = Array.from({ length: 30 }, (_, i) => `function fn${i}() {}`);
+        const symbols = parseSymbols(lines.join('\n'));
+        expect(symbols.length).toBeLessThanOrEqual(15);
+    });
+    it('extracts kind correctly', () => {
+        const raw = 'class MyClass { }\nfunction myFunc() { }';
+        const symbols = parseSymbols(raw);
+        const cls = symbols.find(s => s.name === 'MyClass');
+        const fn = symbols.find(s => s.name === 'myFunc');
+        expect(cls?.kind).toBe('class');
+        expect(fn?.kind).toBe('function');
+    });
+    it('extracts file association from structured format', () => {
+        const raw = `function parseQuery in src/broker/query-parser.ts
+class ContextBroker in src/broker/broker.ts`;
+        const symbols = parseSymbols(raw);
+        expect(symbols).toHaveLength(2);
+        expect(symbols[0].name).toBe('parseQuery');
+        expect(symbols[0].file).toBe('src/broker/query-parser.ts');
+        expect(symbols[1].name).toBe('ContextBroker');
+        expect(symbols[1].file).toBe('src/broker/broker.ts');
+    });
+});
+//# sourceMappingURL=code-graph.test.js.map

package/dist/adapters/__tests__/code-graph.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"code-graph.test.js","sourceRoot":"","sources":["../../../src/adapters/__tests__/code-graph.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAErF,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,2BAA2B,CAAC,CAAC;QAClE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;QACtF,uDAAuD;QACvD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,GAAG,GAAG;;;;;CAKf,CAAC;QACE,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,GAAG,GAAG;;;CAGf,CAAC;QACE,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,GAAG,GAAG;;;;;CAKf,CAAC;QACE,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;QACrF,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,GAAG,GAAG;8CAC8B,CAAC;QAC3C,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACrE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,GAAG,GAAG,oDAAoD,CAAC;QACjE,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,GAAG,GAAG;;;;CAIf,CAAC;QACE,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC/D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,GAAG,GAAG;;;CAGf,CAAC;QACE,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,GAAG,GAAG,0CAA0C,CAAC;QACvD,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QACpD,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,GAAG,GAAG;4CAC4B,CAAC;QACzC,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC3D,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/adapters/__tests__/memory.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=memory.test.d.ts.map

package/dist/adapters/__tests__/memory.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory.test.d.ts","sourceRoot":"","sources":["../../../src/adapters/__tests__/memory.test.ts"],"names":[],"mappings":""}

package/dist/adapters/__tests__/memory.test.js

@@ -0,0 +1,168 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+// Mock exec functions before importing the module under test
+vi.mock('../../utils/exec.js', () => ({
+    execSafe: vi.fn(),
+    execSafeAsync: vi.fn(),
+}));
+// Mock truncateToTokenBudget to pass-through
+vi.mock('../../utils/tokens.js', () => ({
+    truncateToTokenBudget: vi.fn((raw, _budget) => raw),
+}));
+import { queryMemory } from '../memory.js';
+import { execSafeAsync } from '../../utils/exec.js';
+const mockExecSafeAsync = vi.mocked(execSafeAsync);
+function makeParsed(overrides = {}) {
+    return {
+        filePaths: [],
+        symbols: ['processPayment'],
+        keywords: ['payment', 'refund'],
+        intent: 'general',
+        isActionOnly: false,
+        ...overrides,
+    };
+}
+function okResult(stdout) {
+    return { stdout, ok: true };
+}
+const EMPTY_RESULT = { stdout: '', ok: false };
+describe('queryMemory', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // Default: all execSafe calls return empty
+        mockExecSafeAsync.mockResolvedValue(EMPTY_RESULT);
+    });
+    describe('implement stage — searches both bugfix AND decision types', () => {
+        it('calls execSafe for both types when stage is implement', async () => {
+            mockExecSafeAsync.mockResolvedValue(okResult('#1 [bugfix] Fix timeout\nBody'));
+            await queryMemory(makeParsed(), 600, 'implement');
+            // getSearchTypes('implement') returns ['bugfix', 'decision']
+            // We expect two typed search calls (bugfix, decision)
+            // Since 'bugfix' IS in types, no extra bugfix call
+            const calls = mockExecSafeAsync.mock.calls;
+            expect(calls).toHaveLength(2);
+            // First call: --type bugfix
+            expect(calls[0][1]).toContain('--type');
+            expect(calls[0][1]).toContain('bugfix');
+            // Second call: --type decision
+            expect(calls[1][1]).toContain('--type');
+            expect(calls[1][1]).toContain('decision');
+        });
+        it('includes results from both typed searches', async () => {
+            mockExecSafeAsync
+                .mockResolvedValueOnce(okResult('#1 [bugfix] Fix timeout\nTimeout body'))
+                .mockResolvedValueOnce(okResult('#2 [decision] Use retry\nRetry body'));
+            const result = await queryMemory(makeParsed(), 600, 'implement');
+            // Both results should be present in raw output
+            expect(result.raw).toContain('Fix timeout');
+            expect(result.raw).toContain('Use retry');
+            // bugWarnings and memories should be separated correctly
+            expect(result.bugWarnings).toHaveLength(1);
+            expect(result.bugWarnings[0].title).toBe('Fix timeout');
+            expect(result.memories).toHaveLength(1);
+            expect(result.memories[0].title).toBe('Use retry');
+        });
+    });
+    describe('debug stage — searches both bugfix AND discovery types', () => {
+        it('calls execSafe for both types when stage is debug', async () => {
+            mockExecSafeAsync.mockResolvedValue(okResult('#1 [bugfix] Some bug\nBody'));
+            await queryMemory(makeParsed(), 600, 'debug');
+            // getSearchTypes('debug') returns ['bugfix', 'discovery']
+            // Since 'bugfix' IS in types, no extra bugfix call
+            const calls = mockExecSafeAsync.mock.calls;
+            expect(calls).toHaveLength(2);
+            expect(calls[0][1]).toContain('bugfix');
+            expect(calls[1][1]).toContain('discovery');
+        });
+    });
+    describe('brainstorm stage — bugfix search still runs even if not in types', () => {
+        it('searches typed searches + extra bugfix for brainstorm', async () => {
+            mockExecSafeAsync.mockResolvedValue(okResult('#1 [decision] Arch choice\nBody'));
+            await queryMemory(makeParsed(), 600, 'brainstorm');
+            // getSearchTypes('brainstorm') returns ['decision', 'discovery']
+            // bugfix NOT in types, so extra bugfix call should be made
+            const calls = mockExecSafeAsync.mock.calls;
+            expect(calls).toHaveLength(3);
+            // First two: typed searches for decision, discovery
+            expect(calls[0][1]).toContain('decision');
+            expect(calls[1][1]).toContain('discovery');
+            // Third: extra bugfix search
+            expect(calls[2][1]).toContain('bugfix');
+            expect(calls[2][1]).toContain('--limit');
+            expect(calls[2][1]).toContain('3');
+        });
+    });
+    describe('empty searchQuery returns early without calling execSafe', () => {
+        it('returns empty result when no symbols or keywords', async () => {
+            const parsed = makeParsed({ symbols: [], keywords: [] });
+            const result = await queryMemory(parsed, 600, 'implement');
+            expect(result.memories).toHaveLength(0);
+            expect(result.bugWarnings).toHaveLength(0);
+            expect(result.raw).toBe('');
+            expect(mockExecSafeAsync).not.toHaveBeenCalled();
+        });
+    });
+    describe('general stage (no types) — untyped search + bugfix', () => {
+        it('does untyped search when types are empty', async () => {
+            mockExecSafeAsync.mockResolvedValue(okResult('#1 [semantic] General info\nBody'));
+            await queryMemory(makeParsed(), 600, 'general');
+            // getSearchTypes('general') returns []
+            // So: 1 untyped search + 1 bugfix search = 2 calls
+            const calls = mockExecSafeAsync.mock.calls;
+            expect(calls).toHaveLength(2);
+            // First: untyped (no --type flag), --limit 8
+            expect(calls[0][1]).not.toContain('--type');
+            expect(calls[0][1]).toContain('--limit');
+            expect(calls[0][1]).toContain('8');
+            // Second: bugfix search
+            expect(calls[1][1]).toContain('--type');
+            expect(calls[1][1]).toContain('bugfix');
+        });
+    });
+    describe('timeout constraints', () => {
+        it('passes 800ms timeout to every execSafe call', async () => {
+            mockExecSafeAsync.mockResolvedValue(okResult('#1 [bugfix] X\nY'));
+            await queryMemory(makeParsed(), 600, 'implement');
+            for (const call of mockExecSafeAsync.mock.calls) {
+                expect(call[2]).toEqual({ timeout: 800 });
+            }
+        });
+    });
+    describe('single parallel batch — all calls issued at once', () => {
+        it('handles all search types in a single parallel batch', async () => {
+            const { queryMemory } = await import('../memory.js');
+            const parsed = {
+                symbols: ['processPayment'],
+                keywords: ['payment'],
+                filePaths: [],
+                intent: 'debug',
+                impliedStage: undefined,
+                isActionOnly: false,
+            };
+            // implement stage includes bugfix — no extra bugfix search needed
+            const result = await queryMemory(parsed, 600, 'implement');
+            expect(result).toBeDefined();
+            expect(result.memories).toBeDefined();
+            expect(result.bugWarnings).toBeDefined();
+        });
+    });
+    describe('types cap at 2 typed searches', () => {
+        it('only searches first 2 types for plan stage (which has 3 types)', async () => {
+            mockExecSafeAsync.mockResolvedValue(okResult('#1 [decision] D\nBody'));
+            await queryMemory(makeParsed(), 600, 'plan');
+            // getSearchTypes('plan') returns ['decision', 'discovery', 'task']
+            // Cap at 2 typed searches: decision, discovery
+            // bugfix NOT in types, so extra bugfix call
+            // Total: 3 calls
+            const calls = mockExecSafeAsync.mock.calls;
+            expect(calls).toHaveLength(3);
+            expect(calls[0][1]).toContain('decision');
+            expect(calls[1][1]).toContain('discovery');
+            // Third is bugfix, NOT 'task'
+            expect(calls[2][1]).toContain('bugfix');
+            // Verify 'task' was NOT searched
+            const allTypeArgs = calls.flatMap((c) => c[1]);
+            expect(allTypeArgs).not.toContain('task');
+        });
+    });
+});
+//# sourceMappingURL=memory.test.js.map

package/dist/adapters/__tests__/memory.test.js.map

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

package/dist/adapters/code-graph.d.ts

@@ -9,11 +9,17 @@ export interface CodeGraphResult {
 /**
  * Query Code Graph MCP via CLI.
  * Selects the right command based on intent.
- * Async signature retained for call-site .catch() compatibility and future async conversion.
+ * Uses async exec for truly non-blocking subprocess calls.
  */
 export declare function queryCodeGraph(parsed: ParsedQuery, tokenBudget: number, repoRoot: string): Promise<CodeGraphResult>;
 /**
  * Get repo map summary via code-graph-mcp map.
  */
 export declare function getRepoMap(repoRoot: string, timeout?: number): string;
+/**
+ * Async version of getRepoMap — non-blocking.
+ */
+export declare function getRepoMapAsync(repoRoot: string, timeout?: number): Promise<string>;
+export declare function parseRelevantFiles(raw: string): RelevantFile[];
+export declare function parseSymbols(raw: string): SymbolInfo[];
 //# sourceMappingURL=code-graph.d.ts.map

package/dist/adapters/code-graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-graph.d.ts","sourceRoot":"","sources":["../../src/adapters/code-graph.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI1E,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb;AAUD;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAiF1B;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,SAAO,GAAG,MAAM,CAKnE"}
+{"version":3,"file":"code-graph.d.ts","sourceRoot":"","sources":["../../src/adapters/code-graph.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI1E,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb;AAUD;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,WAAW,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAiF1B;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,SAAO,GAAG,MAAM,CAKnE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,SAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAKvF;AAID,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CA8B9D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,CA8BtD"}

package/dist/adapters/code-graph.js

@@ -1,17 +1,17 @@
-import { execSafe } from '../utils/exec.js';
+import { execSafe, execSafeAsync } from '../utils/exec.js';
 import { truncateToTokenBudget } from '../utils/tokens.js';
 import fs from 'node:fs';
 import path from 'node:path';
 const CG = 'code-graph-mcp';
-/** Safe CLI call — no shell, no injection. */
-function cg(args, repoRoot, timeout = 2000) {
-    const { stdout, ok } = execSafe(CG, args, { cwd: repoRoot, timeout });
+/** Async CLI call — truly non-blocking, for use in Promise.allSettled. */
+async function cgAsync(args, repoRoot, timeout = 2000) {
+    const { stdout, ok } = await execSafeAsync(CG, args, { cwd: repoRoot, timeout });
     return ok ? stdout : '';
 }
 /**
  * Query Code Graph MCP via CLI.
  * Selects the right command based on intent.
- * Async signature retained for call-site .catch() compatibility and future async conversion.
+ * Uses async exec for truly non-blocking subprocess calls.
  */
 export async function queryCodeGraph(parsed, tokenBudget, repoRoot) {
     const dbPath = path.join(repoRoot, '.code-graph', 'index.db');
@@ -31,36 +31,36 @@ export async function queryCodeGraph(parsed, tokenBudget, repoRoot) {
     switch (intent) {
         case 'impact': {
             if (symbols.length > 0) {
-                result.raw = cg(['impact', symbols[0]], repoRoot);
+                result.raw = await cgAsync(['impact', symbols[0]], repoRoot);
             }
             break;
         }
         case 'understand': {
             if (filePaths.length > 0) {
-                const dir = filePaths[0].replace(/\/[^/]+$/, '/');
-                result.raw = cg(['overview', dir], repoRoot);
+                const dir = filePaths[0].includes('/') ? filePaths[0].replace(/\/[^/]+$/, '/') : '.';
+                result.raw = await cgAsync(['overview', dir], repoRoot);
             }
             else if (searchQuery) {
-                result.raw = cg(['search', searchQuery, '--limit', '8'], repoRoot);
+                result.raw = await cgAsync(['search', searchQuery, '--limit', '8'], repoRoot);
             }
             break;
         }
         case 'callgraph': {
             if (symbols.length > 0) {
-                result.raw = cg(['callgraph', symbols[0], '--depth', '2'], repoRoot);
+                result.raw = await cgAsync(['callgraph', symbols[0], '--depth', '2'], repoRoot);
             }
             break;
         }
         case 'implement': {
             const results = [];
             if (searchQuery) {
-                const r = cg(['search', searchQuery, '--limit', '5'], repoRoot);
+                const r = await cgAsync(['search', searchQuery, '--limit', '5'], repoRoot);
                 if (r)
                     results.push(r);
             }
             if (filePaths.length > 0) {
-                const dir = filePaths[0].replace(/\/[^/]+$/, '/');
-                const r = cg(['overview', dir], repoRoot);
+                const dir = filePaths[0].includes('/') ? filePaths[0].replace(/\/[^/]+$/, '/') : '.';
+                const r = await cgAsync(['overview', dir], repoRoot);
                 if (r)
                     results.push(r);
             }
@@ -72,11 +72,11 @@ export async function queryCodeGraph(parsed, tokenBudget, repoRoot) {
         case 'general':
         default: {
             if (searchQuery) {
-                result.raw = cg(['search', searchQuery, '--limit', '8'], repoRoot);
+                result.raw = await cgAsync(['search', searchQuery, '--limit', '8'], repoRoot);
             }
             else if (filePaths.length > 0) {
-                const dir = filePaths[0].replace(/\/[^/]+$/, '/');
-                result.raw = cg(['overview', dir], repoRoot);
+                const dir = filePaths[0].includes('/') ? filePaths[0].replace(/\/[^/]+$/, '/') : '.';
+                result.raw = await cgAsync(['overview', dir], repoRoot);
             }
             break;
         }
@@ -98,36 +98,72 @@ export function getRepoMap(repoRoot, timeout = 3000) {
     const { stdout } = execSafe(CG, ['map'], { cwd: repoRoot, timeout });
     return stdout;
 }
+/**
+ * Async version of getRepoMap — non-blocking.
+ */
+export async function getRepoMapAsync(repoRoot, timeout = 3000) {
+    const dbPath = path.join(repoRoot, '.code-graph', 'index.db');
+    if (!fs.existsSync(dbPath))
+        return '';
+    const { stdout } = await execSafeAsync(CG, ['map'], { cwd: repoRoot, timeout });
+    return stdout;
+}
 // --- Parsers for code-graph CLI output ---
-function parseRelevantFiles(raw) {
+export function parseRelevantFiles(raw) {
     if (!raw)
         return [];
     const files = [];
-    const fileMatches = raw.match(/(?:^|\s)(\.?\/?\w[\w/.-]*\.\w+)/gm) || [];
     const seen = new Set();
-    for (const match of fileMatches) {
-        const p = match.trim().replace(/^\.\//, '');
-        if (seen.has(p) || !p.includes('/'))
+    const excludePattern = /^v?\d+\.\d+|^https?:|^node_modules\//;
+    for (const line of raw.split('\n')) {
+        // Try structured format: "path — description" or "path - description"
+        const structured = line.match(/^\s*(\.?\/?\w[\w/.-]*\/[\w.-]+\.\w{1,10})\s*[—–-]\s*(.+)/);
+        if (structured) {
+            const p = structured[1].replace(/^\.\//, '');
+            if (!seen.has(p) && !excludePattern.test(p)) {
+                seen.add(p);
+                files.push({ path: p, reason: structured[2].trim() });
+            }
             continue;
-        seen.add(p);
-        files.push({ path: p, reason: 'code-graph search hit' });
+        }
+        // Fallback: extract bare file paths from the line
+        const pathMatches = line.match(/(?:^|\s)(\.?\/?\w[\w/.-]*\/[\w.-]+\.\w{1,10})/g) || [];
+        for (const match of pathMatches) {
+            const p = match.trim().replace(/^\.\//, '');
+            if (!seen.has(p) && !excludePattern.test(p)) {
+                seen.add(p);
+                files.push({ path: p, reason: 'code-graph search hit' });
+            }
+        }
     }
     return files.slice(0, 10);
 }
-function parseSymbols(raw) {
+export function parseSymbols(raw) {
     if (!raw)
         return [];
     const symbols = [];
-    const symMatches = raw.match(/(?:fn|function|struct|class|impl|trait|interface|type|const|enum)\s+(\w+)/g) || [];
     const seen = new Set();
-    for (const match of symMatches) {
-        const parts = match.split(/\s+/);
-        const kind = parts[0];
-        const name = parts[1];
-        if (!name || seen.has(name))
-            continue;
-        seen.add(name);
-        symbols.push({ name, kind, file: '' });
+    // Try structured: "kind name in path"
+    const structuredRe = /(?:fn|function|struct|class|impl|trait|interface|type|const|enum)\s+(\w+)\s+in\s+([\w/.-]+)/g;
+    let match;
+    while ((match = structuredRe.exec(raw)) !== null) {
+        const name = match[1];
+        const file = match[2] || '';
+        if (name && !seen.has(name)) {
+            seen.add(name);
+            const kind = match[0].split(/\s+/)[0];
+            symbols.push({ name, kind, file });
+        }
+    }
+    // Fallback: bare keyword extraction
+    const bareRe = /(?:fn|function|struct|class|impl|trait|interface|type|const|enum)\s+(\w+)/g;
+    while ((match = bareRe.exec(raw)) !== null) {
+        const kind = match[0].split(/\s+/)[0];
+        const name = match[1];
+        if (name && !seen.has(name)) {
+            seen.add(name);
+            symbols.push({ name, kind, file: '' });
+        }
     }
     return symbols.slice(0, 15);
 }

package/dist/adapters/code-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"code-graph.js","sourceRoot":"","sources":["../../src/adapters/code-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAS7B,MAAM,EAAE,GAAG,gBAAgB,CAAC;AAE5B,8CAA8C;AAC9C,SAAS,EAAE,CAAC,IAAc,EAAE,QAAgB,EAAE,OAAO,GAAG,IAAI;IAC1D,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IACtE,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAC1B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAmB,EACnB,WAAmB,EACnB,QAAgB;IAEhB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;IAC5D,CAAC;IAED,MAAM,MAAM,GAAoB;QAC9B,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;QAClB,GAAG,EAAE,EAAE;KACR,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACxD,MAAM,WAAW,GAAG,CAAC,GAAG,OAAO,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEpE,IAAI,CAAC,WAAW,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YACpD,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;gBAClD,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;iBAAM,IAAI,WAAW,EAAE,CAAC;gBACvB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YACrE,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YACvE,CAAC;YACD,MAAM;QACR,CAAC;QAED,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,OAAO,GAAa,EAAE,CAAC;YAC7B,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAChE,IAAI,CAAC;oBAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;YACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;gBAClD,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;gBAC1C,IAAI,CAAC;oBAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;YACD,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClC,MAAM;QACR,CAAC;QAED,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,OAAO,CAAC,CAAC,CAAC;YACR,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YACrE,CAAC;iBAAM,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;gBAClD,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,MAAM,CAAC,GAAG,GAAG,qBAAqB,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,CAAC,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,CAAC,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,QAAgB,EAAE,OAAO,GAAG,IAAI;IACzD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IAC9D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IACrE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,4CAA4C;AAE5C,SAAS,kBAAkB,CAAC,GAAW;IACrC,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,KAAK,GAAmB,EAAE,CAAC;IACjC,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,IAAI,EAAE,CAAC;IACzE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,SAAS;QAC9C,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACZ,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,MAAM,UAAU,GACd,GAAG,CAAC,KAAK,CAAC,4EAA4E,CAAC,IAAI,EAAE,CAAC;IAChG,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QACtC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"code-graph.js","sourceRoot":"","sources":["../../src/adapters/code-graph.ts"],"names":[],"mappings":"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"}