@mrclrchtr/supi-code-intelligence 12.0.0 → 13.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +17 -0
- package/README.md +4 -2
- package/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-core/package.json +3 -1
- package/node_modules/@mrclrchtr/supi-core/src/api.ts +4 -0
- package/node_modules/@mrclrchtr/supi-core/src/context/context-tag.ts +1 -1
- package/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +22 -3
- package/node_modules/@mrclrchtr/supi-core/src/retired-packages.ts +152 -0
- package/node_modules/@mrclrchtr/supi-core/src/session.ts +1 -0
- package/node_modules/@mrclrchtr/supi-core/src/shell-hints.ts +46 -0
- package/node_modules/@mrclrchtr/supi-core/src/spill.ts +93 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/package.json +3 -1
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/api.ts +4 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/context/context-tag.ts +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +22 -3
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/retired-packages.ts +152 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/session.ts +1 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/shell-hints.ts +46 -0
- package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/spill.ts +93 -0
- package/node_modules/@mrclrchtr/supi-lsp/package.json +8 -8
- package/node_modules/@mrclrchtr/supi-lsp/src/api.ts +1 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-cache.ts +102 -47
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-host.ts +8 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-refresh.ts +15 -1
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostic-request.ts +1 -1
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-diagnostics.ts +46 -4
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-disk-stamp.ts +60 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-document-state.ts +3 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-document-sync.ts +21 -1
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-file-state.ts +17 -3
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client-semantic-input-barrier.ts +53 -4
- package/node_modules/@mrclrchtr/supi-lsp/src/client/client.ts +11 -3
- package/node_modules/@mrclrchtr/supi-lsp/src/config/tsconfig-extends.ts +2 -1
- package/node_modules/@mrclrchtr/supi-lsp/src/config/tsconfig-path.ts +2 -2
- package/node_modules/@mrclrchtr/supi-lsp/src/config/tsconfig-scope.ts +14 -5
- package/node_modules/@mrclrchtr/supi-lsp/src/config/typescript-module.ts +17 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/diagnostics/evidence.ts +42 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-client-state.ts +2 -17
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager-removal-ledger.ts +52 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/manager.ts +40 -20
- package/node_modules/@mrclrchtr/supi-lsp/src/manager/typescript-file-local.ts +6 -1
- package/node_modules/@mrclrchtr/supi-lsp/src/provider/lsp-semantic-provider.ts +6 -1
- package/node_modules/@mrclrchtr/supi-lsp/src/provider/semantic-symbol-mapper.ts +13 -3
- package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-diagnostic-surface.ts +11 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-diagnostics.ts +1 -0
- package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-registry.ts +17 -2
- package/node_modules/@mrclrchtr/supi-lsp/src/session/runtime-transition-debug.ts +11 -1
- package/node_modules/@mrclrchtr/supi-lsp/src/session/workspace-lsp-runtime.ts +2 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-code-runtime/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/package.json +3 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/api.ts +4 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/context/context-tag.ts +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/debug-registry.ts +22 -3
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/retired-packages.ts +152 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/session.ts +1 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/shell-hints.ts +46 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/@mrclrchtr/supi-core/src/spill.ts +93 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/debug/web-tree-sitter.cjs +50 -75
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/debug/web-tree-sitter.cjs.map +2 -2
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/debug/web-tree-sitter.js +50 -75
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/debug/web-tree-sitter.js.map +2 -2
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/debug/web-tree-sitter.wasm +0 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/debug/web-tree-sitter.wasm.map +6 -6
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/package.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.cjs +50 -75
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.cjs.map +2 -2
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.d.cts +7 -7
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.d.cts.map +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.d.ts +7 -7
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.d.ts.map +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.js +50 -75
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.js.map +2 -2
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.wasm +0 -0
- package/node_modules/@mrclrchtr/supi-tree-sitter/node_modules/web-tree-sitter/web-tree-sitter.wasm.map +5 -5
- package/node_modules/@mrclrchtr/supi-tree-sitter/package.json +5 -5
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/kotlin/tree-sitter-kotlin.wasm.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/latex/tree-sitter-latex.wasm.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/sql/tree-sitter-sql.wasm.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/tsx/tree-sitter-tsx.wasm.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/resources/grammars/typescript/tree-sitter-typescript.wasm.json +1 -1
- package/node_modules/@mrclrchtr/supi-tree-sitter/src/session/structural-worker-client.ts +1 -1
- package/node_modules/fast-xml-parser/CHANGELOG.md +886 -0
- package/node_modules/fast-xml-parser/LICENSE +21 -0
- package/node_modules/fast-xml-parser/README.md +204 -0
- package/node_modules/fast-xml-parser/lib/fxbuilder.min.js +2 -0
- package/node_modules/fast-xml-parser/lib/fxbuilder.min.js.map +1 -0
- package/node_modules/fast-xml-parser/lib/fxp.cjs +1 -0
- package/node_modules/fast-xml-parser/lib/fxp.d.cts +774 -0
- package/node_modules/fast-xml-parser/lib/fxp.min.js +2 -0
- package/node_modules/fast-xml-parser/lib/fxp.min.js.map +1 -0
- package/node_modules/fast-xml-parser/lib/fxparser.min.js +2 -0
- package/node_modules/fast-xml-parser/lib/fxparser.min.js.map +1 -0
- package/node_modules/fast-xml-parser/lib/fxvalidator.min.js +2 -0
- package/node_modules/fast-xml-parser/lib/fxvalidator.min.js.map +1 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/README.md +92 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/package.json +57 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/src/EntityDecoder.js +644 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/src/EntityEncoder.js +239 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/src/all-entities.js +53 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/src/entities.js +1139 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/src/entityTries.js +60 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/src/index.d.ts +358 -0
- package/node_modules/fast-xml-parser/node_modules/@nodable/entities/src/index.js +29 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/CHANGELOG.md +52 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/LICENSE +21 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/README.md +77 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/lib/fxb.cjs +1 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/lib/fxb.d.cts +270 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/lib/fxb.min.js +2 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/lib/fxb.min.js.map +1 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/package.json +77 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/src/fxb.d.ts +270 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/src/fxb.js +609 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/src/ignoreAttributes.js +18 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/src/orderedJs2Xml.js +360 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/src/prettifyJs2Xml.js +0 -0
- package/node_modules/fast-xml-parser/node_modules/fast-xml-builder/src/util.js +23 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/LICENSE +21 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/README.md +632 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/package.json +56 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/html.js +102 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/log.js +98 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/nosql.js +114 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/redos.js +60 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/shell.js +105 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/sql-strict.js +47 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/sql.js +95 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/svg.js +81 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/contexts/xml.js +79 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/index.cjs +27 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/index.d.ts +103 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/index.js +292 -0
- package/node_modules/fast-xml-parser/node_modules/is-unsafe/src/util/decode-entities.js +48 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/LICENSE +21 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/README.md +947 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/lib/pem.cjs +1 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/lib/pem.d.cts +725 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/lib/pem.min.js +2 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/lib/pem.min.js.map +1 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/package.json +79 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/Expression.js +232 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/ExpressionSet.js +225 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/Matcher.js +663 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/index.d.ts +589 -0
- package/node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/index.js +30 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/CHANGELOG.md +63 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/LICENSE +21 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/README.md +113 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/node_modules/anynum/LICENSE +21 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/node_modules/anynum/README.md +142 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/node_modules/anynum/anynum.js +135 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/node_modules/anynum/digitTable.js +116 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/node_modules/anynum/package.json +42 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/package.json +36 -0
- package/node_modules/fast-xml-parser/node_modules/strnum/strnum.js +176 -0
- package/node_modules/fast-xml-parser/node_modules/xml-naming/LICENSE +21 -0
- package/node_modules/fast-xml-parser/node_modules/xml-naming/README.md +287 -0
- package/node_modules/fast-xml-parser/node_modules/xml-naming/package.json +56 -0
- package/node_modules/fast-xml-parser/node_modules/xml-naming/src/index.d.ts +108 -0
- package/node_modules/fast-xml-parser/node_modules/xml-naming/src/index.js +382 -0
- package/node_modules/fast-xml-parser/package.json +93 -0
- package/node_modules/fast-xml-parser/src/cli/cli.js +97 -0
- package/node_modules/fast-xml-parser/src/cli/man.js +17 -0
- package/node_modules/fast-xml-parser/src/cli/read.js +43 -0
- package/node_modules/fast-xml-parser/src/fxp.d.ts +754 -0
- package/node_modules/fast-xml-parser/src/fxp.js +14 -0
- package/node_modules/fast-xml-parser/src/ignoreAttributes.js +18 -0
- package/node_modules/fast-xml-parser/src/util.js +61 -0
- package/node_modules/fast-xml-parser/src/v6/CharsSymbol.js +16 -0
- package/node_modules/fast-xml-parser/src/v6/EntitiesParser.js +106 -0
- package/node_modules/fast-xml-parser/src/v6/OptionsBuilder.js +61 -0
- package/node_modules/fast-xml-parser/src/v6/OutputBuilders/BaseOutputBuilder.js +69 -0
- package/node_modules/fast-xml-parser/src/v6/OutputBuilders/JsArrBuilder.js +103 -0
- package/node_modules/fast-xml-parser/src/v6/OutputBuilders/JsMinArrBuilder.js +100 -0
- package/node_modules/fast-xml-parser/src/v6/OutputBuilders/JsObjBuilder.js +154 -0
- package/node_modules/fast-xml-parser/src/v6/OutputBuilders/ParserOptionsBuilder.js +94 -0
- package/node_modules/fast-xml-parser/src/v6/Report.js +0 -0
- package/node_modules/fast-xml-parser/src/v6/TagPath.js +81 -0
- package/node_modules/fast-xml-parser/src/v6/TagPathMatcher.js +13 -0
- package/node_modules/fast-xml-parser/src/v6/XMLParser.js +83 -0
- package/node_modules/fast-xml-parser/src/v6/Xml2JsParser.js +235 -0
- package/node_modules/fast-xml-parser/src/v6/XmlPartReader.js +210 -0
- package/node_modules/fast-xml-parser/src/v6/XmlSpecialTagsReader.js +111 -0
- package/node_modules/fast-xml-parser/src/v6/inputSource/BufferSource.js +116 -0
- package/node_modules/fast-xml-parser/src/v6/inputSource/StringSource.js +121 -0
- package/node_modules/fast-xml-parser/src/v6/valueParsers/EntitiesParser.js +105 -0
- package/node_modules/fast-xml-parser/src/v6/valueParsers/booleanParser.js +22 -0
- package/node_modules/fast-xml-parser/src/v6/valueParsers/booleanParserExt.js +19 -0
- package/node_modules/fast-xml-parser/src/v6/valueParsers/currency.js +38 -0
- package/node_modules/fast-xml-parser/src/v6/valueParsers/join.js +13 -0
- package/node_modules/fast-xml-parser/src/v6/valueParsers/number.js +14 -0
- package/node_modules/fast-xml-parser/src/v6/valueParsers/trim.js +6 -0
- package/node_modules/fast-xml-parser/src/validator.js +518 -0
- package/node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js +6 -0
- package/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js +426 -0
- package/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js +164 -0
- package/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js +907 -0
- package/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js +77 -0
- package/node_modules/fast-xml-parser/src/xmlparser/node2json.js +177 -0
- package/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js +54 -0
- package/package.json +10 -8
- package/src/analysis/evidence.ts +331 -73
- package/src/analysis/health/diagnostics.ts +66 -18
- package/src/analysis/health/evidence-reason.ts +44 -0
- package/src/analysis/search/pattern.ts +3 -3
- package/src/analysis/target/anchored.ts +3 -6
- package/src/analysis/target/symbol.ts +41 -47
- package/src/analysis/target/types.ts +4 -9
- package/src/analysis/workspace/cmake-parser.ts +207 -0
- package/src/analysis/workspace/cmake.ts +141 -0
- package/src/analysis/workspace/maven.ts +310 -0
- package/src/analysis/workspace/membership.ts +100 -26
- package/src/analysis/workspace/metadata.ts +6 -1
- package/src/analysis/workspace/observe.ts +6 -0
- package/src/analysis/workspace/types.ts +11 -3
- package/src/diagnostics/coverage.ts +49 -0
- package/src/diagnostics/evidence.ts +10 -2
- package/src/session/health-workflow.ts +6 -0
- package/src/session/input/common.ts +1 -1
- package/src/session/orientation/collect.ts +42 -7
- package/src/session/orientation/context-facts.ts +3 -3
- package/src/session/orientation/context-sections.ts +13 -15
- package/src/session/orientation/facts.ts +5 -8
- package/src/session/orientation-workflow.ts +4 -19
- package/src/session/target-workflow.ts +25 -18
- package/src/tool/code_find/result.ts +5 -7
- package/src/tool/code_graph/display.ts +5 -6
- package/src/tool/code_graph/format.ts +8 -24
- package/src/tool/code_graph/result.ts +16 -75
- package/src/tool/code_graph/section.ts +21 -33
- package/src/tool/code_graph/tui.ts +10 -5
- package/src/tool/code_health/diagnostic-tui.ts +49 -0
- package/src/tool/code_health/guidance.ts +27 -0
- package/src/tool/code_health/markdown.ts +60 -8
- package/src/tool/code_health/result.ts +20 -9
- package/src/tool/code_health/structured-schema.ts +14 -0
- package/src/tool/code_health/structured.ts +7 -1
- package/src/tool/code_health/tui.ts +33 -40
- package/src/tool/code_inspect/result.ts +23 -18
- package/src/tool/code_inspect/structured.ts +2 -19
- package/src/tool/code_orientation/result.ts +53 -100
- package/src/tool/code_orientation/structured-schema.ts +16 -12
- package/src/tool/code_orientation/structured-workspace.ts +13 -7
- package/src/tool/code_orientation/structured.ts +31 -39
- package/src/tool/code_orientation/workspace-format.ts +4 -10
- package/src/tool/code_orientation/workspace-instructions.ts +4 -5
- package/src/tool/code_orientation/workspace-observations.ts +2 -2
- package/src/tool/code_orientation/workspace-output.ts +16 -7
- package/src/tool/code_orientation/workspace-projects.ts +7 -10
- package/src/tool/code_orientation/workspace-sections.ts +13 -19
- package/src/tool/code_resolve/markdown.ts +4 -46
- package/src/tool/code_resolve/result.ts +43 -72
- package/src/tool/infra/truncate.ts +2 -16
- package/src/tool/result/candidate-selection.ts +141 -0
- package/src/tool/result/display.ts +41 -45
- package/src/tool/result/errors.ts +1 -0
- package/src/tool/result/model-budget.ts +26 -1
- package/src/tool/result/refactor.ts +11 -8
- package/src/tool/result/structured.ts +2 -1
- package/src/tool/result/types.ts +9 -8
- package/src/tool/schemas.ts +15 -20
- package/src/ui/footer.ts +2 -4
- package/src/ui/status-presentation.ts +4 -7
- package/src/ui/tui/candidate-selection.ts +40 -95
- package/src/ui/tui/common.ts +16 -70
- package/src/ui/tui/display.ts +6 -24
- package/src/tool/result/candidate-row.ts +0 -49
|
@@ -0,0 +1,310 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Static Maven `pom.xml` reader.
|
|
3
|
+
*
|
|
4
|
+
* Reads only literal project identity (`artifactId`), description, and explicit
|
|
5
|
+
* aggregation (`modules` / `subprojects`). It never runs Maven, resolves parents,
|
|
6
|
+
* interpolates properties, or activates profiles. Parent inheritance is not
|
|
7
|
+
* module membership.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { XMLParser, XMLValidator } from "fast-xml-parser";
|
|
11
|
+
import type { DocumentContribution, ParsedDocument, WorkspaceConfig } from "./metadata-types.ts";
|
|
12
|
+
import { baseProject, isRecord, issue } from "./metadata-utils.ts";
|
|
13
|
+
import type { MetadataIssue } from "./types.ts";
|
|
14
|
+
|
|
15
|
+
const SUPPORTED_MODEL_VERSIONS = new Set(["4.0.0", "4.1.0"]);
|
|
16
|
+
const NAMESPACE_PREFIX = "http://maven.apache.org/POM/";
|
|
17
|
+
const TEXT = "#text";
|
|
18
|
+
const CDATA = "#cdata";
|
|
19
|
+
const XMLNS = "@_xmlns";
|
|
20
|
+
|
|
21
|
+
const parser = new XMLParser({
|
|
22
|
+
// Custom DOCTYPE entities are never expanded; predefined entities are decoded below.
|
|
23
|
+
processEntities: false,
|
|
24
|
+
ignoreAttributes: false,
|
|
25
|
+
attributeNamePrefix: "@_",
|
|
26
|
+
parseTagValue: false,
|
|
27
|
+
parseAttributeValue: false,
|
|
28
|
+
trimValues: true,
|
|
29
|
+
ignoreDeclaration: true,
|
|
30
|
+
ignorePiTags: true,
|
|
31
|
+
textNodeName: TEXT,
|
|
32
|
+
// Keep CDATA separate so its literal text is never entity-decoded.
|
|
33
|
+
cdataPropName: CDATA,
|
|
34
|
+
isArray: (_name, _path, _leaf, isAttribute) => !isAttribute,
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
/** Parse POM text into the shared parsed-document payload, or throw a readable error. */
|
|
38
|
+
export function parsePom(text: string): unknown {
|
|
39
|
+
const validation = XMLValidator.validate(text);
|
|
40
|
+
if (validation !== true) {
|
|
41
|
+
const { msg, line } = validation.err;
|
|
42
|
+
throw new Error(`Invalid XML at line ${line}: ${msg}`);
|
|
43
|
+
}
|
|
44
|
+
return parser.parse(text);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** Read one parsed `pom.xml` without resolving inherited or build-time behavior. */
|
|
48
|
+
export function readMavenDocument(document: ParsedDocument): DocumentContribution {
|
|
49
|
+
const issues: MetadataIssue[] = [];
|
|
50
|
+
const project = rootProject(document, issues);
|
|
51
|
+
if (!project) return { project: null, workspace: null, issues };
|
|
52
|
+
const modelVersion = readModelVersion(document.path, project, issues);
|
|
53
|
+
if (modelVersion === null) return { project: null, workspace: null, issues };
|
|
54
|
+
const name = readText(document.path, project, "artifactId", issues);
|
|
55
|
+
if (name === null && !issues.some((entry) => entry.field === "project.artifactId")) {
|
|
56
|
+
issues.push(
|
|
57
|
+
issue(document.path, "project.artifactId", "malformed", "POM declares no artifactId."),
|
|
58
|
+
);
|
|
59
|
+
}
|
|
60
|
+
const description = readText(document.path, project, "description", issues);
|
|
61
|
+
discloseProfileModules(document.path, project, issues);
|
|
62
|
+
return {
|
|
63
|
+
project: baseProject({
|
|
64
|
+
manifestPath: document.path,
|
|
65
|
+
kind: "maven-project",
|
|
66
|
+
directory: document.directory,
|
|
67
|
+
name,
|
|
68
|
+
nameField: name === null ? null : "project.artifactId",
|
|
69
|
+
description,
|
|
70
|
+
descriptionField: description === null ? null : "project.description",
|
|
71
|
+
}),
|
|
72
|
+
workspace: readAggregation(document, project, modelVersion, issues),
|
|
73
|
+
issues,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
function rootProject(
|
|
78
|
+
document: ParsedDocument,
|
|
79
|
+
issues: MetadataIssue[],
|
|
80
|
+
): Record<string, unknown> | null {
|
|
81
|
+
const data = document.data;
|
|
82
|
+
const roots = isRecord(data) ? Object.keys(data) : [];
|
|
83
|
+
const project = isRecord(data) && Array.isArray(data.project) ? data.project : null;
|
|
84
|
+
if (roots.length !== 1 || project?.length !== 1 || !isRecord(project[0])) {
|
|
85
|
+
issues.push(
|
|
86
|
+
issue(document.path, null, "malformed", "pom.xml must have one <project> root element."),
|
|
87
|
+
);
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
return project[0];
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
function readModelVersion(
|
|
94
|
+
path: string,
|
|
95
|
+
project: Record<string, unknown>,
|
|
96
|
+
issues: MetadataIssue[],
|
|
97
|
+
): string | null {
|
|
98
|
+
const declared = readText(path, project, "modelVersion", issues);
|
|
99
|
+
const namespace = typeof project[XMLNS] === "string" ? project[XMLNS] : null;
|
|
100
|
+
const fromNamespace = namespace?.startsWith(NAMESPACE_PREFIX)
|
|
101
|
+
? namespace.slice(NAMESPACE_PREFIX.length)
|
|
102
|
+
: null;
|
|
103
|
+
const version = declared ?? fromNamespace;
|
|
104
|
+
if (version !== null && SUPPORTED_MODEL_VERSIONS.has(version)) return version;
|
|
105
|
+
issues.push(
|
|
106
|
+
issue(
|
|
107
|
+
path,
|
|
108
|
+
"project.modelVersion",
|
|
109
|
+
"unsupported",
|
|
110
|
+
version === null
|
|
111
|
+
? "POM model version is not declared; only 4.0.0 and 4.1.0 are read."
|
|
112
|
+
: `Unsupported POM model version \`${version}\`; only 4.0.0 and 4.1.0 are read.`,
|
|
113
|
+
),
|
|
114
|
+
);
|
|
115
|
+
return null;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
function readAggregation(
|
|
119
|
+
document: ParsedDocument,
|
|
120
|
+
project: Record<string, unknown>,
|
|
121
|
+
modelVersion: string,
|
|
122
|
+
issues: MetadataIssue[],
|
|
123
|
+
): WorkspaceConfig | null {
|
|
124
|
+
const hasModules = Object.hasOwn(project, "modules");
|
|
125
|
+
const hasSubprojects = Object.hasOwn(project, "subprojects");
|
|
126
|
+
if (hasSubprojects && modelVersion === "4.0.0") {
|
|
127
|
+
issues.push(
|
|
128
|
+
issue(
|
|
129
|
+
document.path,
|
|
130
|
+
"project.subprojects",
|
|
131
|
+
"unsupported",
|
|
132
|
+
"subprojects requires POM model version 4.1.0.",
|
|
133
|
+
),
|
|
134
|
+
);
|
|
135
|
+
}
|
|
136
|
+
const useSubprojects = hasSubprojects && modelVersion !== "4.0.0";
|
|
137
|
+
if (useSubprojects && hasModules) {
|
|
138
|
+
issues.push(
|
|
139
|
+
issue(
|
|
140
|
+
document.path,
|
|
141
|
+
"project.modules",
|
|
142
|
+
"unsupported",
|
|
143
|
+
"modules is not combined with subprojects; only subprojects is read.",
|
|
144
|
+
),
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
const [container, child] = useSubprojects
|
|
148
|
+
? ["subprojects", "subproject"]
|
|
149
|
+
: hasModules
|
|
150
|
+
? ["modules", "module"]
|
|
151
|
+
: [null, null];
|
|
152
|
+
if (container === null || child === null) return null;
|
|
153
|
+
const field = `project.${container}.${child}`;
|
|
154
|
+
const values = readList(document.path, project[container], { container, child }, issues);
|
|
155
|
+
if (values === null) return null;
|
|
156
|
+
return {
|
|
157
|
+
kind: "maven-modules",
|
|
158
|
+
manifestPath: document.path,
|
|
159
|
+
directory: document.directory,
|
|
160
|
+
field,
|
|
161
|
+
patterns: values,
|
|
162
|
+
excludeField: null,
|
|
163
|
+
excludes: [],
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
function readList(
|
|
168
|
+
path: string,
|
|
169
|
+
nodes: unknown,
|
|
170
|
+
{ container, child }: { container: string; child: string },
|
|
171
|
+
issues: MetadataIssue[],
|
|
172
|
+
): string[] | null {
|
|
173
|
+
const field = `project.${container}`;
|
|
174
|
+
if (!Array.isArray(nodes) || nodes.length !== 1) {
|
|
175
|
+
issues.push(issue(path, field, "malformed", `${field} must appear once.`));
|
|
176
|
+
return null;
|
|
177
|
+
}
|
|
178
|
+
const node = nodes[0];
|
|
179
|
+
// An empty container element parses as an empty string.
|
|
180
|
+
if (node === "") return [];
|
|
181
|
+
if (!isRecord(node)) {
|
|
182
|
+
issues.push(issue(path, field, "malformed", `${field} must contain <${child}> elements.`));
|
|
183
|
+
return null;
|
|
184
|
+
}
|
|
185
|
+
const values: string[] = [];
|
|
186
|
+
const entries = Array.isArray(node[child]) ? node[child] : [];
|
|
187
|
+
for (const [index, entry] of entries.entries()) {
|
|
188
|
+
const value = elementText(entry);
|
|
189
|
+
if (value === null || value === "") {
|
|
190
|
+
issues.push(
|
|
191
|
+
issue(
|
|
192
|
+
path,
|
|
193
|
+
`${field}.${child}[${index}]`,
|
|
194
|
+
"malformed",
|
|
195
|
+
`${child} must be a non-empty path.`,
|
|
196
|
+
),
|
|
197
|
+
);
|
|
198
|
+
continue;
|
|
199
|
+
}
|
|
200
|
+
values.push(value);
|
|
201
|
+
}
|
|
202
|
+
return values;
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
function discloseProfileModules(
|
|
206
|
+
path: string,
|
|
207
|
+
project: Record<string, unknown>,
|
|
208
|
+
issues: MetadataIssue[],
|
|
209
|
+
): void {
|
|
210
|
+
const profiles = Array.isArray(project.profiles) ? project.profiles[0] : null;
|
|
211
|
+
const entries = isRecord(profiles) && Array.isArray(profiles.profile) ? profiles.profile : [];
|
|
212
|
+
for (const [index, profile] of entries.entries()) {
|
|
213
|
+
if (!isRecord(profile)) continue;
|
|
214
|
+
for (const container of ["modules", "subprojects"]) {
|
|
215
|
+
if (!Object.hasOwn(profile, container)) continue;
|
|
216
|
+
issues.push(
|
|
217
|
+
issue(
|
|
218
|
+
path,
|
|
219
|
+
`project.profiles.profile[${index}].${container}`,
|
|
220
|
+
"unsupported",
|
|
221
|
+
"Profile-scoped aggregation is not read; profile activation is not evaluated.",
|
|
222
|
+
),
|
|
223
|
+
);
|
|
224
|
+
}
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
/** Read one optional single text element, disclosing unsupported shapes. */
|
|
229
|
+
function readText(
|
|
230
|
+
path: string,
|
|
231
|
+
project: Record<string, unknown>,
|
|
232
|
+
key: string,
|
|
233
|
+
issues: MetadataIssue[],
|
|
234
|
+
): string | null {
|
|
235
|
+
if (!Object.hasOwn(project, key)) return null;
|
|
236
|
+
const field = `project.${key}`;
|
|
237
|
+
const nodes = project[key];
|
|
238
|
+
if (!Array.isArray(nodes) || nodes.length !== 1) {
|
|
239
|
+
issues.push(issue(path, field, "malformed", `${field} must appear once.`));
|
|
240
|
+
return null;
|
|
241
|
+
}
|
|
242
|
+
const value = elementText(nodes[0]);
|
|
243
|
+
if (value === null) {
|
|
244
|
+
issues.push(
|
|
245
|
+
issue(
|
|
246
|
+
path,
|
|
247
|
+
field,
|
|
248
|
+
"unsupported",
|
|
249
|
+
`${field} must be plain text without nested elements or custom entities.`,
|
|
250
|
+
),
|
|
251
|
+
);
|
|
252
|
+
return null;
|
|
253
|
+
}
|
|
254
|
+
if (value === "") return null;
|
|
255
|
+
if (value.includes("${")) {
|
|
256
|
+
issues.push(
|
|
257
|
+
issue(path, field, "dynamic", `${field} uses property interpolation; it is not resolved.`),
|
|
258
|
+
);
|
|
259
|
+
return null;
|
|
260
|
+
}
|
|
261
|
+
return value;
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
/**
|
|
265
|
+
* Read one element's text. Plain text is entity-decoded; a single CDATA section
|
|
266
|
+
* is literal. Nested elements and text mixed with CDATA are unsupported (null).
|
|
267
|
+
*/
|
|
268
|
+
function elementText(node: unknown): string | null {
|
|
269
|
+
if (typeof node === "string") return decodeText(node);
|
|
270
|
+
if (!isRecord(node)) return null;
|
|
271
|
+
const keys = Object.keys(node).filter((key) => !key.startsWith("@_"));
|
|
272
|
+
if (keys.length === 0) return "";
|
|
273
|
+
if (keys.length !== 1) return null;
|
|
274
|
+
const value = node[keys[0] ?? ""];
|
|
275
|
+
if (keys[0] === TEXT && typeof value === "string") return decodeText(value);
|
|
276
|
+
if (keys[0] === CDATA && Array.isArray(value) && value.length === 1) {
|
|
277
|
+
return typeof value[0] === "string" ? value[0] : null;
|
|
278
|
+
}
|
|
279
|
+
return null;
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
const PREDEFINED_ENTITIES: Readonly<Record<string, string>> = {
|
|
283
|
+
amp: "&",
|
|
284
|
+
lt: "<",
|
|
285
|
+
gt: ">",
|
|
286
|
+
quot: '"',
|
|
287
|
+
apos: "'",
|
|
288
|
+
};
|
|
289
|
+
|
|
290
|
+
/** Decode predefined and numeric character references; custom entities return null. */
|
|
291
|
+
function decodeText(value: string): string | null {
|
|
292
|
+
let unsupported = false;
|
|
293
|
+
const decoded = value.replaceAll(
|
|
294
|
+
/&(#x[0-9A-Fa-f]+|#[0-9]+|[A-Za-z_][\w.-]*);/g,
|
|
295
|
+
(_match, ref) => {
|
|
296
|
+
if (ref.startsWith("#x")) return safeCodePoint(Number.parseInt(ref.slice(2), 16));
|
|
297
|
+
if (ref.startsWith("#")) return safeCodePoint(Number.parseInt(ref.slice(1), 10));
|
|
298
|
+
const entity = PREDEFINED_ENTITIES[ref];
|
|
299
|
+
if (entity === undefined) unsupported = true;
|
|
300
|
+
return entity ?? "";
|
|
301
|
+
},
|
|
302
|
+
);
|
|
303
|
+
return unsupported ? null : decoded;
|
|
304
|
+
|
|
305
|
+
function safeCodePoint(code: number): string {
|
|
306
|
+
if (code > 0 && code <= 0x10ffff) return String.fromCodePoint(code);
|
|
307
|
+
unsupported = true;
|
|
308
|
+
return "";
|
|
309
|
+
}
|
|
310
|
+
}
|
|
@@ -25,12 +25,12 @@ export function applyMemberships(
|
|
|
25
25
|
issues: MetadataIssue[],
|
|
26
26
|
): ProjectDeclaration[] {
|
|
27
27
|
const compiled = configs.map((config) => compileConfig(config, issues));
|
|
28
|
-
const
|
|
28
|
+
const exactMatches = new Map<string, Set<string>>();
|
|
29
29
|
const result = projects.map((project) => ({
|
|
30
30
|
...project,
|
|
31
|
-
memberships: membershipsForProject(project, compiled,
|
|
31
|
+
memberships: membershipsForProject(project, compiled, exactMatches),
|
|
32
32
|
}));
|
|
33
|
-
|
|
33
|
+
reportUnmatchedExactPaths(compiled, exactMatches, issues);
|
|
34
34
|
return result;
|
|
35
35
|
}
|
|
36
36
|
|
|
@@ -60,6 +60,7 @@ function compilePattern(
|
|
|
60
60
|
value: string,
|
|
61
61
|
issues: MetadataIssue[],
|
|
62
62
|
): CompiledPattern | null {
|
|
63
|
+
if (config.kind === "maven-modules") return compileMavenModule(config, value, issues);
|
|
63
64
|
const negative = config.kind === "node-workspace" && value.startsWith("!");
|
|
64
65
|
const normalized = normalizeRelativePath(negative ? value.slice(1) : value);
|
|
65
66
|
if (
|
|
@@ -94,40 +95,88 @@ function compilePattern(
|
|
|
94
95
|
return { value, negative, glob: normalized };
|
|
95
96
|
}
|
|
96
97
|
|
|
98
|
+
/**
|
|
99
|
+
* Resolve one Maven module path to an exact root-relative project directory.
|
|
100
|
+
*
|
|
101
|
+
* Maven module values are literal paths relative to the aggregator directory,
|
|
102
|
+
* optionally naming the module's `pom.xml`. Globs are not Maven syntax.
|
|
103
|
+
*/
|
|
104
|
+
function compileMavenModule(
|
|
105
|
+
config: WorkspaceConfig,
|
|
106
|
+
value: string,
|
|
107
|
+
issues: MetadataIssue[],
|
|
108
|
+
): CompiledPattern | null {
|
|
109
|
+
const disclose = (kind: MetadataIssue["kind"], reason: string) => {
|
|
110
|
+
issues.push(issue(config.manifestPath, config.field, kind, reason));
|
|
111
|
+
return null;
|
|
112
|
+
};
|
|
113
|
+
if (value.includes("${")) {
|
|
114
|
+
return disclose("dynamic", `Module path \`${value}\` uses property interpolation.`);
|
|
115
|
+
}
|
|
116
|
+
const slashed = value.replaceAll("\\", "/");
|
|
117
|
+
if (slashed.startsWith("/") || /^[A-Za-z]:/.test(slashed)) {
|
|
118
|
+
return disclose("unsupported", `Absolute module path \`${value}\` is not read.`);
|
|
119
|
+
}
|
|
120
|
+
let directory = path.posix
|
|
121
|
+
.normalize(path.posix.join(config.directory, slashed))
|
|
122
|
+
.replace(/\/+$/, "");
|
|
123
|
+
const basename = path.posix.basename(directory);
|
|
124
|
+
if (basename === "pom.xml") directory = path.posix.dirname(directory);
|
|
125
|
+
else if (basename.endsWith(".xml")) {
|
|
126
|
+
return disclose("unsupported", `Module path \`${value}\` names a non-pom.xml file.`);
|
|
127
|
+
}
|
|
128
|
+
if (directory === config.directory || (directory === "" && config.directory === ".")) {
|
|
129
|
+
return disclose("unsupported", `Module path \`${value}\` refers to the aggregator itself.`);
|
|
130
|
+
}
|
|
131
|
+
if (directory === ".." || directory.startsWith("../")) {
|
|
132
|
+
return disclose("unresolved", `Module path \`${value}\` points outside the observation root.`);
|
|
133
|
+
}
|
|
134
|
+
return { value, negative: false, glob: directory === "" ? "." : directory };
|
|
135
|
+
}
|
|
136
|
+
|
|
97
137
|
function membershipsForProject(
|
|
98
138
|
project: ProjectDeclaration,
|
|
99
139
|
configs: readonly CompiledConfig[],
|
|
100
|
-
|
|
140
|
+
exactMatches: Map<string, Set<string>>,
|
|
101
141
|
): ProjectMembership[] {
|
|
102
142
|
const memberships: ProjectMembership[] = [];
|
|
103
143
|
for (const compiled of configs) {
|
|
104
144
|
if (!supportsKind(compiled.config.kind, project.kind)) continue;
|
|
105
|
-
const
|
|
106
|
-
if (
|
|
107
|
-
if (compiled.config.kind === "go-work") {
|
|
108
|
-
const membership = matchGoUse(compiled, project, goMatches);
|
|
109
|
-
if (membership) memberships.push(membership);
|
|
110
|
-
continue;
|
|
111
|
-
}
|
|
112
|
-
if (isExcluded(compiled, relative)) continue;
|
|
113
|
-
const matched = lastMatchingPattern(compiled.patterns, relative);
|
|
114
|
-
if (!matched) continue;
|
|
115
|
-
memberships.push({
|
|
116
|
-
kind: compiled.config.kind,
|
|
117
|
-
manifestPath: compiled.config.manifestPath,
|
|
118
|
-
field: compiled.config.field,
|
|
119
|
-
value: matched.value,
|
|
120
|
-
});
|
|
145
|
+
const membership = membershipFor(compiled, project, exactMatches);
|
|
146
|
+
if (membership) memberships.push(membership);
|
|
121
147
|
}
|
|
122
148
|
return dedupeMemberships(memberships);
|
|
123
149
|
}
|
|
124
150
|
|
|
151
|
+
function membershipFor(
|
|
152
|
+
compiled: CompiledConfig,
|
|
153
|
+
project: ProjectDeclaration,
|
|
154
|
+
exactMatches: Map<string, Set<string>>,
|
|
155
|
+
): ProjectMembership | null {
|
|
156
|
+
if (compiled.config.kind === "maven-modules") {
|
|
157
|
+
return matchExactPath(compiled, project, exactMatches);
|
|
158
|
+
}
|
|
159
|
+
const relative = relativeDirectory(compiled.config.directory, project.directory);
|
|
160
|
+
if (relative === null) return null;
|
|
161
|
+
if (compiled.config.kind === "go-work") return matchGoUse(compiled, project, exactMatches);
|
|
162
|
+
if (isExcluded(compiled, relative)) return null;
|
|
163
|
+
const matched = lastMatchingPattern(compiled.patterns, relative);
|
|
164
|
+
if (!matched) return null;
|
|
165
|
+
return {
|
|
166
|
+
kind: compiled.config.kind,
|
|
167
|
+
manifestPath: compiled.config.manifestPath,
|
|
168
|
+
field: compiled.config.field,
|
|
169
|
+
value: matched.value,
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
|
|
125
173
|
function supportsKind(
|
|
126
174
|
workspaceKind: WorkspaceConfig["kind"],
|
|
127
175
|
projectKind: ProjectDeclaration["kind"],
|
|
128
176
|
): boolean {
|
|
129
177
|
if (workspaceKind === "node-workspace") return projectKind === "node-package";
|
|
130
178
|
if (workspaceKind === "cargo-workspace") return projectKind === "rust-package";
|
|
179
|
+
if (workspaceKind === "maven-modules") return projectKind === "maven-project";
|
|
131
180
|
return projectKind === "go-module";
|
|
132
181
|
}
|
|
133
182
|
|
|
@@ -163,15 +212,33 @@ function patternMatches(pattern: CompiledPattern, relative: string): boolean {
|
|
|
163
212
|
}
|
|
164
213
|
}
|
|
165
214
|
|
|
215
|
+
/** Match a pre-resolved exact project directory, marking every spelling that resolves to it. */
|
|
216
|
+
function matchExactPath(
|
|
217
|
+
config: CompiledConfig,
|
|
218
|
+
project: ProjectDeclaration,
|
|
219
|
+
matches: Map<string, Set<string>>,
|
|
220
|
+
): ProjectMembership | null {
|
|
221
|
+
const matched = config.patterns.filter((pattern) => pattern.glob === project.directory);
|
|
222
|
+
for (const pattern of matched) markExactMatch(config.config.manifestPath, pattern.value, matches);
|
|
223
|
+
const first = matched[0];
|
|
224
|
+
if (!first) return null;
|
|
225
|
+
return {
|
|
226
|
+
kind: config.config.kind,
|
|
227
|
+
manifestPath: config.config.manifestPath,
|
|
228
|
+
field: config.config.field,
|
|
229
|
+
value: first.value,
|
|
230
|
+
};
|
|
231
|
+
}
|
|
232
|
+
|
|
166
233
|
function matchGoUse(
|
|
167
234
|
config: CompiledConfig,
|
|
168
235
|
project: ProjectDeclaration,
|
|
169
|
-
|
|
236
|
+
exactMatches: Map<string, Set<string>>,
|
|
170
237
|
): ProjectMembership | null {
|
|
171
238
|
for (const pattern of config.patterns) {
|
|
172
239
|
const usePath = normalizeRelativePath(path.posix.join(config.config.directory, pattern.glob));
|
|
173
240
|
if (usePath !== project.directory) continue;
|
|
174
|
-
|
|
241
|
+
markExactMatch(config.config.manifestPath, pattern.value, exactMatches);
|
|
175
242
|
return {
|
|
176
243
|
kind: "go-work",
|
|
177
244
|
manifestPath: config.config.manifestPath,
|
|
@@ -182,19 +249,24 @@ function matchGoUse(
|
|
|
182
249
|
return null;
|
|
183
250
|
}
|
|
184
251
|
|
|
185
|
-
function
|
|
252
|
+
function markExactMatch(
|
|
253
|
+
manifestPath: string,
|
|
254
|
+
value: string,
|
|
255
|
+
matches: Map<string, Set<string>>,
|
|
256
|
+
): void {
|
|
186
257
|
const values = matches.get(manifestPath) ?? new Set<string>();
|
|
187
258
|
values.add(value);
|
|
188
259
|
matches.set(manifestPath, values);
|
|
189
260
|
}
|
|
190
261
|
|
|
191
|
-
function
|
|
262
|
+
function reportUnmatchedExactPaths(
|
|
192
263
|
configs: readonly CompiledConfig[],
|
|
193
264
|
matches: ReadonlyMap<string, Set<string>>,
|
|
194
265
|
issues: MetadataIssue[],
|
|
195
266
|
): void {
|
|
196
267
|
for (const compiled of configs) {
|
|
197
|
-
|
|
268
|
+
const kind = compiled.config.kind;
|
|
269
|
+
if (kind !== "go-work" && kind !== "maven-modules") continue;
|
|
198
270
|
const matched = matches.get(compiled.config.manifestPath) ?? new Set<string>();
|
|
199
271
|
for (const pattern of compiled.patterns) {
|
|
200
272
|
if (matched.has(pattern.value)) continue;
|
|
@@ -203,7 +275,9 @@ function reportUnmatchedGoUses(
|
|
|
203
275
|
compiled.config.manifestPath,
|
|
204
276
|
compiled.config.field,
|
|
205
277
|
"unresolved",
|
|
206
|
-
|
|
278
|
+
kind === "go-work"
|
|
279
|
+
? `go.work use path \`${pattern.value}\` has no observed go.mod project.`
|
|
280
|
+
: `Maven module path \`${pattern.value}\` has no observed pom.xml project.`,
|
|
207
281
|
),
|
|
208
282
|
);
|
|
209
283
|
}
|
|
@@ -5,6 +5,7 @@ import * as path from "node:path";
|
|
|
5
5
|
import type { CodeRequestControl } from "@mrclrchtr/supi-code-runtime/api";
|
|
6
6
|
import { parse as parseToml } from "smol-toml";
|
|
7
7
|
import { parseDocument } from "yaml";
|
|
8
|
+
import { parsePom } from "./maven.ts";
|
|
8
9
|
import type { MetadataReadResult, ParsedDocument } from "./metadata-types.ts";
|
|
9
10
|
import { isRecord, issue } from "./metadata-utils.ts";
|
|
10
11
|
import { errorMessage, relativeDirectory } from "./paths.ts";
|
|
@@ -25,6 +26,8 @@ const KIND_BY_BASENAME = new Map<string, MetadataDocumentKind>([
|
|
|
25
26
|
["Cargo.toml", "cargo"],
|
|
26
27
|
["go.mod", "go-mod"],
|
|
27
28
|
["go.work", "go-work"],
|
|
29
|
+
["pom.xml", "maven-pom"],
|
|
30
|
+
["CMakeLists.txt", "cmake-lists"],
|
|
28
31
|
]);
|
|
29
32
|
|
|
30
33
|
interface ReadOutcome {
|
|
@@ -105,7 +108,9 @@ function parseText(relativePath: string, kind: MetadataDocumentKind, text: strin
|
|
|
105
108
|
}
|
|
106
109
|
return complete(relativePath, kind, document.toJS());
|
|
107
110
|
}
|
|
108
|
-
if (kind === "go-mod" || kind === "go-work"
|
|
111
|
+
if (kind === "go-mod" || kind === "go-work" || kind === "cmake-lists")
|
|
112
|
+
return complete(relativePath, kind, text);
|
|
113
|
+
if (kind === "maven-pom") return complete(relativePath, kind, parsePom(text));
|
|
109
114
|
return complete(relativePath, kind, parseToml(text));
|
|
110
115
|
} catch (error) {
|
|
111
116
|
return failed(relativePath, kind, `Could not parse metadata: ${errorMessage(error)}`);
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
/** Shared bounded workspace observation used by overview and Orientation surfaces. */
|
|
2
2
|
|
|
3
3
|
import * as path from "node:path";
|
|
4
|
+
import { readCMakeDocument } from "./cmake.ts";
|
|
4
5
|
import { readGoDocument } from "./go.ts";
|
|
5
6
|
import { collectInventory, DEFAULT_MAX_INVENTORY_ENTRIES } from "./inventory.ts";
|
|
7
|
+
import { readMavenDocument } from "./maven.ts";
|
|
6
8
|
import { applyMemberships } from "./membership.ts";
|
|
7
9
|
import { readMetadataDocuments } from "./metadata.ts";
|
|
8
10
|
import type { DocumentContribution, ParsedDocument } from "./metadata-types.ts";
|
|
@@ -133,6 +135,10 @@ function readDocument(document: ParsedDocument): DocumentContribution {
|
|
|
133
135
|
case "go-mod":
|
|
134
136
|
case "go-work":
|
|
135
137
|
return readGoDocument(document);
|
|
138
|
+
case "maven-pom":
|
|
139
|
+
return readMavenDocument(document);
|
|
140
|
+
case "cmake-lists":
|
|
141
|
+
return readCMakeDocument(document);
|
|
136
142
|
}
|
|
137
143
|
}
|
|
138
144
|
|
|
@@ -76,7 +76,9 @@ export type MetadataDocumentKind =
|
|
|
76
76
|
| "pyproject"
|
|
77
77
|
| "cargo"
|
|
78
78
|
| "go-mod"
|
|
79
|
-
| "go-work"
|
|
79
|
+
| "go-work"
|
|
80
|
+
| "maven-pom"
|
|
81
|
+
| "cmake-lists";
|
|
80
82
|
|
|
81
83
|
/** Metadata read outcome retained for provenance. */
|
|
82
84
|
export interface MetadataDocument {
|
|
@@ -117,12 +119,18 @@ export interface WorkspaceMetadataObservation {
|
|
|
117
119
|
}
|
|
118
120
|
|
|
119
121
|
/** Native project declaration kinds supported by this collector. */
|
|
120
|
-
export type ProjectKind =
|
|
122
|
+
export type ProjectKind =
|
|
123
|
+
| "node-package"
|
|
124
|
+
| "python-project"
|
|
125
|
+
| "rust-package"
|
|
126
|
+
| "go-module"
|
|
127
|
+
| "maven-project"
|
|
128
|
+
| "cmake-project";
|
|
121
129
|
|
|
122
130
|
/** How one configuration explicitly established project membership. */
|
|
123
131
|
export interface ProjectMembership {
|
|
124
132
|
/** Native workspace declaration family. */
|
|
125
|
-
readonly kind: "node-workspace" | "cargo-workspace" | "go-work";
|
|
133
|
+
readonly kind: "node-workspace" | "cargo-workspace" | "go-work" | "maven-modules";
|
|
126
134
|
/** Root-relative configuration or manifest path that declared membership. */
|
|
127
135
|
readonly manifestPath: string;
|
|
128
136
|
/** Exact declaring field or directive. */
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type { DiagnosticEvidenceSummary } from "@mrclrchtr/supi-lsp/api";
|
|
2
|
+
import type { HealthDiagnosticObservation } from "../session/health-types.ts";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* The single rule for complete diagnostic evidence: every requested file is confirmed. Unconfirmed,
|
|
6
|
+
* failed, and removed files all block completeness. A removed file blocks it because files that
|
|
7
|
+
* imported it may not have been re-checked yet (#371, #602).
|
|
8
|
+
*
|
|
9
|
+
* Collection uses it to choose a `completed` or `partial` observation, and
|
|
10
|
+
* {@link classifyDiagnosticCoverage} uses it for `confirmed`, so a `completed` observation is always
|
|
11
|
+
* `confirmed` or `none` coverage, never `incomplete`.
|
|
12
|
+
*/
|
|
13
|
+
export function allRequestedFilesConfirmed(
|
|
14
|
+
evidence: Omit<DiagnosticEvidenceSummary, "documents">,
|
|
15
|
+
): boolean {
|
|
16
|
+
return (
|
|
17
|
+
evidence.confirmed === evidence.requested &&
|
|
18
|
+
evidence.unconfirmed === 0 &&
|
|
19
|
+
evidence.failed === 0 &&
|
|
20
|
+
evidence.removed === 0
|
|
21
|
+
);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* What a requested diagnostic observation establishes, derived only from its kind and exact
|
|
26
|
+
* evidence counts. Shared by the model-facing `code_health` output and the status inspector.
|
|
27
|
+
*
|
|
28
|
+
* - `unavailable`: no diagnostic result could be collected.
|
|
29
|
+
* - `none`: zero files were requested and no diagnostics exist, so nothing was checked.
|
|
30
|
+
* - `incomplete`: some requested files are unconfirmed, failed, or removed, or collection was partial.
|
|
31
|
+
* - `confirmed`: every requested file was confirmed. This never establishes project-wide validity.
|
|
32
|
+
*/
|
|
33
|
+
export type DiagnosticCoverage = "unavailable" | "none" | "incomplete" | "confirmed";
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Classify a collected observation. `partial` is never `confirmed`. Zero requested files with no
|
|
37
|
+
* entries is `none`, even for a `partial` observation. Uses the same completeness rule as
|
|
38
|
+
* collection ({@link allRequestedFilesConfirmed}), so `completed` never classifies as `incomplete`.
|
|
39
|
+
*/
|
|
40
|
+
export function classifyDiagnosticCoverage(
|
|
41
|
+
observation: Exclude<HealthDiagnosticObservation, { kind: "not-requested" }>,
|
|
42
|
+
): DiagnosticCoverage {
|
|
43
|
+
if (observation.kind === "unavailable") return "unavailable";
|
|
44
|
+
const evidence = observation.evidence;
|
|
45
|
+
if (evidence.requested === 0 && observation.entries.length === 0) return "none";
|
|
46
|
+
return observation.kind === "completed" && allRequestedFilesConfirmed(evidence)
|
|
47
|
+
? "confirmed"
|
|
48
|
+
: "incomplete";
|
|
49
|
+
}
|
|
@@ -15,12 +15,20 @@ export function mergeDiagnosticEvidence(
|
|
|
15
15
|
const byFile = new Map<string, DiagnosticEvidenceDocument>();
|
|
16
16
|
for (const document of [...previous.documents, ...latest.documents]) {
|
|
17
17
|
const file = cwd ? path.relative(cwd, path.resolve(cwd, document.file)) : document.file;
|
|
18
|
-
const next = {
|
|
18
|
+
const next: DiagnosticEvidenceDocument = {
|
|
19
|
+
file,
|
|
20
|
+
status: document.status,
|
|
21
|
+
...(document.reason ? { reason: document.reason } : {}),
|
|
22
|
+
};
|
|
19
23
|
const previousDocument = byFile.get(file);
|
|
20
24
|
if (
|
|
21
25
|
!previousDocument ||
|
|
22
26
|
policy === "latest" ||
|
|
23
|
-
evidenceStatusRank(next.status) > evidenceStatusRank(previousDocument.status)
|
|
27
|
+
evidenceStatusRank(next.status) > evidenceStatusRank(previousDocument.status) ||
|
|
28
|
+
// Equal rank: keep a known cause instead of a reason-less duplicate.
|
|
29
|
+
(next.status === previousDocument.status &&
|
|
30
|
+
previousDocument.reason === undefined &&
|
|
31
|
+
next.reason !== undefined)
|
|
24
32
|
) {
|
|
25
33
|
byFile.set(file, next);
|
|
26
34
|
}
|
|
@@ -18,6 +18,7 @@ import {
|
|
|
18
18
|
collectDiagnostics,
|
|
19
19
|
diagnosticScope,
|
|
20
20
|
isScopedFile,
|
|
21
|
+
reportedRemovedFiles,
|
|
21
22
|
} from "../analysis/health/diagnostics.ts";
|
|
22
23
|
import { describeStructuralState } from "../analysis/health/recovery.ts";
|
|
23
24
|
import { deriveWorkspaceSemanticHealthState } from "../analysis/health/semantic-state.ts";
|
|
@@ -143,6 +144,11 @@ export async function runHealthWorkflow(
|
|
|
143
144
|
};
|
|
144
145
|
|
|
145
146
|
throwIfAborted(control);
|
|
147
|
+
// A refresh report delivers retained removals once; passive reads keep them
|
|
148
|
+
// so a later refresh still reports them.
|
|
149
|
+
if (request.refresh === true && runtime) {
|
|
150
|
+
runtime.acknowledgeRemovedTrackedFiles(reportedRemovedFiles(diagnostics, deps.cwd));
|
|
151
|
+
}
|
|
146
152
|
return { kind: "completed", data };
|
|
147
153
|
}
|
|
148
154
|
function healthNeedsSemantic(included: readonly HealthSection[]): boolean {
|