spectra-cli 4.1.1 → 4.2.0

package/dist/adapters/ts-js-adapter.js

@@ -1,21 +1,32 @@
 /**
  * TypeScript / JavaScript 语言适配器
  *
- * 将当前分散在 ast-analyzer.ts、tree-sitter-fallback.ts、dependency-graph.ts
+ * 将当前分散在 ast-analyzer.ts、tree-sitter-fallback.ts、module-derivation.ts
  * 中的 TS/JS 专用逻辑聚合为一个内聚的适配器实例。
  *
  * 实现策略：委托（delegation）——调用现有函数，不复制代码。
+ *
+ * Feature 152 T-013/T-014 — 双路径 callSites merge（方案 B）：
+ * - extractCallSites=false（默认）→ 现有 ts-morph 单路径不变（FR-5.2 性能不回归）
+ * - extractCallSites=true → ts-morph 主路径（exports/imports）+ tree-sitter callSites merge
+ *   EC-11 隔离：tree-sitter 的 exports/imports 被丢弃，仅取 callSites 字段
+ *   EC-1 降级：tree-sitter 调用失败时安全降级为空 callSites
  */
 import * as fs from 'node:fs';
+import * as path from 'node:path';
 import { analyzeFileInternal } from '../core/ast-analyzer.js';
 import { analyzeFallback as treeSitterFallback } from '../core/tree-sitter-fallback.js';
-import { buildGraph } from '../graph/dependency-graph.js';
+import { buildModuleGraphForProject } from '../knowledge-graph/module-derivation.js';
 import { Project, ScriptTarget, ScriptKind } from 'ts-morph';
+import { TreeSitterAnalyzer } from '../core/tree-sitter-analyzer.js';
 export class TsJsLanguageAdapter {
     id = 'ts-js';
     languages = ['typescript', 'javascript'];
+    // 扫描扩展名扩充 `.mjs/.cjs/.mts/.cts`：
+    //   - `.mjs/.cjs`：Node.js ESM/CJS 模块文件
+    //   - `.mts/.cts`：TypeScript ESM/CJS 显式扩展
     extensions = new Set([
-        '.ts', '.tsx', '.js', '.jsx',
+        '.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs', '.mts', '.cts',
     ]);
     defaultIgnoreDirs = new Set([
         'node_modules',
@@ -26,9 +37,42 @@ export class TsJsLanguageAdapter {
     ]);
     /**
      * AST 分析（委托 ast-analyzer.ts 的 analyzeFile）
+     *
+     * Feature 152 T-013/T-014 — 双路径 merge 逻辑：
+     * - 默认路径（extractCallSites=false）：单路径 ts-morph，行为与原版完全一致
+     * - callSites 路径（extractCallSites=true）：ts-morph 主路径 + tree-sitter callSites 覆盖
+     *   EC-11：tree-sitter 仅贡献 callSites，不替换 exports/imports
+     *   EC-1：tree-sitter 调用异常时降级为空 callSites，不抛异常
      */
     async analyzeFile(filePath, options) {
-        return analyzeFileInternal(filePath, options);
+        // 默认路径：直接走 ts-morph 单路径（性能不回归）
+        if (options?.extractCallSites !== true) {
+            return analyzeFileInternal(filePath, options);
+        }
+        // 双路径 merge：ts-morph 主结果 + tree-sitter callSites
+        const tsMorphResult = await analyzeFileInternal(filePath, options);
+        // 检测 .tsx / .jsx 文件：根据扩展名决定 tree-sitter 使用的语言
+        const ext = path.extname(filePath).toLowerCase();
+        const tsLanguage = ext === '.js' || ext === '.jsx' ? 'javascript' : 'typescript';
+        let callSites = tsMorphResult.callSites ?? [];
+        try {
+            // 调用 tree-sitter 路径，仅取 callSites（EC-11：忽略 exports/imports）
+            const tsResult = await TreeSitterAnalyzer.getInstance().analyze(filePath, tsLanguage, { extractCallSites: true });
+            // EC-11 隔离：只取 callSites，丢弃 tree-sitter 的 exports/imports
+            callSites = tsResult.callSites ?? [];
+            // Codex P2 W-1 修复：parse-error 路径同样降级为空 callSites
+            // tree-sitter 在遇到 .tsx JSX dialect 等语法不识别时，可能返回 parseErrors 数组
+            // 而不抛异常；这种情况下 callSites 可能不可靠，强制降级
+            if (tsResult.parseErrors && tsResult.parseErrors.length > 0) {
+                callSites = [];
+            }
+        }
+        catch {
+            // EC-1 降级：tree-sitter 调用失败（如 dialect 不可用、grammar 初始化失败）时
+            // 安全降级为空 callSites，不阻塞主路径结果
+            callSites = [];
+        }
+        return { ...tsMorphResult, callSites };
     }
     /**
      * 正则降级分析（委托 tree-sitter-fallback.ts 的 analyzeFallback）
@@ -37,11 +81,13 @@ export class TsJsLanguageAdapter {
         return treeSitterFallback(filePath);
     }
     /**
-     * 依赖图构建（委托 dependency-graph.ts 的 buildGraph）
-     * 进行 options 字段名映射：configPath → tsConfigPath
+     * 模块图构建（W1.4：委托 module-derivation.ts 的 buildModuleGraphForProject，
+     * 内部走 UnifiedGraph + deriveModuleGraph 派生路径，不再调用 dependency-cruiser）。
+     *
+     * options 字段名映射：configPath → tsConfigPath
      */
-    async buildDependencyGraph(projectRoot, options) {
-        return buildGraph(projectRoot, {
+    async buildModuleGraph(projectRoot, options) {
+        return buildModuleGraphForProject(projectRoot, {
             includeOnly: options?.includeOnly,
             excludePatterns: options?.excludePatterns,
             tsConfigPath: options?.configPath,
@@ -120,16 +166,13 @@ export class TsJsLanguageAdapter {
                 });
             }
         });
-        // 根节点的 leading comments 需要单独处理（forEachDescendant 不会把第一个 token 前的 trivia 交给任何 descendant 吗？
-        // 保险起见：扫描 SourceFile 的第一个 child 的 leading comments 已覆盖顶部 trivia，
-        // 因此此处无需额外处理。
         // 稳定排序：按 startLine → kind
         regions.sort((a, b) => a.startLine - b.startLine || a.endLine - b.endLine);
         return regions;
     }
 }
 /**
- * 去除注释起始/结束标记（// 或 /* * /）以及每行前导的 * 装饰。
+ * 去除注释起始/结束标记（// 或 block 注释）以及每行前导的 * 装饰。
  * 保留内部换行，供 debt-classifier 逐行正则匹配。
  */
 function stripCommentMarkers(raw) {
@@ -137,11 +180,9 @@ function stripCommentMarkers(raw) {
         return raw.slice(2).replace(/^[ \t]/, '');
     }
     if (raw.startsWith('/*')) {
-        // 去除 /* 和结尾 */
         let inner = raw.slice(2);
         if (inner.endsWith('*/'))
             inner = inner.slice(0, -2);
-        // 去除每行开头的前导空白 + 可选 *
         return inner
             .split('\n')
             .map((line) => line.replace(/^\s*\*[ \t]?/, ''))

package/dist/adapters/ts-js-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-js-adapter.js","sourceRoot":"","sources":["../../src/adapters/ts-js-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAW9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,eAAe,IAAI,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE7D,MAAM,OAAO,mBAAmB;IACrB,EAAE,GAAG,OAAO,CAAC;IAEb,SAAS,GAAwB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAE9D,UAAU,GAAwB,IAAI,GAAG,CAAC;QACjD,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;KAC7B,CAAC,CAAC;IAEM,iBAAiB,GAAwB,IAAI,GAAG,CAAC;QACxD,cAAc;QACd,MAAM;QACN,OAAO;QACP,OAAO;QACP,OAAO;KACR,CAAC,CAAC;IAEH;;OAEG;IACH,KAAK,CAAC,WAAW,CACf,QAAgB,EAChB,OAA4B;QAE5B,OAAO,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,QAAgB;QACpC,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,oBAAoB,CACxB,WAAmB,EACnB,OAAgC;QAEhC,OAAO,UAAU,CAAC,WAAW,EAAE;YAC7B,WAAW,EAAE,OAAO,EAAE,WAAW;YACjC,eAAe,EAAE,OAAO,EAAE,eAAe;YACzC,YAAY,EAAE,OAAO,EAAE,UAAU;SAClC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,OAAO;YACL,iBAAiB,EAAE,YAAY;YAC/B,aAAa,EAAE,mBAAmB;YAClC,aAAa,EAAE,WAAW;YAC1B,qBAAqB,EAAE,4BAA4B;YACnD,gBAAgB,EAAE,cAAc;YAChC,YAAY,EAAE,uBAAuB;SACtC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO;YACL,WAAW,EAAE,iCAAiC;YAC9C,QAAQ,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC;SACtD,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe,CAAC,QAAgB;QACpC,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnD,mCAAmC;QACnC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;YAC1B,qBAAqB,EAAE,IAAI;YAC3B,eAAe,EAAE;gBACf,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,KAAK;aACf;SACF,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YACvC,CAAC,CAAC,UAAU,CAAC,GAAG;YAChB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACxB,CAAC,CAAC,UAAU,CAAC,GAAG;gBAChB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;oBACvB,CAAC,CAAC,UAAU,CAAC,EAAE;oBACf,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;QAElB,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,aAAa,GAAG,CAAC,UAAU,KAAK,UAAU,CAAC,GAAG,IAAI,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;YACpJ,UAAU;YACV,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,EAAE,CAAC,YAAY,CAAC;QACnD,MAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;QAClC,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAE/B,4DAA4D;QAC5D,UAAU,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,EAAE;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;YACjD,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,OAAO,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;gBAC9C,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,SAAS;gBAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACd,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAChD,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACrC,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;oBAChC,IAAI,EAAE,mBAAmB,CAAC,GAAG,CAAC;oBAC9B,SAAS,EAAE,YAAY,CAAC,QAAQ,EAAE,GAAG,CAAC;oBACtC,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;iBAChD,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,2FAA2F;QAC3F,iEAAiE;QACjE,cAAc;QAEd,0BAA0B;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;QAC3E,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED;;;GAGG;AACH,SAAS,mBAAmB,CAAC,GAAW;IACtC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,eAAe;QACf,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrD,qBAAqB;QACrB,OAAO,KAAK;aACT,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,SAAS,YAAY,CAAC,IAAY,EAAE,MAAc;IAChD,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,QAAQ;YAAE,IAAI,EAAE,CAAC;IACjD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"ts-js-adapter.js","sourceRoot":"","sources":["../../src/adapters/ts-js-adapter.ts"],"names":[],"mappings":"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"}

package/dist/batch/batch-orchestrator.d.ts

@@ -4,11 +4,12 @@ import { type BudgetPolicy, type BudgetGateAttempt } from './budget-gate.js';
 import { type GroupingOptions } from './module-grouper.js';
 import { type LanguageGroup } from './language-grouper.js';
 import { type LanguageFileStat } from '../utils/file-scanner.js';
-import type { DependencyGraph } from '../models/dependency-graph.js';
+import type { ModuleGraph } from '../knowledge-graph/module-derivation.js';
 import type { FailedModule } from '../models/module-spec.js';
 import { type DebtPipelineResult } from '../panoramic/pipelines/debt-intelligence-pipeline.js';
 import type { SimpleLLMClient as DebtSimpleLLMClient } from '../debt-scanner/design-docs/llm-topic-inferrer.js';
 import type { DocsBundleProfileSummary } from '../panoramic/models/docs-bundle-types.js';
+import type { CodeSkeleton } from '../models/code-skeleton.js';
 import type { BatchMode } from '../panoramic/qa/types.js';
 export interface BatchOptions {
     /** 即使 spec 已存在也重新生成 */
@@ -134,15 +135,15 @@ export interface BatchResult {
     graphHtmlPath?: string;
 }
 /**
- * 合并多个语言的 DependencyGraph 用于全局拓扑排序
+ * 合并多个语言的 ModuleGraph 用于全局拓扑排序
  * 仅合并 modules 和 edges，SCC/Mermaid 按语言独立保留（TD-002 选项 C）
  */
-export declare function mergeGraphsForTopologicalSort(graphs: DependencyGraph[], projectRoot: string): DependencyGraph;
+export declare function mergeGraphsForTopologicalSort(graphs: ModuleGraph[], projectRoot: string): ModuleGraph;
 /**
  * 检测跨语言引用
  * 扫描模块 imports 是否引用了其他语言组的路径
  */
-export declare function detectCrossLanguageRefs(moduleFiles: string[], languageGroups: LanguageGroup[], graph: DependencyGraph): string[];
+export declare function detectCrossLanguageRefs(moduleFiles: string[], languageGroups: LanguageGroup[], graph: ModuleGraph): string[];
 /**
  * Feature 146 FR-002 — 并发数边界规范化
  *
@@ -211,4 +212,29 @@ export declare function buildDesignDocAbsPaths(projectDocs: string[], resolvedRo
     fromProjectContextCount: number;
     nestedDirsDetected: string[];
 };
+/**
+ * Feature 151 T-008c — 收集 .py 文件 CodeSkeleton（含 callSites + 本地 import 解析）。
+ *
+ * 与 PythonLanguageAdapter.extractSymbolNodes / buildModuleGraph 不同：
+ * - 显式传 extractCallSites=true，让 graph.json 含 callSites 字段
+ * - 在 PythonMapper 输出基础上补充 import 的 resolvedPath（基于项目内 .py 模块 basename map）
+ *   — Codex P1 C-1 修订：mapper 当前只输出 moduleSpecifier，resolvedPath 始终 null，
+ *     导致 deriveImportEdges / call-resolver Stage 3 cross-module 全部失效
+ *
+ * 单文件解析失败 / 大文件 / 非 UTF-8 都按 EC-14 兜底（mapper 已处理），不影响整体 collection。
+ */
+export declare function collectPythonCodeSkeletons(projectRoot: string): Promise<Map<string, CodeSkeleton>>;
+/**
+ * Feature 152 T-020 — 收集 .ts/.tsx/.js/.jsx 文件 CodeSkeleton（含 callSites + import 路径解析）。
+ *
+ * 与 collectPythonCodeSkeletons 设计对齐：
+ * - 可选 extractCallSites，走 TsJsLanguageAdapter 双路径 merge（Feature 152 T-013/T-014）
+ * - 解析 imports[].resolvedPath：findNearestTsConfig + buildTsConfigContext + resolveTsJsImport
+ * - EC-10：resolvedPath 转绝对路径与 Map key 格式对齐
+ * - T-021a：tsconfig context 按 configDir 缓存，避免每文件重复读
+ * - 单文件失败不阻塞整体（catch 吞掉，同 Python 版本 EC-14 兜底）
+ */
+export declare function collectTsJsCodeSkeletons(projectRoot: string, options?: {
+    extractCallSites?: boolean;
+}): Promise<Map<string, CodeSkeleton>>;
 //# sourceMappingURL=batch-orchestrator.d.ts.map

package/dist/batch/batch-orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-orchestrator.d.ts","sourceRoot":"","sources":["../../src/batch/batch-orchestrator.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAmC,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAEL,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAKL,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAEvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5E,OAAO,KAAK,EAAE,eAAe,EAA6B,MAAM,+BAA+B,CAAC;AAChG,OAAO,KAAK,EAAc,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAwBrF,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAChH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAMzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AA0B1D,MAAM,WAAW,YAAY;IAC3B,uBAAuB;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,oBAAoB;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0CAA0C;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW;IACX,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;;;;;;;;;;;;;OAkBG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa;IACb,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,oFAAoF;IACpF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,iEAAiE;IACjE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,kDAAkD;IAClD,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,uEAAuE;IACvE,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,qDAAqD;IACrD,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe;IACf,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa;IACb,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC9C,sBAAsB;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4BAA4B;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,2BAA2B;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iCAAiC;IACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,yBAAyB;IACzB,kBAAkB,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAChD,uBAAuB;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,8BAA8B;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wBAAwB;IACxB,cAAc,CAAC,EAAE;QACf,MAAM,EAAE,YAAY,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,OAAO,CAAC;QACrB,oCAAoC;QACpC,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;QAC/B,+BAA+B;QAC/B,qBAAqB,CAAC,EAAE,OAAO,CAAC;QAChC,6BAA6B;QAC7B,mBAAmB,CAAC,EAAE,OAAO,CAAC;KAC/B,CAAC;IACF,wCAAwC;IACxC,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAQD;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,eAAe,EAAE,EACzB,WAAW,EAAE,MAAM,GAClB,eAAe,CA0BjB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EAAE,EACrB,cAAc,EAAE,aAAa,EAAE,EAC/B,KAAK,EAAE,eAAe,GACrB,MAAM,EAAE,CA6BV;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GACjC,MAAM,CAOR;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,CAKzE;AAMD;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,WAAW,CAAC,CA2yCtB;AAsDD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,YAAY,CAAC,EAAE;IACb,8BAA8B;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iEAAiE;IACjE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sDAAsD;IACtD,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,GACA;IACD,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAuGA"}
+{"version":3,"file":"batch-orchestrator.d.ts","sourceRoot":"","sources":["../../src/batch/batch-orchestrator.ts"],"names":[],"mappings":"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"}

package/dist/batch/batch-orchestrator.js

@@ -8,7 +8,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import pLimit from 'p-limit';
 import { findReadmePath } from '../extraction/index.js';
-import { buildGraph } from '../graph/dependency-graph.js';
+import { buildModuleGraphForProject } from '../knowledge-graph/module-derivation.js';
 import { generateSpec } from '../core/single-spec-orchestrator.js';
 import { generateIndex } from '../generator/index-generator.js';
 import { renderIndex, initRenderer } from '../generator/spec-renderer.js';
@@ -38,9 +38,11 @@ import { orchestrateDocsBundle } from '../panoramic/pipelines/docs-bundle-orches
 import { generateDebtIntelligence, } from '../panoramic/pipelines/debt-intelligence-pipeline.js';
 import { BATCH_OUTPUT_SUBDIRS } from '../panoramic/output-filenames.js';
 import { buildKnowledgeGraph, writeKnowledgeGraph } from '../panoramic/graph/index.js';
+import { buildUnifiedGraph, setCurrentUnifiedGraph, getCurrentUnifiedGraph, } from '../knowledge-graph/index.js';
 import { buildHtmlTemplate } from '../panoramic/exporters/html-template.js';
 import { SpecStore } from '../spec-store/index.js';
 import { createRequire } from 'node:module';
+import { resolvePythonImport, resolveTsJsImport, findNearestTsConfig, buildTsConfigContext, } from '../knowledge-graph/import-resolver.js';
 // 从 package.json 读取版本号（避免硬编码）
 const _require = createRequire(import.meta.url);
 const SPECTRA_VERSION = _require('../../package.json').version;
@@ -63,7 +65,7 @@ const logger = createLogger('batch-orchestrator');
 // 内部辅助函数
 // ============================================================
 /**
- * 合并多个语言的 DependencyGraph 用于全局拓扑排序
+ * 合并多个语言的 ModuleGraph 用于全局拓扑排序
  * 仅合并 modules 和 edges，SCC/Mermaid 按语言独立保留（TD-002 选项 C）
  */
 export function mergeGraphsForTopologicalSort(graphs, projectRoot) {
@@ -214,14 +216,14 @@ export async function runBatch(projectRoot, options = {}) {
         // 步骤 1.7：合并拓扑排序
         mergedGraph = perLangGraphs.length > 0
             ? mergeGraphsForTopologicalSort(perLangGraphs, resolvedRoot)
-            : await buildGraph(resolvedRoot);
+            : await buildModuleGraphForProject(resolvedRoot);
     }
     else if (isSingleNonTsJs && languageGroupsList[0]) {
         mergedGraph = await buildGraphForLanguageGroup(languageGroupsList[0], resolvedRoot);
     }
     else {
-        // 纯 TS/JS 或未识别受支持语言：保持 dependency-cruiser 现有路径
-        mergedGraph = await buildGraph(resolvedRoot);
+        // 纯 TS/JS 或未识别受支持语言：走 UnifiedGraph 派生路径（Feature 156 删除 dependency-cruiser）
+        mergedGraph = await buildModuleGraphForProject(resolvedRoot);
     }
     // 步骤 2：文件→模块聚合 + 模块级拓扑排序
     const groupingOptions = {
@@ -824,6 +826,34 @@ export async function runBatch(projectRoot, options = {}) {
                 logger.warn(`README 早期读取失败（不阻断 narrative 主流程）: ${String(readmeErr)}`);
             }
         }
+        // Feature 151 Codex Final C-1 修订 — 在 generateBatchProjectDocs 之前构建 UnifiedGraph
+        // 让 component-view-builder 能在生成时获取 graph（DI provider getCurrentUnifiedGraph）
+        //
+        // Feature 152 Codex final C-1 修复 — 同时合并 Python + TS/JS codeSkeletons，
+        // 否则用户跑 spectra batch 后 TS 项目 graph.json 中没有 calls 边（US-001 失败）
+        setCurrentUnifiedGraph(null);
+        try {
+            const pythonSkeletons = await collectPythonCodeSkeletons(resolvedRoot);
+            const tsJsSkeletons = await collectTsJsCodeSkeletons(resolvedRoot, {
+                extractCallSites: true,
+            });
+            // 合并两个 Map（projectRoot 都已 normalize 为绝对路径，key 形态一致）
+            const earlyCodeSkeletons = new Map([...pythonSkeletons, ...tsJsSkeletons]);
+            if (earlyCodeSkeletons.size > 0) {
+                const earlyUg = buildUnifiedGraph({
+                    projectRoot: resolvedRoot,
+                    codeSkeletons: earlyCodeSkeletons,
+                });
+                setCurrentUnifiedGraph(earlyUg);
+                const callEdges = earlyUg.edges.filter((e) => e.relation === 'calls').length;
+                logger.info(`[Feature 151+152] 早期 UnifiedGraph 构建：${earlyUg.nodes.length} 节点 / ${callEdges} calls 边 ` +
+                    `(${pythonSkeletons.size} .py + ${tsJsSkeletons.size} .ts/.tsx/.js/.jsx 文件)`);
+            }
+        }
+        catch (ugErr) {
+            setCurrentUnifiedGraph(null);
+            logger.warn(`[Feature 151+152] 早期 UnifiedGraph 构建失败（不阻塞）: ${String(ugErr)}`);
+        }
         try {
             projectDocsResult = await generateBatchProjectDocs({
                 projectRoot: resolvedRoot,
@@ -913,11 +943,22 @@ export async function runBatch(projectRoot, options = {}) {
                 ...pythonSymbolResults,
                 ...(extractionResults ?? []),
             ];
+            // Feature 151 — UnifiedGraph 接入 graph-builder 第五路（早期已在 generateBatchProjectDocs 之前构建，此处复用 cache）
+            // 复用早期构建结果（Codex Final C-1 修订）：cache 在 generateBatchProjectDocs 之前已 set
+            const unifiedGraph = getCurrentUnifiedGraph();
+            if (unifiedGraph) {
+                const callEdgeCount = unifiedGraph.edges.filter((e) => e.relation === 'calls').length;
+                const dependEdgeCount = unifiedGraph.edges.filter((e) => e.relation === 'depends-on').length;
+                logger.info(`[Feature 151] graph-builder 注入 UnifiedGraph：${unifiedGraph.nodes.length} 节点，` +
+                    `${callEdgeCount} calls 边，${dependEdgeCount} depends-on 边`);
+            }
             const graphJson = buildKnowledgeGraph({
                 architectureIR: projectDocsResult?.architectureIR,
                 docGraph,
                 crossReferenceLinks,
                 extractionResults: mergedResults.length > 0 ? mergedResults : undefined, // Feature 107 + 143 第四路数据源
+                // Feature 151 T-012a：UnifiedGraph 第五路（calls + depends-on 边 + per-file callSitesCount metadata）
+                ...(unifiedGraph ? { unifiedGraph } : {}),
             });
             // Feature 133 P1-1（adversarial-review post-fix）：anchor + hyperedge 集成
             // F4 提供了 runAnchorIntegration / runHyperedgeIntegration 集成函数，
@@ -1345,9 +1386,9 @@ export async function runBatch(projectRoot, options = {}) {
 async function buildGraphForLanguageGroup(langGroup, projectRoot) {
     const registry = LanguageAdapterRegistry.getInstance();
     const adapter = registry.getAllAdapters().find((item) => item.id === langGroup.adapterId);
-    if (adapter?.buildDependencyGraph) {
+    if (adapter?.buildModuleGraph) {
         try {
-            const langGraph = await adapter.buildDependencyGraph(projectRoot);
+            const langGraph = await adapter.buildModuleGraph(projectRoot);
             for (const node of langGraph.modules) {
                 node.language = langGroup.adapterId;
             }
@@ -1549,4 +1590,240 @@ function collectMdRecursive(dir, out) {
         }
     }
 }
+// ============================================================
+// Feature 151 — Python CodeSkeleton 收集（含 callSites 抽取）
+// ============================================================
+const PY_SKELETON_IGNORE_DIRS = new Set([
+    'node_modules', '.git', '__pycache__', '.venv', 'venv',
+    'build', 'dist', 'coverage', 'out', 'target', '.tox',
+]);
+/**
+ * Feature 151 T-008c — 收集 .py 文件 CodeSkeleton（含 callSites + 本地 import 解析）。
+ *
+ * 与 PythonLanguageAdapter.extractSymbolNodes / buildModuleGraph 不同：
+ * - 显式传 extractCallSites=true，让 graph.json 含 callSites 字段
+ * - 在 PythonMapper 输出基础上补充 import 的 resolvedPath（基于项目内 .py 模块 basename map）
+ *   — Codex P1 C-1 修订：mapper 当前只输出 moduleSpecifier，resolvedPath 始终 null，
+ *     导致 deriveImportEdges / call-resolver Stage 3 cross-module 全部失效
+ *
+ * 单文件解析失败 / 大文件 / 非 UTF-8 都按 EC-14 兜底（mapper 已处理），不影响整体 collection。
+ */
+export async function collectPythonCodeSkeletons(projectRoot) {
+    const out = new Map();
+    const { PythonLanguageAdapter } = await import('../adapters/python-adapter.js');
+    const adapter = new PythonLanguageAdapter();
+    // Codex P3+P4 复审 C-2 修复：projectRoot 显式 normalize 为绝对路径
+    // 避免调用方传相对路径 → Map key 与 imports[].resolvedPath 形态不一致
+    // → call-resolver buildImportIndex lookup miss
+    const resolvedProjectRoot = path.resolve(projectRoot);
+    const pyFiles = [];
+    walkPyFiles(resolvedProjectRoot, pyFiles);
+    // Feature 152 P3 T-017：大文件 size guard 提前到 parse 之前（避免 tree-sitter 解析阻塞）
+    // 1MB 阈值与 PythonMapper.CALLSITES_MAX_FILE_BYTES 对齐（EC-14）
+    const MAX_FILE_BYTES = 1_000_000;
+    for (const filePath of pyFiles) {
+        try {
+            let stat;
+            try {
+                stat = fs.statSync(filePath);
+            }
+            catch {
+                continue; // 文件读不到 stat → 跳过
+            }
+            if (stat.size > MAX_FILE_BYTES) {
+                // 大文件 skip — 不调 analyzeFile（避免 tree-sitter parse 巨型文件）
+                continue;
+            }
+            const skeleton = await adapter.analyzeFile(filePath, { extractCallSites: true });
+            // Feature 152 P3 T-017：使用 resolvePythonImport 替换 basename map（plan §5.1）
+            // C-1 修复：from . import X1, X2 形态（moduleSpecifier='.'/'..') 需对每个 namedImport 单独调用
+            // EC-10 修复：resolvedPath 转为绝对路径，与 Map key 格式对齐
+            const resolvedSkeleton = {
+                ...skeleton,
+                imports: skeleton.imports.flatMap((imp) => {
+                    if (imp.resolvedPath)
+                        return [imp];
+                    const spec = imp.moduleSpecifier;
+                    // C-1：裸相对 import —— moduleSpecifier 仅为纯点（'.' / '..' / '...' / 更深）
+                    // "from . import nn, Value" → imp.namedImports=['nn','Value']，逐个拆解
+                    // quality-review W-2 修复：扩展到任意点深度（PEP 328 不限层数），
+                    // 避免 'from ... import a, b' 时 a/b 都映射到同一 resolvedPath（namedImports 污染）
+                    if (/^\.+$/.test(spec)) {
+                        const namedImports = Array.isArray(imp.namedImports)
+                            ? imp.namedImports
+                            : [];
+                        if (namedImports.length === 0) {
+                            // 没有 namedImports（罕见），仅尝试解析包 __init__
+                            const result = resolvePythonImport(spec, filePath, resolvedProjectRoot);
+                            const resolvedPath = result.resolvedPath
+                                ? path.resolve(resolvedProjectRoot, result.resolvedPath)
+                                : null;
+                            return [{ ...imp, resolvedPath }];
+                        }
+                        // 每个 namedImport 单独解析为独立 import 记录
+                        // Codex P3+P4 复审 C-1 修复：每条拆出记录的 namedImports 必须**只**含
+                        // 当前拆出的 name，否则 buildImportIndex 会把所有 namedImports 都映射到
+                        // 同一 resolvedPath（最后一条胜出），导致 alias 污染
+                        return namedImports.map((name) => {
+                            const combinedSpec = `${spec}${name}`; // '.' + 'nn' → '.nn'
+                            const result = resolvePythonImport(combinedSpec, filePath, resolvedProjectRoot);
+                            const resolvedPath = result.resolvedPath
+                                ? path.resolve(resolvedProjectRoot, result.resolvedPath)
+                                : null;
+                            return {
+                                ...imp,
+                                moduleSpecifier: combinedSpec,
+                                namedImports: [name], // 关键：仅含本次拆出的 name，避免 alias 污染
+                                resolvedPath,
+                            };
+                        });
+                    }
+                    // 常规形态：直接调用 resolver（from pkg.engine import Value / import os）
+                    const result = resolvePythonImport(spec, filePath, resolvedProjectRoot);
+                    // EC-10：resolver 返回相对 projectRoot 的 POSIX 路径，需转绝对路径与 Map key 对齐
+                    const resolvedPath = result.resolvedPath
+                        ? path.resolve(resolvedProjectRoot, result.resolvedPath)
+                        : null;
+                    return [{ ...imp, resolvedPath }];
+                }),
+            };
+            out.set(filePath, resolvedSkeleton);
+        }
+        catch {
+            // 单文件失败不影响整体
+        }
+    }
+    return out;
+}
+function walkPyFiles(dir, out) {
+    let entries;
+    try {
+        entries = fs.readdirSync(dir, { withFileTypes: true });
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            if (entry.name.startsWith('.'))
+                continue;
+            if (PY_SKELETON_IGNORE_DIRS.has(entry.name))
+                continue;
+            walkPyFiles(path.join(dir, entry.name), out);
+        }
+        else if (entry.isFile() && (entry.name.endsWith('.py') || entry.name.endsWith('.pyi'))) {
+            out.push(path.join(dir, entry.name));
+        }
+    }
+}
+// ============================================================
+// Feature 152 — TypeScript/JavaScript CodeSkeleton 收集
+// ============================================================
+/** T-020：TS/JS 文件扫描时忽略的目录集合（与 Python 对齐，增加 .next / .nuxt 等前端产物目录） */
+const TSJS_SKELETON_IGNORE_DIRS = new Set([
+    'node_modules', '.git', 'dist', 'build', 'coverage', 'out', 'target',
+    '.next', '.nuxt', '.turbo', '.cache', 'tmp', '.tmp',
+    '__pycache__', '.pytest_cache', '.tox',
+]);
+/**
+ * Feature 152 T-020 — 收集 .ts/.tsx/.js/.jsx 文件 CodeSkeleton（含 callSites + import 路径解析）。
+ *
+ * 与 collectPythonCodeSkeletons 设计对齐：
+ * - 可选 extractCallSites，走 TsJsLanguageAdapter 双路径 merge（Feature 152 T-013/T-014）
+ * - 解析 imports[].resolvedPath：findNearestTsConfig + buildTsConfigContext + resolveTsJsImport
+ * - EC-10：resolvedPath 转绝对路径与 Map key 格式对齐
+ * - T-021a：tsconfig context 按 configDir 缓存，避免每文件重复读
+ * - 单文件失败不阻塞整体（catch 吞掉，同 Python 版本 EC-14 兜底）
+ */
+export async function collectTsJsCodeSkeletons(projectRoot, options) {
+    const out = new Map();
+    const { TsJsLanguageAdapter } = await import('../adapters/ts-js-adapter.js');
+    const adapter = new TsJsLanguageAdapter();
+    // Codex P3+P4 复审 C-2 修复：projectRoot 显式 normalize 为绝对路径
+    // 避免调用方传相对路径 → Map key 与 imports[].resolvedPath 形态不一致
+    const resolvedProjectRoot = path.resolve(projectRoot);
+    const tsJsFiles = [];
+    walkTsJsFiles(resolvedProjectRoot, tsJsFiles);
+    // T-021a：tsconfig context 缓存（by configDir），避免每个文件重复读
+    const tsConfigCache = new Map();
+    // 大文件 size guard 与 Python 版本对齐（EC-14：1MB 阈值）
+    const MAX_FILE_BYTES = 1_000_000;
+    for (const filePath of tsJsFiles) {
+        try {
+            let stat;
+            try {
+                stat = fs.statSync(filePath);
+            }
+            catch {
+                continue; // 文件读不到 stat → 跳过
+            }
+            if (stat.size > MAX_FILE_BYTES) {
+                continue; // 大文件 skip
+            }
+            // 主分析（含 callSites if options.extractCallSites）
+            const skeleton = await adapter.analyzeFile(filePath, {
+                extractCallSites: options?.extractCallSites,
+            });
+            // T-021a：查找最近的 tsconfig.json 并缓存 context
+            const nearest = findNearestTsConfig(filePath, resolvedProjectRoot);
+            let tsConfigContext = null;
+            if (nearest) {
+                if (!tsConfigCache.has(nearest.configDir)) {
+                    tsConfigCache.set(nearest.configDir, buildTsConfigContext(nearest.rawConfig, nearest.configDir));
+                }
+                tsConfigContext = tsConfigCache.get(nearest.configDir) ?? null;
+            }
+            // 解析 imports[].resolvedPath（EC-10：转绝对路径）
+            const resolvedSkeleton = {
+                ...skeleton,
+                imports: skeleton.imports.map((imp) => {
+                    if (imp.resolvedPath)
+                        return imp;
+                    const result = resolveTsJsImport(imp.moduleSpecifier, filePath, resolvedProjectRoot, tsConfigContext);
+                    // EC-10：resolver 返回相对 projectRoot 的 POSIX 路径，需转绝对路径与 Map key 对齐
+                    const resolvedPath = result.resolvedPath
+                        ? path.resolve(resolvedProjectRoot, result.resolvedPath)
+                        : null;
+                    return { ...imp, resolvedPath };
+                }),
+            };
+            out.set(filePath, resolvedSkeleton);
+        }
+        catch {
+            // 单文件失败不影响整体（与 collectPythonCodeSkeletons EC-14 一致）
+        }
+    }
+    return out;
+}
+/**
+ * 递归扫描 .ts/.tsx/.js/.jsx 文件（排除产物目录）。
+ * 复用 walkPyFiles 的扫描模式，扩展 TS/JS 扩展名集合。
+ */
+function walkTsJsFiles(dir, out) {
+    let entries;
+    try {
+        entries = fs.readdirSync(dir, { withFileTypes: true });
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            if (entry.name.startsWith('.'))
+                continue;
+            if (TSJS_SKELETON_IGNORE_DIRS.has(entry.name))
+                continue;
+            walkTsJsFiles(path.join(dir, entry.name), out);
+        }
+        else if (entry.isFile()) {
+            const name = entry.name;
+            if (name.endsWith('.ts') ||
+                name.endsWith('.tsx') ||
+                name.endsWith('.js') ||
+                name.endsWith('.jsx')) {
+                out.push(path.join(dir, entry.name));
+            }
+        }
+    }
+}
 //# sourceMappingURL=batch-orchestrator.js.map