@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
package/node_modules/@mrclrchtr/supi-lsp/node_modules/@mrclrchtr/supi-core/src/retired-packages.ts
ADDED
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
// supi-core retired-packages domain — warn when a retired SuPi package is still declared.
|
|
2
|
+
//
|
|
3
|
+
// Retired packages keep loading after an upgrade until the user removes them, and their
|
|
4
|
+
// surfaces can shadow the package that absorbed them. Detection reads the declared Pi
|
|
5
|
+
// packages per scope, the same view `pi remove` acts on, and never infers identity from paths.
|
|
6
|
+
|
|
7
|
+
import type {
|
|
8
|
+
ExtensionAPI,
|
|
9
|
+
ExtensionContext,
|
|
10
|
+
PackageSource,
|
|
11
|
+
} from "@earendil-works/pi-coding-agent";
|
|
12
|
+
import { SettingsManager } from "@earendil-works/pi-coding-agent";
|
|
13
|
+
import { recordDebugEvent } from "./debug-registry.ts";
|
|
14
|
+
|
|
15
|
+
/** A retired npm package and the package that now ships its features. */
|
|
16
|
+
export interface RetiredPackage {
|
|
17
|
+
/** npm package name, e.g. `"@mrclrchtr/supi-cache"`. */
|
|
18
|
+
name: string;
|
|
19
|
+
/** npm package name that absorbed it, e.g. `"@mrclrchtr/supi-debug"`. */
|
|
20
|
+
replacement: string;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** Pi settings scope of a package declaration. */
|
|
24
|
+
export type PackageDeclarationScope = "user" | "project";
|
|
25
|
+
|
|
26
|
+
/** One declaration of a retired package found in Pi settings. */
|
|
27
|
+
export interface RetiredPackageDeclaration {
|
|
28
|
+
package: RetiredPackage;
|
|
29
|
+
scope: PackageDeclarationScope;
|
|
30
|
+
/** Exact command that removes this declaration. */
|
|
31
|
+
removeCommand: string;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** Declared Pi packages per scope. Omit `project` when the project is not trusted. */
|
|
35
|
+
export interface DeclaredPackages {
|
|
36
|
+
user: readonly PackageSource[];
|
|
37
|
+
project?: readonly PackageSource[];
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** Options for {@link warnRetiredPackages}. */
|
|
41
|
+
export interface WarnRetiredPackagesOptions {
|
|
42
|
+
/** Debug event source, e.g. `"supi-debug"`. */
|
|
43
|
+
source: string;
|
|
44
|
+
/** Override Pi's agent directory (tests). */
|
|
45
|
+
agentDir?: string;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const WARNED_KEY = Symbol.for("@mrclrchtr/supi-core/retired-packages-warned");
|
|
49
|
+
const NPM_PREFIX = "npm:";
|
|
50
|
+
const NPM_NAME_RE = /^(@[^/\s]+\/[^@\s]+|[^@\s]+)(?:@.+)?$/;
|
|
51
|
+
|
|
52
|
+
/** npm package name of a Pi package source, ignoring version pins; `undefined` for non-npm sources. */
|
|
53
|
+
export function npmPackageName(source: PackageSource): string | undefined {
|
|
54
|
+
const value = (typeof source === "string" ? source : source.source).trim();
|
|
55
|
+
if (!value.startsWith(NPM_PREFIX)) return undefined;
|
|
56
|
+
return NPM_NAME_RE.exec(value.slice(NPM_PREFIX.length).trim())?.[1];
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** Find declarations of retired packages, project scope first (Pi's load precedence). */
|
|
60
|
+
export function findRetiredPackageDeclarations(
|
|
61
|
+
declared: DeclaredPackages,
|
|
62
|
+
retired: readonly RetiredPackage[],
|
|
63
|
+
): RetiredPackageDeclaration[] {
|
|
64
|
+
const scopes: Array<[PackageDeclarationScope, readonly PackageSource[] | undefined]> = [
|
|
65
|
+
["project", declared.project],
|
|
66
|
+
["user", declared.user],
|
|
67
|
+
];
|
|
68
|
+
const found: RetiredPackageDeclaration[] = [];
|
|
69
|
+
for (const [scope, sources] of scopes) {
|
|
70
|
+
const names = new Set((sources ?? []).map(npmPackageName));
|
|
71
|
+
for (const pkg of retired) {
|
|
72
|
+
if (!names.has(pkg.name)) continue;
|
|
73
|
+
const local = scope === "project" ? " --local" : "";
|
|
74
|
+
found.push({ package: pkg, scope, removeCommand: `pi remove npm:${pkg.name}${local}` });
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return found;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** Format one bounded, actionable warning for one retired package. */
|
|
81
|
+
export function formatRetiredPackageWarning(
|
|
82
|
+
pkg: RetiredPackage,
|
|
83
|
+
declarations: readonly RetiredPackageDeclaration[],
|
|
84
|
+
): string {
|
|
85
|
+
const commands = declarations.map((declaration) => ` ${declaration.removeCommand}`);
|
|
86
|
+
return [
|
|
87
|
+
`${pkg.name} is retired; ${pkg.replacement} now ships its features, and the old package can override them. Remove it:`,
|
|
88
|
+
...commands,
|
|
89
|
+
].join("\n");
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
function warnedNames(): Set<string> {
|
|
93
|
+
const store = globalThis as Record<symbol, Set<string> | undefined>;
|
|
94
|
+
store[WARNED_KEY] ??= new Set();
|
|
95
|
+
return store[WARNED_KEY];
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
function readDeclaredPackages(
|
|
99
|
+
ctx: Pick<ExtensionContext, "cwd" | "isProjectTrusted">,
|
|
100
|
+
agentDir: string | undefined,
|
|
101
|
+
): DeclaredPackages {
|
|
102
|
+
const projectTrusted = ctx.isProjectTrusted();
|
|
103
|
+
const settings = SettingsManager.create(ctx.cwd, agentDir, { projectTrusted });
|
|
104
|
+
return {
|
|
105
|
+
user: settings.getGlobalSettings().packages ?? [],
|
|
106
|
+
...(projectTrusted ? { project: settings.getProjectSettings().packages ?? [] } : {}),
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* Warn once per Pi process for each retired package that is still declared in user or
|
|
112
|
+
* trusted project settings. Shows a UI warning, or writes to stderr without UI, and records
|
|
113
|
+
* a `retired-package` Debug event. Never throws; unreadable settings skip the check.
|
|
114
|
+
*/
|
|
115
|
+
export function warnRetiredPackages(
|
|
116
|
+
pi: ExtensionAPI,
|
|
117
|
+
retired: readonly RetiredPackage[],
|
|
118
|
+
options: WarnRetiredPackagesOptions,
|
|
119
|
+
): void {
|
|
120
|
+
pi.on("session_start", (_event, ctx) => {
|
|
121
|
+
const warned = warnedNames();
|
|
122
|
+
const pending = retired.filter((pkg) => !warned.has(pkg.name));
|
|
123
|
+
if (pending.length === 0) return;
|
|
124
|
+
|
|
125
|
+
let declarations: RetiredPackageDeclaration[];
|
|
126
|
+
try {
|
|
127
|
+
declarations = findRetiredPackageDeclarations(
|
|
128
|
+
readDeclaredPackages(ctx, options.agentDir),
|
|
129
|
+
pending,
|
|
130
|
+
);
|
|
131
|
+
} catch {
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
for (const pkg of pending) {
|
|
136
|
+
const matches = declarations.filter((declaration) => declaration.package === pkg);
|
|
137
|
+
if (matches.length === 0) continue;
|
|
138
|
+
warned.add(pkg.name);
|
|
139
|
+
const message = formatRetiredPackageWarning(pkg, matches);
|
|
140
|
+
if (ctx.hasUI) ctx.ui.notify(message, "warning");
|
|
141
|
+
else process.stderr.write(`${message}\n`);
|
|
142
|
+
recordDebugEvent({
|
|
143
|
+
source: options.source,
|
|
144
|
+
level: "warning",
|
|
145
|
+
category: "retired-package",
|
|
146
|
+
message: `${pkg.name} is retired but still declared`,
|
|
147
|
+
cwd: ctx.cwd,
|
|
148
|
+
data: { name: pkg.name, replacement: pkg.replacement, scopes: matches.map((m) => m.scope) },
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
// Shell hints — explain BSD sed script errors once per session.
|
|
2
|
+
//
|
|
3
|
+
// On macOS, `sed` is BSD sed: `-i` requires a backup-suffix argument and script errors read
|
|
4
|
+
// `sed: 1: "...": ...`. Agents trained on GNU sed retry the same shape repeatedly. This hook adds
|
|
5
|
+
// one hint to the first matching bash result in a session. It costs no context until it fires.
|
|
6
|
+
|
|
7
|
+
import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
|
|
8
|
+
|
|
9
|
+
/** Marker that identifies the hint in tool results and on the session branch. */
|
|
10
|
+
export const BSD_SED_HINT_MARKER = "[supi shell hint]";
|
|
11
|
+
|
|
12
|
+
/** Text appended to the first BSD sed script error in a session. */
|
|
13
|
+
export const BSD_SED_HINT = `${BSD_SED_HINT_MARKER} This is BSD sed (macOS): \`sed -i\` needs a suffix argument (\`sed -i '' ...\`), and the substitute delimiter must not occur in the pattern. Prefer the edit tool for file changes when it is available, or \`gsed\` if installed.`;
|
|
14
|
+
|
|
15
|
+
const BSD_SED_ERROR = /^sed: (?:\d+: |-i may not be used|-I or -i may not be used)/m;
|
|
16
|
+
|
|
17
|
+
function resultText(content: readonly { type: string; text?: string }[]): string {
|
|
18
|
+
return content.map((part) => (part.type === "text" ? (part.text ?? "") : "")).join("\n");
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
function hintAlreadyShown(ctx: ExtensionContext): boolean {
|
|
22
|
+
return ctx.sessionManager
|
|
23
|
+
.getBranch()
|
|
24
|
+
.some(
|
|
25
|
+
(entry) =>
|
|
26
|
+
entry.type === "message" &&
|
|
27
|
+
entry.message.role === "toolResult" &&
|
|
28
|
+
JSON.stringify(entry.message.content).includes(BSD_SED_HINT_MARKER),
|
|
29
|
+
);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Register a `tool_result` hook that appends {@link BSD_SED_HINT} to the first bash result in a
|
|
34
|
+
* session that contains a BSD sed script error. Safe to register from several extensions: the hook
|
|
35
|
+
* skips results that already carry the hint and sessions whose branch already shows it.
|
|
36
|
+
* Usable directly as a child-session extension factory.
|
|
37
|
+
*/
|
|
38
|
+
export function registerShellHints(pi: ExtensionAPI): void {
|
|
39
|
+
pi.on("tool_result", (event, ctx) => {
|
|
40
|
+
if (event.toolName !== "bash") return;
|
|
41
|
+
const text = resultText(event.content);
|
|
42
|
+
if (!BSD_SED_ERROR.test(text) || text.includes(BSD_SED_HINT_MARKER)) return;
|
|
43
|
+
if (hintAlreadyShown(ctx)) return;
|
|
44
|
+
return { content: [...event.content, { type: "text", text: BSD_SED_HINT }] };
|
|
45
|
+
});
|
|
46
|
+
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
// supi-core spill domain — create-only temp files for full tool output (#597).
|
|
2
|
+
//
|
|
3
|
+
// SuPi never deletes spill files. Instead, it writes few of them: one private base directory per
|
|
4
|
+
// user, content-addressed names, and reuse for identical content. The OS temp purge owns their
|
|
5
|
+
// lifetime, so paths returned to the model stay readable for the session.
|
|
6
|
+
|
|
7
|
+
import { createHash, randomBytes } from "node:crypto";
|
|
8
|
+
import { lstatSync, mkdirSync, mkdtempSync, renameSync, writeFileSync } from "node:fs";
|
|
9
|
+
import { tmpdir } from "node:os";
|
|
10
|
+
import { extname, join } from "node:path";
|
|
11
|
+
|
|
12
|
+
/** Input for {@link writeSpillFile}. */
|
|
13
|
+
export interface SpillFileOptions {
|
|
14
|
+
/** Producer id used as sub-directory, e.g. `"agent"`. Lowercase letters, digits, and dashes. */
|
|
15
|
+
owner: string;
|
|
16
|
+
/** Descriptive file name, e.g. `"snapshot.md"`. The content hash is inserted before the extension. */
|
|
17
|
+
name: string;
|
|
18
|
+
/** Full content to persist. */
|
|
19
|
+
content: string;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const SEGMENT = /^[a-z0-9][a-z0-9-]*$/;
|
|
23
|
+
const FILE_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Persist full output that did not fit inline and return its absolute path.
|
|
27
|
+
*
|
|
28
|
+
* Layout: `$TMPDIR/supi-<uid>/<owner>/<stem>-<sha256 prefix><ext>`. Identical content maps to the
|
|
29
|
+
* same file, which is reused. Both directories must be real directories owned by the current
|
|
30
|
+
* user without group/other access; otherwise the file falls back to a fresh `mkdtemp`
|
|
31
|
+
* directory, as before. Files are created with mode `0600` and published atomically by rename.
|
|
32
|
+
*/
|
|
33
|
+
export function writeSpillFile({ owner, name, content }: SpillFileOptions): string {
|
|
34
|
+
if (!SEGMENT.test(owner)) throw new Error(`Invalid spill owner: ${owner}`);
|
|
35
|
+
if (!FILE_NAME.test(name)) throw new Error(`Invalid spill file name: ${name}`);
|
|
36
|
+
const extension = extname(name);
|
|
37
|
+
const stem = name.slice(0, name.length - extension.length);
|
|
38
|
+
const hash = createHash("sha256").update(content).digest("hex").slice(0, 32);
|
|
39
|
+
const fileName = `${stem}-${hash}${extension}`;
|
|
40
|
+
|
|
41
|
+
const directory = privateSpillDirectory(owner);
|
|
42
|
+
if (!directory) {
|
|
43
|
+
const fallback = join(mkdtempSync(join(tmpdir(), `supi-${owner}-`)), fileName);
|
|
44
|
+
writeFileSync(fallback, content, { encoding: "utf8", mode: 0o600, flag: "wx" });
|
|
45
|
+
return fallback;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const target = join(directory, fileName);
|
|
49
|
+
if (isRegularFile(target)) return target;
|
|
50
|
+
const staging = join(directory, `.${fileName}.${process.pid}.${randomBytes(4).toString("hex")}`);
|
|
51
|
+
writeFileSync(staging, content, { encoding: "utf8", mode: 0o600, flag: "wx" });
|
|
52
|
+
// Atomic publish; a concurrent writer of the same hash replaces it with identical bytes.
|
|
53
|
+
renameSync(staging, target);
|
|
54
|
+
return target;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** Return the validated private spill directory for `owner`, or undefined when it is unsafe. */
|
|
58
|
+
function privateSpillDirectory(owner: string): string | undefined {
|
|
59
|
+
const uid = process.getuid?.();
|
|
60
|
+
const base = join(tmpdir(), uid === undefined ? "supi" : `supi-${uid}`);
|
|
61
|
+
if (!ensurePrivateDirectory(base, uid)) return undefined;
|
|
62
|
+
const directory = join(base, owner);
|
|
63
|
+
return ensurePrivateDirectory(directory, uid) ? directory : undefined;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Create `path` with mode `0700` if missing, then accept it only when it is a real directory
|
|
68
|
+
* (not a symlink) owned by `uid` with no group/other permissions. Never modifies or removes an
|
|
69
|
+
* existing entry. Ownership and mode checks are skipped where POSIX ids are unavailable.
|
|
70
|
+
*/
|
|
71
|
+
function ensurePrivateDirectory(path: string, uid: number | undefined): boolean {
|
|
72
|
+
try {
|
|
73
|
+
mkdirSync(path, { mode: 0o700 });
|
|
74
|
+
} catch (error) {
|
|
75
|
+
if ((error as NodeJS.ErrnoException).code !== "EEXIST") return false;
|
|
76
|
+
}
|
|
77
|
+
try {
|
|
78
|
+
const stats = lstatSync(path);
|
|
79
|
+
if (!stats.isDirectory() || stats.isSymbolicLink()) return false;
|
|
80
|
+
if (uid === undefined) return true;
|
|
81
|
+
return stats.uid === uid && (stats.mode & 0o077) === 0;
|
|
82
|
+
} catch {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function isRegularFile(path: string): boolean {
|
|
88
|
+
try {
|
|
89
|
+
return lstatSync(path).isFile();
|
|
90
|
+
} catch {
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mrclrchtr/supi-lsp",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "13.0.0",
|
|
4
4
|
"description": "Language Server Protocol runtime for SuPi code intelligence",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -32,14 +32,14 @@
|
|
|
32
32
|
"!__tests__"
|
|
33
33
|
],
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"ignore": "
|
|
36
|
-
"semver": "
|
|
35
|
+
"ignore": "7.0.14",
|
|
36
|
+
"semver": "7.8.6",
|
|
37
37
|
"typescript": "6.0.3",
|
|
38
|
-
"vscode-jsonrpc": "
|
|
39
|
-
"vscode-languageserver-protocol": "
|
|
40
|
-
"vscode-languageserver-types": "
|
|
41
|
-
"@mrclrchtr/supi-
|
|
42
|
-
"@mrclrchtr/supi-
|
|
38
|
+
"vscode-jsonrpc": "10.0.0",
|
|
39
|
+
"vscode-languageserver-protocol": "3.18.5",
|
|
40
|
+
"vscode-languageserver-types": "3.18.5",
|
|
41
|
+
"@mrclrchtr/supi-core": "13.0.0",
|
|
42
|
+
"@mrclrchtr/supi-code-runtime": "13.0.0"
|
|
43
43
|
},
|
|
44
44
|
"bundledDependencies": [
|
|
45
45
|
"@mrclrchtr/supi-code-runtime",
|
|
@@ -5,9 +5,14 @@ import {
|
|
|
5
5
|
isTentativePushEntry,
|
|
6
6
|
isValidPublishDiagnosticsParams,
|
|
7
7
|
} from "./client-diagnostic-evidence.ts";
|
|
8
|
+
import { type DiskStamp, sameDiskStamp } from "./client-disk-stamp.ts";
|
|
8
9
|
import type { ClientDiagnosticSnapshot, OpenDocumentState } from "./client-document-state.ts";
|
|
9
10
|
import { hasCurrentDiagnosticEvidence } from "./client-document-state.ts";
|
|
10
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
type DiagnosticFileState,
|
|
13
|
+
type DiagnosticFileStatus,
|
|
14
|
+
getDiagnosticFileStatus,
|
|
15
|
+
} from "./client-file-state.ts";
|
|
11
16
|
|
|
12
17
|
interface ApplyPushOptions {
|
|
13
18
|
store: Map<string, DiagnosticCacheEntry>;
|
|
@@ -119,15 +124,39 @@ function buildPushCacheEntry(
|
|
|
119
124
|
};
|
|
120
125
|
}
|
|
121
126
|
|
|
122
|
-
/**
|
|
123
|
-
export
|
|
127
|
+
/** Options for one client diagnostic snapshot. */
|
|
128
|
+
export interface BuildClientDiagnosticSnapshotOptions {
|
|
124
129
|
store: ReadonlyMap<string, DiagnosticCacheEntry>;
|
|
125
130
|
openDocuments: ReadonlyMap<string, OpenDocumentState>;
|
|
126
131
|
failedDocuments: ReadonlySet<string>;
|
|
127
132
|
evidenceRevision: number;
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
133
|
+
/** Stamp of the last verified disk read for one URI, when one exists. */
|
|
134
|
+
observedDiskStamp?: (uri: string) => DiskStamp | undefined;
|
|
135
|
+
/** File-status seam; defaults to one stat per URI. */
|
|
136
|
+
readFileStatus?: (filePath: string) => DiagnosticFileStatus;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
/** Per-URI disk facts shared by every projection of one snapshot. */
|
|
140
|
+
interface SnapshotFileFacts {
|
|
141
|
+
readonly state: DiagnosticFileState;
|
|
142
|
+
/** The file's disk stamp differs from the last verified read. */
|
|
143
|
+
readonly diskChanged: boolean;
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* Build one client snapshot without dropping empty-cache freshness.
|
|
148
|
+
*
|
|
149
|
+
* Passive and side-effect free: one stat per URI, no synchronization, request,
|
|
150
|
+
* or enrollment. A document whose disk stamp differs from its last verified
|
|
151
|
+
* read is reported unconfirmed with reason `disk-changed`. Metadata can only
|
|
152
|
+
* withdraw confirmation; a later content read restores it.
|
|
153
|
+
*/
|
|
154
|
+
export function buildClientDiagnosticSnapshot(
|
|
155
|
+
options: BuildClientDiagnosticSnapshotOptions,
|
|
156
|
+
): ClientDiagnosticSnapshot {
|
|
157
|
+
const facts = createFileFactsReader(options);
|
|
158
|
+
const documents = collectDocumentFreshness(options, facts);
|
|
159
|
+
const cache = collectCachedDiagnostics(options, facts);
|
|
131
160
|
return {
|
|
132
161
|
entries: cache.entries,
|
|
133
162
|
documents,
|
|
@@ -135,42 +164,65 @@ export function buildClientDiagnosticSnapshot(options: {
|
|
|
135
164
|
};
|
|
136
165
|
}
|
|
137
166
|
|
|
138
|
-
function
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
167
|
+
function createFileFactsReader(
|
|
168
|
+
options: BuildClientDiagnosticSnapshotOptions,
|
|
169
|
+
): (uri: string) => SnapshotFileFacts {
|
|
170
|
+
const readFileStatus = options.readFileStatus ?? getDiagnosticFileStatus;
|
|
171
|
+
const cache = new Map<string, SnapshotFileFacts>();
|
|
172
|
+
return (uri) => {
|
|
173
|
+
const cached = cache.get(uri);
|
|
174
|
+
if (cached) return cached;
|
|
175
|
+
const status = readFileStatus(uriToFile(uri));
|
|
176
|
+
const observed = options.observedDiskStamp?.(uri);
|
|
177
|
+
const facts = {
|
|
178
|
+
state: status.state,
|
|
179
|
+
diskChanged:
|
|
180
|
+
status.state === "present" &&
|
|
181
|
+
observed !== undefined &&
|
|
182
|
+
(status.stamp === undefined || !sameDiskStamp(observed, status.stamp)),
|
|
183
|
+
};
|
|
184
|
+
cache.set(uri, facts);
|
|
185
|
+
return facts;
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
function collectDocumentFreshness(
|
|
190
|
+
options: BuildClientDiagnosticSnapshotOptions,
|
|
191
|
+
facts: (uri: string) => SnapshotFileFacts,
|
|
192
|
+
): ClientDiagnosticSnapshot["documents"] {
|
|
193
|
+
const open = collectOpenDocumentFreshness(options, facts);
|
|
145
194
|
return [
|
|
146
195
|
...open.documents,
|
|
147
|
-
...collectFailedDocumentFreshness(options.failedDocuments, open.uris),
|
|
148
|
-
...collectUntrackedCacheFreshness(options.store, open.uris, options.failedDocuments),
|
|
196
|
+
...collectFailedDocumentFreshness(options.failedDocuments, open.uris, facts),
|
|
197
|
+
...collectUntrackedCacheFreshness(options.store, open.uris, options.failedDocuments, facts),
|
|
149
198
|
];
|
|
150
199
|
}
|
|
151
200
|
|
|
152
|
-
function collectOpenDocumentFreshness(
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
evidenceRevision: number;
|
|
157
|
-
}): { documents: ClientDiagnosticSnapshot["documents"]; uris: ReadonlySet<string> } {
|
|
201
|
+
function collectOpenDocumentFreshness(
|
|
202
|
+
options: BuildClientDiagnosticSnapshotOptions,
|
|
203
|
+
facts: (uri: string) => SnapshotFileFacts,
|
|
204
|
+
): { documents: ClientDiagnosticSnapshot["documents"]; uris: ReadonlySet<string> } {
|
|
158
205
|
const documents: ClientDiagnosticSnapshot["documents"] = [];
|
|
159
206
|
const uris = new Set<string>();
|
|
160
207
|
for (const [uri, document] of options.openDocuments) {
|
|
161
208
|
uris.add(uri);
|
|
162
209
|
const entry = options.store.get(uri);
|
|
163
|
-
const fileState =
|
|
210
|
+
const { state: fileState, diskChanged } = facts(uri);
|
|
164
211
|
const current = hasCurrentDiagnosticEvidence(document, entry, options.evidenceRevision);
|
|
165
212
|
const failed = options.failedDocuments.has(uri);
|
|
166
213
|
// A current tentative push maps to unconfirmed, not to a new public
|
|
167
214
|
// status: it matches the synchronization but cannot confirm it yet, so
|
|
168
215
|
// it must not claim current snapshot or document state (issue #351).
|
|
169
216
|
const tentative = current && isTentativePushEntry(entry);
|
|
217
|
+
const status = statusForDocument(fileState, current && !diskChanged, failed, tentative);
|
|
170
218
|
documents.push({
|
|
171
219
|
uri,
|
|
172
|
-
current: fileState === "present" && current && !failed && !tentative,
|
|
173
|
-
status
|
|
220
|
+
current: fileState === "present" && current && !failed && !tentative && !diskChanged,
|
|
221
|
+
status,
|
|
222
|
+
// Name the cause only where it alone withdrew confirmation.
|
|
223
|
+
...(diskChanged && status === "unconfirmed" && current && !tentative
|
|
224
|
+
? { reason: "disk-changed" as const }
|
|
225
|
+
: {}),
|
|
174
226
|
});
|
|
175
227
|
}
|
|
176
228
|
return { documents, uris };
|
|
@@ -179,16 +231,14 @@ function collectOpenDocumentFreshness(options: {
|
|
|
179
231
|
function collectFailedDocumentFreshness(
|
|
180
232
|
failedDocuments: ReadonlySet<string>,
|
|
181
233
|
openUris: ReadonlySet<string>,
|
|
234
|
+
facts: (uri: string) => SnapshotFileFacts,
|
|
182
235
|
): ClientDiagnosticSnapshot["documents"] {
|
|
183
236
|
return Array.from(failedDocuments)
|
|
184
237
|
.filter((uri) => !openUris.has(uri))
|
|
185
238
|
.map((uri) => ({
|
|
186
239
|
uri,
|
|
187
240
|
current: false,
|
|
188
|
-
status:
|
|
189
|
-
getDiagnosticFileState(uriToFile(uri)) === "removed"
|
|
190
|
-
? ("removed" as const)
|
|
191
|
-
: ("failed" as const),
|
|
241
|
+
status: facts(uri).state === "removed" ? ("removed" as const) : ("failed" as const),
|
|
192
242
|
}));
|
|
193
243
|
}
|
|
194
244
|
|
|
@@ -196,23 +246,27 @@ function collectUntrackedCacheFreshness(
|
|
|
196
246
|
store: ReadonlyMap<string, DiagnosticCacheEntry>,
|
|
197
247
|
openUris: ReadonlySet<string>,
|
|
198
248
|
failedDocuments: ReadonlySet<string>,
|
|
249
|
+
facts: (uri: string) => SnapshotFileFacts,
|
|
199
250
|
): ClientDiagnosticSnapshot["documents"] {
|
|
200
251
|
return Array.from(store.keys())
|
|
201
252
|
.filter((uri) => !openUris.has(uri) && !failedDocuments.has(uri))
|
|
202
|
-
.map((uri) =>
|
|
203
|
-
uri
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
? ("
|
|
210
|
-
:
|
|
211
|
-
|
|
253
|
+
.map((uri) => {
|
|
254
|
+
const state = facts(uri).state;
|
|
255
|
+
return {
|
|
256
|
+
uri,
|
|
257
|
+
current: false,
|
|
258
|
+
status:
|
|
259
|
+
state === "removed"
|
|
260
|
+
? ("removed" as const)
|
|
261
|
+
: state === "unreadable"
|
|
262
|
+
? ("failed" as const)
|
|
263
|
+
: ("unconfirmed" as const),
|
|
264
|
+
};
|
|
265
|
+
});
|
|
212
266
|
}
|
|
213
267
|
|
|
214
268
|
function statusForDocument(
|
|
215
|
-
fileState:
|
|
269
|
+
fileState: DiagnosticFileState,
|
|
216
270
|
current: boolean,
|
|
217
271
|
failed: boolean,
|
|
218
272
|
tentative: boolean,
|
|
@@ -223,27 +277,28 @@ function statusForDocument(
|
|
|
223
277
|
return "confirmed";
|
|
224
278
|
}
|
|
225
279
|
|
|
226
|
-
function collectCachedDiagnostics(
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
}): {
|
|
280
|
+
function collectCachedDiagnostics(
|
|
281
|
+
options: BuildClientDiagnosticSnapshotOptions,
|
|
282
|
+
facts: (uri: string) => SnapshotFileFacts,
|
|
283
|
+
): {
|
|
231
284
|
entries: ClientDiagnosticSnapshot["entries"];
|
|
232
285
|
current: boolean;
|
|
233
286
|
} {
|
|
234
287
|
const entries: ClientDiagnosticSnapshot["entries"] = [];
|
|
235
288
|
let current = true;
|
|
236
289
|
for (const [uri, entry] of options.store) {
|
|
237
|
-
|
|
290
|
+
const fileFacts = facts(uri);
|
|
291
|
+
if (fileFacts.state === "removed") continue;
|
|
238
292
|
const entryCurrent = hasCurrentDiagnosticEvidence(
|
|
239
293
|
options.openDocuments.get(uri),
|
|
240
294
|
entry,
|
|
241
295
|
options.evidenceRevision,
|
|
242
296
|
);
|
|
243
297
|
// A current tentative error is useful partial evidence. Keep its entry
|
|
244
|
-
// non-current so it cannot establish a clean or settled result.
|
|
298
|
+
// non-current so it cannot establish a clean or settled result. The same
|
|
299
|
+
// applies to diagnostics of content that changed on disk since.
|
|
245
300
|
const tentative = entryCurrent && isTentativePushEntry(entry);
|
|
246
|
-
const confirmed = entryCurrent && !tentative;
|
|
301
|
+
const confirmed = entryCurrent && !tentative && !fileFacts.diskChanged;
|
|
247
302
|
current &&= confirmed;
|
|
248
303
|
if (entry.diagnostics.length > 0) {
|
|
249
304
|
entries.push({ uri, diagnostics: entry.diagnostics, current: confirmed });
|
|
@@ -15,4 +15,12 @@ export interface ClientDiagnosticsHost {
|
|
|
15
15
|
diagnosticRequestAdapter: DiagnosticRequestAdapter;
|
|
16
16
|
documentSync(): NormalizedDocumentSync;
|
|
17
17
|
sendNotification(method: string, params: unknown): void;
|
|
18
|
+
/**
|
|
19
|
+
* Observe one tracked file whose state was cleared because it no longer exists.
|
|
20
|
+
*
|
|
21
|
+
* Every clear path reports here (passive prune, semantic input barrier, and
|
|
22
|
+
* refresh resynchronization), so the owner can retain the removal until a
|
|
23
|
+
* diagnostic report shows it.
|
|
24
|
+
*/
|
|
25
|
+
onTrackedFileRemoved?(filePath: string): void;
|
|
18
26
|
}
|
|
@@ -29,6 +29,7 @@ import type {
|
|
|
29
29
|
import { isDiagnosticRequestInvalidated } from "./client-diagnostic-request.ts";
|
|
30
30
|
import { DiagnosticObserver, isDiagnosticTimeout } from "./client-diagnostic-timing.ts";
|
|
31
31
|
import type { DiagnosticWaitRegistry } from "./client-diagnostic-waiters.ts";
|
|
32
|
+
import { type DiskStamp, statDiskStampSync } from "./client-disk-stamp.ts";
|
|
32
33
|
import {
|
|
33
34
|
fingerprintDocumentContent,
|
|
34
35
|
hasConfirmedDiagnosticEvidence,
|
|
@@ -238,18 +239,23 @@ function classifyReusableDocuments(options: {
|
|
|
238
239
|
diagnosticStore: ReadonlyMap<string, DiagnosticCacheEntry>;
|
|
239
240
|
evidenceRevision: number;
|
|
240
241
|
failedFiles: ReadonlySet<string>;
|
|
242
|
+
/** Record the pre-read stamp of a document whose content equals the read. */
|
|
243
|
+
recordDiskStamp: (uri: string, content: string, stamp: DiskStamp | undefined) => void;
|
|
241
244
|
}): {
|
|
242
245
|
reusableUris: Set<string>;
|
|
243
246
|
retainedUris: Set<string>;
|
|
244
247
|
preloadedContent: Map<string, string>;
|
|
248
|
+
preloadedStamps: Map<string, DiskStamp>;
|
|
245
249
|
} {
|
|
246
250
|
const reusableUris = new Set<string>();
|
|
247
251
|
const retainedUris = new Set<string>();
|
|
248
252
|
const preloadedContent = new Map<string, string>();
|
|
253
|
+
const preloadedStamps = new Map<string, DiskStamp>();
|
|
249
254
|
for (const [uri, document] of options.openDocuments) {
|
|
250
255
|
const filePath = uriToFile(uri);
|
|
251
256
|
if (options.failedFiles.has(filePath)) continue;
|
|
252
257
|
let content: string;
|
|
258
|
+
const stamp = statDiskStampSync(filePath);
|
|
253
259
|
try {
|
|
254
260
|
content = readFileSync(filePath, "utf-8");
|
|
255
261
|
} catch {
|
|
@@ -258,8 +264,11 @@ function classifyReusableDocuments(options: {
|
|
|
258
264
|
}
|
|
259
265
|
if (fingerprintDocumentContent(content) !== document.contentFingerprint) {
|
|
260
266
|
preloadedContent.set(uri, content);
|
|
267
|
+
if (stamp) preloadedStamps.set(uri, stamp);
|
|
261
268
|
continue;
|
|
262
269
|
}
|
|
270
|
+
// Unchanged content: the read verifies the document, so its stamp is current.
|
|
271
|
+
options.recordDiskStamp(uri, content, stamp);
|
|
263
272
|
if (
|
|
264
273
|
hasConfirmedDiagnosticEvidence(
|
|
265
274
|
document,
|
|
@@ -272,7 +281,7 @@ function classifyReusableDocuments(options: {
|
|
|
272
281
|
retainedUris.add(uri);
|
|
273
282
|
}
|
|
274
283
|
}
|
|
275
|
-
return { reusableUris, retainedUris, preloadedContent };
|
|
284
|
+
return { reusableUris, retainedUris, preloadedContent, preloadedStamps };
|
|
276
285
|
}
|
|
277
286
|
|
|
278
287
|
interface ClientDiagnosticRefreshOptions {
|
|
@@ -290,6 +299,8 @@ interface ClientDiagnosticRefreshOptions {
|
|
|
290
299
|
readonly noteInputContentChange: () => number;
|
|
291
300
|
/** Keep the shared semantic barrier's verified disk observation current. */
|
|
292
301
|
readonly observeDiskContent: (uri: string, content: string) => boolean;
|
|
302
|
+
/** Record a pre-read disk stamp when the document now equals that read. */
|
|
303
|
+
readonly recordDiskStamp: (uri: string, content: string, stamp: DiskStamp | undefined) => void;
|
|
293
304
|
/** Send one save for an externally observed disk change. */
|
|
294
305
|
readonly noteExternalDiskChange: (uri: string, content: string) => void;
|
|
295
306
|
readonly clearFile: (uri: string) => void;
|
|
@@ -332,6 +343,7 @@ function prepareRefreshDocuments(
|
|
|
332
343
|
diagnosticStore: options.diagnosticStore,
|
|
333
344
|
evidenceRevision,
|
|
334
345
|
failedFiles: options.failedFiles(),
|
|
346
|
+
recordDiskStamp: options.recordDiskStamp,
|
|
335
347
|
});
|
|
336
348
|
const { reusableUris, retainedUris } = classification;
|
|
337
349
|
const documentsToResynchronize = new Map(
|
|
@@ -348,10 +360,12 @@ function prepareRefreshDocuments(
|
|
|
348
360
|
documentSync: options.host.documentSync(),
|
|
349
361
|
noteInputContentChange: options.noteInputContentChange,
|
|
350
362
|
observeDiskContent: options.observeDiskContent,
|
|
363
|
+
recordDiskStamp: options.recordDiskStamp,
|
|
351
364
|
noteExternalDiskChange: options.noteExternalDiskChange,
|
|
352
365
|
sendNotification: (method, params) => options.host.sendNotification(method, params),
|
|
353
366
|
uriToFile,
|
|
354
367
|
preloadedContent: classification.preloadedContent,
|
|
368
|
+
preloadedStamps: classification.preloadedStamps,
|
|
355
369
|
clearFile: options.clearFile,
|
|
356
370
|
invalidateEvidence: options.invalidateEvidence,
|
|
357
371
|
markUnversionedSyncMoment: options.markUnversionedSyncMoment,
|