open-wiki-spec 0.2.3 → 0.3.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 +54 -0
- package/README.md +50 -3
- package/dist/cli/commands/apply.d.ts.map +1 -1
- package/dist/cli/commands/apply.js +96 -4
- package/dist/cli/commands/apply.js.map +1 -1
- package/dist/cli/commands/archive.d.ts.map +1 -1
- package/dist/cli/commands/archive.js +19 -5
- package/dist/cli/commands/archive.js.map +1 -1
- package/dist/cli/commands/bulk-archive.d.ts +15 -0
- package/dist/cli/commands/bulk-archive.d.ts.map +1 -0
- package/dist/cli/commands/bulk-archive.js +97 -0
- package/dist/cli/commands/bulk-archive.js.map +1 -0
- package/dist/cli/commands/continue.d.ts.map +1 -1
- package/dist/cli/commands/continue.js +15 -2
- package/dist/cli/commands/continue.js.map +1 -1
- package/dist/cli/commands/error-handler.d.ts +1 -5
- package/dist/cli/commands/error-handler.d.ts.map +1 -1
- package/dist/cli/commands/error-handler.js +48 -3
- package/dist/cli/commands/error-handler.js.map +1 -1
- package/dist/cli/commands/init.d.ts +0 -3
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +22 -4
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/list.d.ts +2 -17
- package/dist/cli/commands/list.d.ts.map +1 -1
- package/dist/cli/commands/list.js +15 -3
- package/dist/cli/commands/list.js.map +1 -1
- package/dist/cli/commands/migrate.d.ts.map +1 -1
- package/dist/cli/commands/migrate.js +6 -9
- package/dist/cli/commands/migrate.js.map +1 -1
- package/dist/cli/commands/propose.d.ts.map +1 -1
- package/dist/cli/commands/propose.js +46 -6
- package/dist/cli/commands/propose.js.map +1 -1
- package/dist/cli/commands/query.d.ts.map +1 -1
- package/dist/cli/commands/query.js +101 -5
- package/dist/cli/commands/query.js.map +1 -1
- package/dist/cli/commands/retrieve.d.ts +7 -0
- package/dist/cli/commands/retrieve.d.ts.map +1 -0
- package/dist/cli/commands/retrieve.js +70 -0
- package/dist/cli/commands/retrieve.js.map +1 -0
- package/dist/cli/commands/revert.d.ts +18 -0
- package/dist/cli/commands/revert.d.ts.map +1 -0
- package/dist/cli/commands/revert.js +109 -0
- package/dist/cli/commands/revert.js.map +1 -0
- package/dist/cli/commands/status.d.ts +2 -19
- package/dist/cli/commands/status.d.ts.map +1 -1
- package/dist/cli/commands/status.js +42 -3
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/verify.d.ts.map +1 -1
- package/dist/cli/commands/verify.js +12 -1
- package/dist/cli/commands/verify.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +68 -2
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/init/init-engine.d.ts.map +1 -1
- package/dist/cli/init/init-engine.js +19 -6
- package/dist/cli/init/init-engine.js.map +1 -1
- package/dist/cli/init/meta-files.d.ts +2 -1
- package/dist/cli/init/meta-files.d.ts.map +1 -1
- package/dist/cli/init/meta-files.js +167 -8
- package/dist/cli/init/meta-files.js.map +1 -1
- package/dist/cli/init/skill-generator.d.ts +3 -0
- package/dist/cli/init/skill-generator.d.ts.map +1 -1
- package/dist/cli/init/skill-generator.js +184 -3
- package/dist/cli/init/skill-generator.js.map +1 -1
- package/dist/cli/json-envelope.d.ts +15 -0
- package/dist/cli/json-envelope.d.ts.map +1 -0
- package/dist/cli/json-envelope.js +86 -0
- package/dist/cli/json-envelope.js.map +1 -0
- package/dist/cli/schema-check.d.ts +27 -0
- package/dist/cli/schema-check.d.ts.map +1 -0
- package/dist/cli/schema-check.js +33 -0
- package/dist/cli/schema-check.js.map +1 -0
- package/dist/cli/vault-discovery.d.ts.map +1 -1
- package/dist/cli/vault-discovery.js +16 -2
- package/dist/cli/vault-discovery.js.map +1 -1
- package/dist/core/embedding/cache.d.ts +12 -3
- package/dist/core/embedding/cache.d.ts.map +1 -1
- package/dist/core/embedding/cache.js +42 -5
- package/dist/core/embedding/cache.js.map +1 -1
- package/dist/core/embedding/embedder.d.ts +18 -0
- package/dist/core/embedding/embedder.d.ts.map +1 -1
- package/dist/core/embedding/embedder.js +87 -10
- package/dist/core/embedding/embedder.js.map +1 -1
- package/dist/core/index/build.d.ts.map +1 -1
- package/dist/core/index/build.js +54 -6
- package/dist/core/index/build.js.map +1 -1
- package/dist/core/index/resolve.d.ts.map +1 -1
- package/dist/core/index/resolve.js +27 -12
- package/dist/core/index/resolve.js.map +1 -1
- package/dist/core/index/scan.d.ts +10 -1
- package/dist/core/index/scan.d.ts.map +1 -1
- package/dist/core/index/scan.js +59 -10
- package/dist/core/index/scan.js.map +1 -1
- package/dist/core/index/schema-version.d.ts +28 -0
- package/dist/core/index/schema-version.d.ts.map +1 -1
- package/dist/core/index/schema-version.js +47 -0
- package/dist/core/index/schema-version.js.map +1 -1
- package/dist/core/migrate/change-converter.d.ts.map +1 -1
- package/dist/core/migrate/change-converter.js +59 -11
- package/dist/core/migrate/change-converter.js.map +1 -1
- package/dist/core/migrate/migrate.d.ts.map +1 -1
- package/dist/core/migrate/migrate.js +115 -1
- package/dist/core/migrate/migrate.js.map +1 -1
- package/dist/core/migrate/sanitize.d.ts +17 -0
- package/dist/core/migrate/sanitize.d.ts.map +1 -0
- package/dist/core/migrate/sanitize.js +33 -0
- package/dist/core/migrate/sanitize.js.map +1 -0
- package/dist/core/migrate/spec-converter.d.ts.map +1 -1
- package/dist/core/migrate/spec-converter.js +9 -3
- package/dist/core/migrate/spec-converter.js.map +1 -1
- package/dist/core/migrate/types.d.ts +9 -0
- package/dist/core/migrate/types.d.ts.map +1 -1
- package/dist/core/parser/frontmatter-parser.d.ts +0 -6
- package/dist/core/parser/frontmatter-parser.d.ts.map +1 -1
- package/dist/core/parser/frontmatter-parser.js +59 -2
- package/dist/core/parser/frontmatter-parser.js.map +1 -1
- package/dist/core/parser/note-parser.js +15 -4
- package/dist/core/parser/note-parser.js.map +1 -1
- package/dist/core/parser/requirement-parser.js +4 -0
- package/dist/core/parser/requirement-parser.js.map +1 -1
- package/dist/core/parser/task-parser.d.ts.map +1 -1
- package/dist/core/parser/task-parser.js +19 -0
- package/dist/core/parser/task-parser.js.map +1 -1
- package/dist/core/parser/wikilink-parser.d.ts.map +1 -1
- package/dist/core/parser/wikilink-parser.js +21 -5
- package/dist/core/parser/wikilink-parser.js.map +1 -1
- package/dist/core/retrieval/classify.d.ts +11 -4
- package/dist/core/retrieval/classify.d.ts.map +1 -1
- package/dist/core/retrieval/classify.js +76 -14
- package/dist/core/retrieval/classify.js.map +1 -1
- package/dist/core/retrieval/lexical.d.ts.map +1 -1
- package/dist/core/retrieval/lexical.js +31 -12
- package/dist/core/retrieval/lexical.js.map +1 -1
- package/dist/core/retrieval/retrieve.d.ts.map +1 -1
- package/dist/core/retrieval/retrieve.js +45 -5
- package/dist/core/retrieval/retrieve.js.map +1 -1
- package/dist/core/retrieval/scoring.d.ts.map +1 -1
- package/dist/core/retrieval/scoring.js +37 -12
- package/dist/core/retrieval/scoring.js.map +1 -1
- package/dist/core/schema/change.schema.d.ts.map +1 -1
- package/dist/core/schema/change.schema.js +6 -1
- package/dist/core/schema/change.schema.js.map +1 -1
- package/dist/core/schema/feature.schema.d.ts +1 -1
- package/dist/core/schema/feature.schema.d.ts.map +1 -1
- package/dist/core/schema/feature.schema.js +1 -0
- package/dist/core/schema/feature.schema.js.map +1 -1
- package/dist/core/schema/frontmatter.d.ts +15 -0
- package/dist/core/schema/frontmatter.d.ts.map +1 -1
- package/dist/core/schema/index.d.ts +15 -0
- package/dist/core/schema/index.d.ts.map +1 -1
- package/dist/core/schema/query.schema.d.ts +15 -0
- package/dist/core/schema/query.schema.d.ts.map +1 -1
- package/dist/core/schema/query.schema.js +5 -0
- package/dist/core/schema/query.schema.js.map +1 -1
- package/dist/core/schema/templates.d.ts +0 -4
- package/dist/core/schema/templates.d.ts.map +1 -1
- package/dist/core/schema/templates.js +25 -7
- package/dist/core/schema/templates.js.map +1 -1
- package/dist/core/sequencing/analyze.d.ts.map +1 -1
- package/dist/core/sequencing/analyze.js +3 -1
- package/dist/core/sequencing/analyze.js.map +1 -1
- package/dist/core/sequencing/priority-queue.d.ts +9 -3
- package/dist/core/sequencing/priority-queue.d.ts.map +1 -1
- package/dist/core/sequencing/priority-queue.js +10 -4
- package/dist/core/sequencing/priority-queue.js.map +1 -1
- package/dist/core/sequencing/stale-detector.d.ts.map +1 -1
- package/dist/core/sequencing/stale-detector.js +5 -0
- package/dist/core/sequencing/stale-detector.js.map +1 -1
- package/dist/core/workflow/apply/apply.d.ts.map +1 -1
- package/dist/core/workflow/apply/apply.js +494 -55
- package/dist/core/workflow/apply/apply.js.map +1 -1
- package/dist/core/workflow/apply/delta-parser.d.ts.map +1 -1
- package/dist/core/workflow/apply/delta-parser.js +43 -9
- package/dist/core/workflow/apply/delta-parser.js.map +1 -1
- package/dist/core/workflow/apply/feature-updater.d.ts.map +1 -1
- package/dist/core/workflow/apply/feature-updater.js +27 -11
- package/dist/core/workflow/apply/feature-updater.js.map +1 -1
- package/dist/core/workflow/apply/types.d.ts +14 -0
- package/dist/core/workflow/apply/types.d.ts.map +1 -1
- package/dist/core/workflow/continue/continue.d.ts +18 -0
- package/dist/core/workflow/continue/continue.d.ts.map +1 -1
- package/dist/core/workflow/continue/continue.js +134 -15
- package/dist/core/workflow/continue/continue.js.map +1 -1
- package/dist/core/workflow/continue/next-action.d.ts.map +1 -1
- package/dist/core/workflow/continue/next-action.js +16 -3
- package/dist/core/workflow/continue/next-action.js.map +1 -1
- package/dist/core/workflow/continue/types.d.ts +12 -0
- package/dist/core/workflow/continue/types.d.ts.map +1 -1
- package/dist/core/workflow/propose/note-creator.d.ts +2 -2
- package/dist/core/workflow/propose/note-creator.d.ts.map +1 -1
- package/dist/core/workflow/propose/note-creator.js +89 -12
- package/dist/core/workflow/propose/note-creator.js.map +1 -1
- package/dist/core/workflow/propose/propose.d.ts.map +1 -1
- package/dist/core/workflow/propose/propose.js +190 -46
- package/dist/core/workflow/propose/propose.js.map +1 -1
- package/dist/core/workflow/propose/query-normalizer.d.ts.map +1 -1
- package/dist/core/workflow/propose/query-normalizer.js +37 -5
- package/dist/core/workflow/propose/query-normalizer.js.map +1 -1
- package/dist/core/workflow/propose/types.d.ts +15 -0
- package/dist/core/workflow/propose/types.d.ts.map +1 -1
- package/dist/core/workflow/propose/types.js +6 -1
- package/dist/core/workflow/propose/types.js.map +1 -1
- package/dist/core/workflow/query/query-note-creator.d.ts +0 -4
- package/dist/core/workflow/query/query-note-creator.d.ts.map +1 -1
- package/dist/core/workflow/query/query-note-creator.js +27 -37
- package/dist/core/workflow/query/query-note-creator.js.map +1 -1
- package/dist/core/workflow/verify/coherence.d.ts +10 -0
- package/dist/core/workflow/verify/coherence.d.ts.map +1 -1
- package/dist/core/workflow/verify/coherence.js +91 -4
- package/dist/core/workflow/verify/coherence.js.map +1 -1
- package/dist/core/workflow/verify/completeness.d.ts +1 -1
- package/dist/core/workflow/verify/completeness.d.ts.map +1 -1
- package/dist/core/workflow/verify/completeness.js +53 -10
- package/dist/core/workflow/verify/completeness.js.map +1 -1
- package/dist/core/workflow/verify/correctness.d.ts +1 -1
- package/dist/core/workflow/verify/correctness.d.ts.map +1 -1
- package/dist/core/workflow/verify/correctness.js +95 -14
- package/dist/core/workflow/verify/correctness.js.map +1 -1
- package/dist/core/workflow/verify/vault-integrity.d.ts +11 -0
- package/dist/core/workflow/verify/vault-integrity.d.ts.map +1 -1
- package/dist/core/workflow/verify/vault-integrity.js +80 -3
- package/dist/core/workflow/verify/vault-integrity.js.map +1 -1
- package/dist/core/workflow/verify/verify.d.ts +0 -5
- package/dist/core/workflow/verify/verify.d.ts.map +1 -1
- package/dist/core/workflow/verify/verify.js +54 -3
- package/dist/core/workflow/verify/verify.js.map +1 -1
- package/dist/index.d.ts +13 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -0
- package/dist/index.js.map +1 -1
- package/dist/types/cli-contracts.d.ts +78 -0
- package/dist/types/cli-contracts.d.ts.map +1 -0
- package/dist/types/cli-contracts.js +2 -0
- package/dist/types/cli-contracts.js.map +1 -0
- package/dist/types/error-codes.d.ts +25 -0
- package/dist/types/error-codes.d.ts.map +1 -0
- package/dist/types/error-codes.js +27 -0
- package/dist/types/error-codes.js.map +1 -0
- package/dist/types/frontmatter.d.ts +9 -2
- package/dist/types/frontmatter.d.ts.map +1 -1
- package/dist/types/next-action.d.ts +21 -0
- package/dist/types/next-action.d.ts.map +1 -1
- package/dist/types/retrieval.d.ts +17 -0
- package/dist/types/retrieval.d.ts.map +1 -1
- package/dist/types/verify.d.ts +58 -1
- package/dist/types/verify.d.ts.map +1 -1
- package/dist/types/verify.js +58 -1
- package/dist/types/verify.js.map +1 -1
- package/dist/utils/conventions.d.ts +9 -0
- package/dist/utils/conventions.d.ts.map +1 -0
- package/dist/utils/conventions.js +22 -0
- package/dist/utils/conventions.js.map +1 -0
- package/dist/utils/id-generator.d.ts.map +1 -1
- package/dist/utils/id-generator.js +8 -0
- package/dist/utils/id-generator.js.map +1 -1
- package/dist/utils/normalize.d.ts +7 -4
- package/dist/utils/normalize.d.ts.map +1 -1
- package/dist/utils/normalize.js +43 -6
- package/dist/utils/normalize.js.map +1 -1
- package/dist/utils/path-safety.d.ts +12 -1
- package/dist/utils/path-safety.d.ts.map +1 -1
- package/dist/utils/path-safety.js +54 -3
- package/dist/utils/path-safety.js.map +1 -1
- package/package.json +3 -2
|
@@ -9,18 +9,24 @@ export function extractWikilinks(text, location, startLine = 1) {
|
|
|
9
9
|
const errors = [];
|
|
10
10
|
const lines = text.split('\n');
|
|
11
11
|
let insideCodeFence = false;
|
|
12
|
-
let codeFenceMarker = '';
|
|
12
|
+
let codeFenceMarker = ''; // The opening fence string (e.g., "```" or "~~~~~")
|
|
13
13
|
for (let i = 0; i < lines.length; i++) {
|
|
14
14
|
const line = lines[i];
|
|
15
15
|
const fenceMatch = line.match(CODE_FENCE_REGEX);
|
|
16
16
|
if (fenceMatch) {
|
|
17
17
|
if (!insideCodeFence) {
|
|
18
18
|
insideCodeFence = true;
|
|
19
|
-
codeFenceMarker = fenceMatch[1]
|
|
19
|
+
codeFenceMarker = fenceMatch[1]; // Store the full opening fence (e.g., "````")
|
|
20
20
|
}
|
|
21
|
-
else
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
else {
|
|
22
|
+
// CommonMark: closing fence must have same marker char and length >= opening
|
|
23
|
+
const trimmed = line.trim();
|
|
24
|
+
const openChar = codeFenceMarker[0];
|
|
25
|
+
if (trimmed.length >= codeFenceMarker.length &&
|
|
26
|
+
trimmed === openChar.repeat(trimmed.length)) {
|
|
27
|
+
insideCodeFence = false;
|
|
28
|
+
codeFenceMarker = '';
|
|
29
|
+
}
|
|
24
30
|
}
|
|
25
31
|
continue;
|
|
26
32
|
}
|
|
@@ -41,6 +47,16 @@ export function extractWikilinks(text, location, startLine = 1) {
|
|
|
41
47
|
});
|
|
42
48
|
continue;
|
|
43
49
|
}
|
|
50
|
+
// Warn on nested brackets (escaped delimiter is already split by regex, so only check brackets)
|
|
51
|
+
if (target.includes('[[') || target.includes(']]')) {
|
|
52
|
+
errors.push({
|
|
53
|
+
level: 'warning',
|
|
54
|
+
source: 'wikilink',
|
|
55
|
+
message: `Malformed wikilink target with nested brackets or escaped delimiter: "${target}"`,
|
|
56
|
+
line: startLine + i,
|
|
57
|
+
});
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
44
60
|
// Strip #heading subpath (Obsidian [[Note#Heading]] syntax)
|
|
45
61
|
const hashIndex = target.indexOf('#');
|
|
46
62
|
const resolvedTarget = hashIndex !== -1 ? target.slice(0, hashIndex).trim() : target;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wikilink-parser.js","sourceRoot":"","sources":["../../../src/core/parser/wikilink-parser.ts"],"names":[],"mappings":"AAEA,MAAM,cAAc,GAAG,qCAAqC,CAAC;AAC7D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC;AAE1C;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAY,EACZ,QAAgC,EAChC,YAAoB,CAAC;IAErB,MAAM,SAAS,GAAyB,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,eAAe,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"wikilink-parser.js","sourceRoot":"","sources":["../../../src/core/parser/wikilink-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
import type { Classification, Confidence, ScoredCandidate, SequencingSummary } from '../../types/retrieval.js';
|
|
2
2
|
import type { VaultIndex } from '../../types/index-record.js';
|
|
3
3
|
import type { ClassificationThresholds } from './constants.js';
|
|
4
|
+
export interface ClassifyDecision {
|
|
5
|
+
classification: Classification;
|
|
6
|
+
confidence: Confidence;
|
|
7
|
+
/** Human-readable justification — always present so downstream can display it. */
|
|
8
|
+
reason: string;
|
|
9
|
+
}
|
|
4
10
|
/**
|
|
5
11
|
* Classify scored candidates using threshold rules (section 10.5).
|
|
12
|
+
* Every return path records a human-readable `reason` explaining which
|
|
13
|
+
* rule fired — this is what agents and `--json` consumers surface when
|
|
14
|
+
* the classification is `needs_confirmation` (so users know what to
|
|
15
|
+
* clarify) or when a `new_feature` default is picked silently.
|
|
6
16
|
*/
|
|
7
|
-
export declare function classify(
|
|
8
|
-
classification: Classification;
|
|
9
|
-
confidence: Confidence;
|
|
10
|
-
};
|
|
17
|
+
export declare function classify(rawCandidates: ScoredCandidate[], thresholds?: ClassificationThresholds, index?: VaultIndex, sequencing?: SequencingSummary): ClassifyDecision;
|
|
11
18
|
//# sourceMappingURL=classify.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classify.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/classify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAI/D
|
|
1
|
+
{"version":3,"file":"classify.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/classify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC/G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAI/D,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CACtB,aAAa,EAAE,eAAe,EAAE,EAChC,UAAU,GAAE,wBAA6C,EACzD,KAAK,CAAC,EAAE,UAAU,EAClB,UAAU,CAAC,EAAE,iBAAiB,GAC7B,gBAAgB,CA+KlB"}
|
|
@@ -2,28 +2,58 @@ import { DEFAULT_THRESHOLDS } from './constants.js';
|
|
|
2
2
|
import { isActiveChangeStatus } from './helpers.js';
|
|
3
3
|
/**
|
|
4
4
|
* Classify scored candidates using threshold rules (section 10.5).
|
|
5
|
+
* Every return path records a human-readable `reason` explaining which
|
|
6
|
+
* rule fired — this is what agents and `--json` consumers surface when
|
|
7
|
+
* the classification is `needs_confirmation` (so users know what to
|
|
8
|
+
* clarify) or when a `new_feature` default is picked silently.
|
|
5
9
|
*/
|
|
6
|
-
export function classify(
|
|
10
|
+
export function classify(rawCandidates, thresholds = DEFAULT_THRESHOLDS, index, sequencing) {
|
|
11
|
+
// Dedupe by id up front. A scoring bug or an overly-enthusiastic graph
|
|
12
|
+
// expansion step could produce the same note twice in the candidate
|
|
13
|
+
// list; without dedup, `top`/`second` gap math gets confused (the gap
|
|
14
|
+
// is 0, incorrectly triggering `needs_confirmation`). Keep the first
|
|
15
|
+
// occurrence — scoring already sorts by score descending, so the
|
|
16
|
+
// first entry for any id is the highest-scored one.
|
|
17
|
+
const seen = new Set();
|
|
18
|
+
const candidates = [];
|
|
19
|
+
for (const c of rawCandidates) {
|
|
20
|
+
if (seen.has(c.id))
|
|
21
|
+
continue;
|
|
22
|
+
seen.add(c.id);
|
|
23
|
+
candidates.push(c);
|
|
24
|
+
}
|
|
7
25
|
// Rule 0: Index-quality escalation
|
|
8
26
|
if (index) {
|
|
9
27
|
const topN = candidates.slice(0, 3);
|
|
10
28
|
const topCandidatePaths = new Set(topN.map((c) => index.records.get(c.id)?.path).filter(Boolean));
|
|
11
|
-
const
|
|
29
|
+
const qualityWarning = index.warnings.find((w) => (w.type === 'duplicate_id' ||
|
|
12
30
|
w.type === 'ambiguous_alias' ||
|
|
13
31
|
w.type === 'missing_id' ||
|
|
14
32
|
w.type === 'unresolved_wikilink') &&
|
|
15
33
|
topCandidatePaths.has(w.note_path));
|
|
16
|
-
if (
|
|
17
|
-
return {
|
|
34
|
+
if (qualityWarning) {
|
|
35
|
+
return {
|
|
36
|
+
classification: 'needs_confirmation',
|
|
37
|
+
confidence: 'low',
|
|
38
|
+
reason: `Top candidate note has an index-quality issue (${qualityWarning.type}): ${qualityWarning.message}`,
|
|
39
|
+
};
|
|
18
40
|
}
|
|
19
41
|
}
|
|
20
42
|
// Rule 0b: Sequencing severity escalation
|
|
21
43
|
if (sequencing &&
|
|
22
44
|
(sequencing.status === 'conflict_candidate' || sequencing.status === 'conflict_critical')) {
|
|
23
|
-
return {
|
|
45
|
+
return {
|
|
46
|
+
classification: 'needs_confirmation',
|
|
47
|
+
confidence: 'low',
|
|
48
|
+
reason: `Sequencing engine flagged status=${sequencing.status}: ${sequencing.reasons.join('; ') || 'active changes conflict with each other'}`,
|
|
49
|
+
};
|
|
24
50
|
}
|
|
25
51
|
if (candidates.length === 0) {
|
|
26
|
-
return {
|
|
52
|
+
return {
|
|
53
|
+
classification: 'new_feature',
|
|
54
|
+
confidence: 'high',
|
|
55
|
+
reason: 'No matching notes in the vault — defaulting to new_feature.',
|
|
56
|
+
};
|
|
27
57
|
}
|
|
28
58
|
const top = candidates[0];
|
|
29
59
|
const second = candidates.length > 1 ? candidates[1] : null;
|
|
@@ -33,7 +63,11 @@ export function classify(candidates, thresholds = DEFAULT_THRESHOLDS, index, seq
|
|
|
33
63
|
isActiveChangeStatus(index?.records.get(top.id)?.status ?? '') &&
|
|
34
64
|
top.score >= thresholds.existing_change.min_score &&
|
|
35
65
|
gap >= thresholds.existing_change.min_gap_to_second) {
|
|
36
|
-
return {
|
|
66
|
+
return {
|
|
67
|
+
classification: 'existing_change',
|
|
68
|
+
confidence: 'high',
|
|
69
|
+
reason: `Top candidate is an active Change "${top.title}" with score ${top.score} (gap to second = ${gap}).`,
|
|
70
|
+
};
|
|
37
71
|
}
|
|
38
72
|
// Rule 2: needs_confirmation (check before existing_feature)
|
|
39
73
|
// Top two candidates >= 60 and gap < 10
|
|
@@ -41,7 +75,11 @@ export function classify(candidates, thresholds = DEFAULT_THRESHOLDS, index, seq
|
|
|
41
75
|
top.score >= thresholds.needs_confirmation.min_top_two_score &&
|
|
42
76
|
second.score >= thresholds.needs_confirmation.min_top_two_score &&
|
|
43
77
|
gap < thresholds.needs_confirmation.max_score_gap) {
|
|
44
|
-
return {
|
|
78
|
+
return {
|
|
79
|
+
classification: 'needs_confirmation',
|
|
80
|
+
confidence: 'low',
|
|
81
|
+
reason: `Top two candidates both score high ("${top.title}"=${top.score}, "${second.title}"=${second.score}) with a small gap (${gap}); manual disambiguation needed.`,
|
|
82
|
+
};
|
|
45
83
|
}
|
|
46
84
|
// Feature and active Change both match strongly and conflict
|
|
47
85
|
if (top.type === 'feature' &&
|
|
@@ -50,7 +88,11 @@ export function classify(candidates, thresholds = DEFAULT_THRESHOLDS, index, seq
|
|
|
50
88
|
isActiveChangeStatus(index?.records.get(second.id)?.status ?? '') &&
|
|
51
89
|
top.score >= thresholds.existing_feature.min_score &&
|
|
52
90
|
second.score >= top.score - thresholds.existing_feature.max_active_change_gap) {
|
|
53
|
-
return {
|
|
91
|
+
return {
|
|
92
|
+
classification: 'needs_confirmation',
|
|
93
|
+
confidence: 'low',
|
|
94
|
+
reason: `Top candidate is Feature "${top.title}" (${top.score}) but active Change "${second.title}" (${second.score}) is close — should this change join the active one or target the Feature directly?`,
|
|
95
|
+
};
|
|
54
96
|
}
|
|
55
97
|
if (top.type === 'change' &&
|
|
56
98
|
second &&
|
|
@@ -58,7 +100,11 @@ export function classify(candidates, thresholds = DEFAULT_THRESHOLDS, index, seq
|
|
|
58
100
|
isActiveChangeStatus(index?.records.get(top.id)?.status ?? '') &&
|
|
59
101
|
second.score >= thresholds.existing_feature.min_score &&
|
|
60
102
|
top.score - second.score < thresholds.existing_feature.max_active_change_gap) {
|
|
61
|
-
return {
|
|
103
|
+
return {
|
|
104
|
+
classification: 'needs_confirmation',
|
|
105
|
+
confidence: 'low',
|
|
106
|
+
reason: `Top candidate is active Change "${top.title}" (${top.score}) but Feature "${second.title}" (${second.score}) is close — same ambiguity as above.`,
|
|
107
|
+
};
|
|
62
108
|
}
|
|
63
109
|
// Rule 3: existing_feature
|
|
64
110
|
if (top.type === 'feature' && top.score >= thresholds.existing_feature.min_score) {
|
|
@@ -68,7 +114,11 @@ export function classify(candidates, thresholds = DEFAULT_THRESHOLDS, index, seq
|
|
|
68
114
|
c.score >= top.score - thresholds.existing_feature.max_active_change_gap);
|
|
69
115
|
if (!hasStrongActiveChange) {
|
|
70
116
|
const confidence = top.score >= 85 ? 'high' : 'medium';
|
|
71
|
-
return {
|
|
117
|
+
return {
|
|
118
|
+
classification: 'existing_feature',
|
|
119
|
+
confidence,
|
|
120
|
+
reason: `Top candidate is Feature "${top.title}" (${top.score}) with no competing active Change nearby.`,
|
|
121
|
+
};
|
|
72
122
|
}
|
|
73
123
|
}
|
|
74
124
|
// Rule 4: new_feature
|
|
@@ -79,14 +129,26 @@ export function classify(candidates, thresholds = DEFAULT_THRESHOLDS, index, seq
|
|
|
79
129
|
const topChangeScore = topChange?.score ?? 0;
|
|
80
130
|
if (topFeatureScore < thresholds.new_feature.max_top_score &&
|
|
81
131
|
topChangeScore < thresholds.new_feature.max_top_score) {
|
|
82
|
-
return {
|
|
132
|
+
return {
|
|
133
|
+
classification: 'new_feature',
|
|
134
|
+
confidence: 'high',
|
|
135
|
+
reason: `Top Feature (${topFeatureScore}) and top Change (${topChangeScore}) are both below the new_feature threshold (${thresholds.new_feature.max_top_score}); nothing close enough to reuse.`,
|
|
136
|
+
};
|
|
83
137
|
}
|
|
84
138
|
// Fallback: ambiguous middle ground
|
|
85
139
|
if (top.score >= thresholds.new_feature.max_top_score &&
|
|
86
140
|
top.score < thresholds.existing_feature.min_score) {
|
|
87
|
-
return {
|
|
141
|
+
return {
|
|
142
|
+
classification: 'needs_confirmation',
|
|
143
|
+
confidence: 'low',
|
|
144
|
+
reason: `Top candidate "${top.title}" scores ${top.score}, in the ambiguous middle band (${thresholds.new_feature.max_top_score}-${thresholds.existing_feature.min_score}).`,
|
|
145
|
+
};
|
|
88
146
|
}
|
|
89
147
|
// Final fallback
|
|
90
|
-
return {
|
|
148
|
+
return {
|
|
149
|
+
classification: 'needs_confirmation',
|
|
150
|
+
confidence: 'low',
|
|
151
|
+
reason: 'No rule fired — retrieval produced candidates but none matched any clear classification branch.',
|
|
152
|
+
};
|
|
91
153
|
}
|
|
92
154
|
//# sourceMappingURL=classify.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classify.js","sourceRoot":"","sources":["../../../src/core/retrieval/classify.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"classify.js","sourceRoot":"","sources":["../../../src/core/retrieval/classify.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lexical.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/lexical.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,UAAU,GAChB,GAAG,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"lexical.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/lexical.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE9D;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,UAAU,GAChB,GAAG,CAAC,MAAM,CAAC,CAmIb"}
|
|
@@ -8,6 +8,28 @@ export function lexicalRetrieval(query, index) {
|
|
|
8
8
|
const searchTerms = allTerms.map((t) => t.toLowerCase());
|
|
9
9
|
if (searchTerms.length === 0)
|
|
10
10
|
return candidates;
|
|
11
|
+
// Precompute reverse indexes once: systemId → notes that list it, etc.
|
|
12
|
+
// Avoids O(n²) scanning during system/entity term matching.
|
|
13
|
+
const notesBySystem = new Map();
|
|
14
|
+
const notesBySource = new Map();
|
|
15
|
+
const notesByDecision = new Map();
|
|
16
|
+
for (const record of index.records.values()) {
|
|
17
|
+
for (const sysId of record.systems) {
|
|
18
|
+
const arr = notesBySystem.get(sysId) ?? [];
|
|
19
|
+
arr.push(record.id);
|
|
20
|
+
notesBySystem.set(sysId, arr);
|
|
21
|
+
}
|
|
22
|
+
for (const srcId of record.sources) {
|
|
23
|
+
const arr = notesBySource.get(srcId) ?? [];
|
|
24
|
+
arr.push(record.id);
|
|
25
|
+
notesBySource.set(srcId, arr);
|
|
26
|
+
}
|
|
27
|
+
for (const decId of record.decisions) {
|
|
28
|
+
const arr = notesByDecision.get(decId) ?? [];
|
|
29
|
+
arr.push(record.id);
|
|
30
|
+
notesByDecision.set(decId, arr);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
11
33
|
// 1. Title match
|
|
12
34
|
for (const record of index.records.values()) {
|
|
13
35
|
const titleLower = record.title.toLowerCase();
|
|
@@ -36,7 +58,7 @@ export function lexicalRetrieval(query, index) {
|
|
|
36
58
|
break;
|
|
37
59
|
}
|
|
38
60
|
}
|
|
39
|
-
// 3. System match
|
|
61
|
+
// 3. System match (uses precomputed notesBySystem reverse index)
|
|
40
62
|
for (const term of query.system_terms) {
|
|
41
63
|
const termLower = term.toLowerCase();
|
|
42
64
|
for (const record of index.records.values()) {
|
|
@@ -44,11 +66,9 @@ export function lexicalRetrieval(query, index) {
|
|
|
44
66
|
if (record.title.toLowerCase().includes(termLower) ||
|
|
45
67
|
record.aliases.some((a) => a.toLowerCase().includes(termLower))) {
|
|
46
68
|
candidates.add(record.id);
|
|
47
|
-
|
|
48
|
-
for (const
|
|
49
|
-
|
|
50
|
-
candidates.add(other.id);
|
|
51
|
-
}
|
|
69
|
+
const referencing = notesBySystem.get(record.id) ?? [];
|
|
70
|
+
for (const otherId of referencing) {
|
|
71
|
+
candidates.add(otherId);
|
|
52
72
|
}
|
|
53
73
|
}
|
|
54
74
|
}
|
|
@@ -69,7 +89,7 @@ export function lexicalRetrieval(query, index) {
|
|
|
69
89
|
}
|
|
70
90
|
}
|
|
71
91
|
}
|
|
72
|
-
// 5. Source / Decision match
|
|
92
|
+
// 5. Source / Decision match (uses precomputed notesBySource/notesByDecision reverse indexes)
|
|
73
93
|
for (const term of query.entity_terms) {
|
|
74
94
|
const termLower = term.toLowerCase();
|
|
75
95
|
for (const record of index.records.values()) {
|
|
@@ -77,11 +97,10 @@ export function lexicalRetrieval(query, index) {
|
|
|
77
97
|
if (record.title.toLowerCase().includes(termLower) ||
|
|
78
98
|
record.aliases.some((a) => a.toLowerCase().includes(termLower))) {
|
|
79
99
|
candidates.add(record.id);
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
100
|
+
const refByType = record.type === 'source' ? notesBySource : notesByDecision;
|
|
101
|
+
const referencing = refByType.get(record.id) ?? [];
|
|
102
|
+
for (const otherId of referencing) {
|
|
103
|
+
candidates.add(otherId);
|
|
85
104
|
}
|
|
86
105
|
}
|
|
87
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lexical.js","sourceRoot":"","sources":["../../../src/core/retrieval/lexical.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,KAAqB,EACrB,KAAiB;IAEjB,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IACxF,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAEzD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,UAAU,CAAC;IAEhD,iBAAiB;IACjB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC1B,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,iBAAiB;IACjB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAAE,SAAS;QACxC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;YACvC,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC1B,KAAK,GAAG,IAAI,CAAC;oBACb,MAAM;gBACR,CAAC;YACH,CAAC;YACD,IAAI,KAAK;gBAAE,MAAM;QACnB,CAAC;IACH,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"lexical.js","sourceRoot":"","sources":["../../../src/core/retrieval/lexical.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrieve.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/retrieve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAqB,MAAM,0BAA0B,CAAC;AACnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAS/E,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C;AAuBD;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,gBAAgB,GACzB,eAAe,
|
|
1
|
+
{"version":3,"file":"retrieve.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/retrieve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAqB,MAAM,0BAA0B,CAAC;AACnG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAS/E,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAClC,UAAU,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C;AAuBD;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,gBAAgB,GACzB,eAAe,CAgGjB"}
|
|
@@ -32,6 +32,7 @@ export function retrieve(index, query, options) {
|
|
|
32
32
|
const lexicalCandidates = lexicalRetrieval(query, index);
|
|
33
33
|
// Step 1b: Merge semantic candidates (if available) before graph expansion
|
|
34
34
|
const semanticScores = options?.semanticScores;
|
|
35
|
+
const semanticUsed = semanticScores !== undefined && semanticScores.size > 0;
|
|
35
36
|
const firstPass = new Set(lexicalCandidates);
|
|
36
37
|
if (semanticScores) {
|
|
37
38
|
for (const id of semanticScores.keys()) {
|
|
@@ -47,25 +48,64 @@ export function retrieve(index, query, options) {
|
|
|
47
48
|
? new Map(semanticScores)
|
|
48
49
|
: undefined;
|
|
49
50
|
const scored = scoreCandidates(expanded, query, index, weights, embeddingScores);
|
|
51
|
+
// Step 3b: Filter out Query notes for non-query intents. Query notes
|
|
52
|
+
// store investigation history — they share terms with whatever
|
|
53
|
+
// feature they were written about, so lexical retrieval happily
|
|
54
|
+
// surfaces them as top candidates when a user later proposes a
|
|
55
|
+
// related change. That pollutes classification (a past Query note
|
|
56
|
+
// shouldn't win against the actual Feature it investigated). Keep
|
|
57
|
+
// them only when the caller explicitly asked for them via
|
|
58
|
+
// intent='query' (the `ows query` workflow path).
|
|
59
|
+
const filteredScored = query.intent === 'query'
|
|
60
|
+
? scored
|
|
61
|
+
: scored.filter((c) => c.type !== 'query');
|
|
50
62
|
// Trim to max candidates
|
|
51
|
-
const topCandidates =
|
|
63
|
+
const topCandidates = filteredScored.slice(0, maxCandidates);
|
|
52
64
|
// Step 4: Classify
|
|
53
65
|
const sequencingFull = options?.sequencing ?? null;
|
|
54
66
|
const sequencingSummary = sequencingFull
|
|
55
67
|
? summarizeForRetrieval(sequencingFull)
|
|
56
68
|
: { status: 'parallel_safe', related_changes: [], reasons: [] };
|
|
57
|
-
|
|
58
|
-
//
|
|
69
|
+
// Step 4a: Guard against under-specified queries.
|
|
70
|
+
// If normalization dropped every token (e.g., the user typed only stop
|
|
71
|
+
// words like "the and is", or pasted punctuation), both term arrays and
|
|
72
|
+
// the candidate set will be empty. The default classify() rule then
|
|
73
|
+
// returns `new_feature / high` — which causes `propose` to confidently
|
|
74
|
+
// create a brand-new Feature/Change pair from essentially no signal.
|
|
75
|
+
// That is the worst possible default: silent, irreversible, and
|
|
76
|
+
// high-confidence wrong. Short-circuit to `needs_confirmation` with a
|
|
77
|
+
// clear warning so the user is prompted to rephrase.
|
|
78
|
+
const hasAnyTerms = query.feature_terms.length > 0 ||
|
|
79
|
+
query.system_terms.length > 0 ||
|
|
80
|
+
query.entity_terms.length > 0;
|
|
59
81
|
const internalWarnings = collectWarnings(index, topCandidates);
|
|
60
82
|
const warnings = internalWarnings.map((w) => w.message);
|
|
83
|
+
if (!hasAnyTerms && topCandidates.length === 0) {
|
|
84
|
+
const underSpecifiedReason = 'Query is under-specified: no meaningful search terms were extracted. ' +
|
|
85
|
+
'Rephrase with concrete nouns or verbs.';
|
|
86
|
+
warnings.unshift(underSpecifiedReason);
|
|
87
|
+
return {
|
|
88
|
+
query: query.summary,
|
|
89
|
+
classification: 'needs_confirmation',
|
|
90
|
+
confidence: 'low',
|
|
91
|
+
sequencing: sequencingSummary,
|
|
92
|
+
candidates: topCandidates,
|
|
93
|
+
warnings,
|
|
94
|
+
classification_reason: underSpecifiedReason,
|
|
95
|
+
semantic_used: semanticUsed,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
const decision = classify(topCandidates, thresholds, index, sequencingSummary);
|
|
61
99
|
// Step 6: Assemble
|
|
62
100
|
return {
|
|
63
101
|
query: query.summary,
|
|
64
|
-
classification,
|
|
65
|
-
confidence,
|
|
102
|
+
classification: decision.classification,
|
|
103
|
+
confidence: decision.confidence,
|
|
66
104
|
sequencing: sequencingSummary,
|
|
67
105
|
candidates: topCandidates,
|
|
68
106
|
warnings,
|
|
107
|
+
classification_reason: decision.reason,
|
|
108
|
+
semantic_used: semanticUsed,
|
|
69
109
|
};
|
|
70
110
|
}
|
|
71
111
|
//# sourceMappingURL=retrieve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../src/core/retrieval/retrieve.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAejE,SAAS,YAAY,CACnB,QAAwB,EACxB,SAAmC;IAEnC,IAAI,CAAC,SAAS;QAAE,OAAO,QAAQ,CAAC;IAChC,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,eAAe,CACtB,QAAkC,EAClC,SAA6C;IAE7C,IAAI,CAAC,SAAS;QAAE,OAAO,QAAQ,CAAC;IAChC,OAAO;QACL,eAAe,EAAE,EAAE,GAAG,QAAQ,CAAC,eAAe,EAAE,GAAG,SAAS,CAAC,eAAe,EAAE;QAC9E,gBAAgB,EAAE,EAAE,GAAG,QAAQ,CAAC,gBAAgB,EAAE,GAAG,SAAS,CAAC,gBAAgB,EAAE;QACjF,WAAW,EAAE,EAAE,GAAG,QAAQ,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC,WAAW,EAAE;QAClE,kBAAkB,EAAE,EAAE,GAAG,QAAQ,CAAC,kBAAkB,EAAE,GAAG,SAAS,CAAC,kBAAkB,EAAE;KACxF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,QAAQ,CACtB,KAAiB,EACjB,KAAqB,EACrB,OAA0B;IAE1B,MAAM,OAAO,GAAG,YAAY,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,IAAI,EAAE,CAAC;IAEnD,4BAA4B;IAC5B,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAEzD,2EAA2E;IAC3E,MAAM,cAAc,GAAG,OAAO,EAAE,cAAc,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC7C,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,MAAM,EAAE,IAAI,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC;YACvC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC1B,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAE/C,8EAA8E;IAC9E,MAAM,eAAe,GAAG,cAAc;QACpC,CAAC,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC;QACzB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;IAEjF,yBAAyB;IACzB,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../src/core/retrieval/retrieve.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scoring.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/scoring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIpE;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,cAAgC,EACzC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"scoring.d.ts","sourceRoot":"","sources":["../../../src/core/retrieval/scoring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIpE;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,eAAe;IAC9D,OAAO,EAAE,aAAa,EAAE,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,cAAgC,EACzC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,eAAe,EAAE,CAkPnB"}
|
|
@@ -13,6 +13,13 @@ export function scoreCandidates(candidateIds, query, index, weights = DEFAULT_WE
|
|
|
13
13
|
const record = index.records.get(id);
|
|
14
14
|
if (!record)
|
|
15
15
|
continue;
|
|
16
|
+
// Exclude archived changes from active retrieval unless the record type
|
|
17
|
+
// is not a change (Feature/System/Decision/Source/Query can be archived
|
|
18
|
+
// but shouldn't be filtered out just because a change references them).
|
|
19
|
+
// The path-based check catches notes physically located in 99-archive/.
|
|
20
|
+
if (record.type === 'change' && record.path.includes('99-archive/')) {
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
16
23
|
const signals = [];
|
|
17
24
|
// Signal 1: Title match (exact, prefix-stripped, or partial)
|
|
18
25
|
const titleLower = record.title.toLowerCase();
|
|
@@ -40,9 +47,14 @@ export function scoreCandidates(candidateIds, query, index, weights = DEFAULT_WE
|
|
|
40
47
|
reason: `partial title match: "${record.title}"`,
|
|
41
48
|
});
|
|
42
49
|
}
|
|
43
|
-
// Signal 2: Alias match (at most once)
|
|
50
|
+
// Signal 2: Alias match (at most once, skip if alias duplicates the title match)
|
|
51
|
+
const titleAlreadyMatched = signals.some((s) => s.signal === 'exact_title');
|
|
44
52
|
for (const alias of record.aliases) {
|
|
45
53
|
const aliasLower = alias.toLowerCase();
|
|
54
|
+
// Skip alias if it's the same as the title or prefix-stripped title (avoids double-counting)
|
|
55
|
+
if (titleAlreadyMatched && (aliasLower === titleLower || aliasLower === titleWithoutPrefix)) {
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
46
58
|
if (searchTerms.some((t) => aliasLower.includes(t))) {
|
|
47
59
|
signals.push({
|
|
48
60
|
signal: 'alias_match',
|
|
@@ -173,23 +185,36 @@ export function scoreCandidates(candidateIds, query, index, weights = DEFAULT_WE
|
|
|
173
185
|
}
|
|
174
186
|
// Signal 10: Semantic similarity (embedding-based, section 9.2)
|
|
175
187
|
if (embeddingScores && weights.semantic_similarity) {
|
|
176
|
-
const
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
188
|
+
const rawSimilarity = embeddingScores.get(id);
|
|
189
|
+
// Guard against NaN/Infinity and out-of-range values polluting the
|
|
190
|
+
// score. Cosine similarity should be in [0, 1] for normalized
|
|
191
|
+
// vectors, but corrupt cache entries or unusual embedder outputs
|
|
192
|
+
// can produce values > 1 or < 0. Clamp to [0, 1] so a bad score
|
|
193
|
+
// cannot overwhelm lexical signals and distort classification.
|
|
194
|
+
if (typeof rawSimilarity === 'number' &&
|
|
195
|
+
Number.isFinite(rawSimilarity) &&
|
|
196
|
+
Number.isFinite(weights.semantic_similarity)) {
|
|
197
|
+
const similarity = Math.max(0, Math.min(1, rawSimilarity));
|
|
198
|
+
if (similarity > 0.7) {
|
|
199
|
+
const points = Math.round(similarity * weights.semantic_similarity);
|
|
200
|
+
if (Number.isFinite(points)) {
|
|
201
|
+
signals.push({
|
|
202
|
+
signal: 'semantic_similarity',
|
|
203
|
+
points,
|
|
204
|
+
reason: `semantic match: ${similarity.toFixed(2)}`,
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
}
|
|
184
208
|
}
|
|
185
209
|
}
|
|
186
|
-
// Compute total score
|
|
187
|
-
|
|
210
|
+
// Compute total score — filter any non-finite signals before summing so
|
|
211
|
+
// one bad weight cannot poison the whole record's score.
|
|
212
|
+
let totalScore = signals.reduce((sum, s) => (Number.isFinite(s.points) ? sum + s.points : sum), 0);
|
|
188
213
|
// Status bias bonus (minor tiebreaker)
|
|
189
214
|
if (query.status_bias.includes(record.status)) {
|
|
190
215
|
totalScore += 5;
|
|
191
216
|
}
|
|
192
|
-
if (totalScore > 0) {
|
|
217
|
+
if (Number.isFinite(totalScore) && totalScore > 0) {
|
|
193
218
|
scored.push({
|
|
194
219
|
id: record.id,
|
|
195
220
|
type: record.type,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scoring.js","sourceRoot":"","sources":["../../../src/core/retrieval/scoring.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAStE;;;GAGG;AACH,MAAM,UAAU,eAAe,CAC7B,YAAyB,EACzB,KAAqB,EACrB,KAAiB,EACjB,UAA0B,eAAe,EACzC,eAAqC;IAErC,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IACxF,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAEjD,MAAM,MAAM,GAAsB,EAAE,CAAC;IAErC,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM;YAAE,SAAS;QAEtB,MAAM,OAAO,GAAoB,EAAE,CAAC;QAEpC,6DAA6D;QAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,qDAAqD,EAAE,EAAE,CAAC,CAAC;QACzG,IAAI,UAAU,KAAK,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YAC7E,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,aAAa;gBACrB,MAAM,EAAE,OAAO,CAAC,WAAW;gBAC3B,MAAM,EAAE,uBAAuB,MAAM,CAAC,KAAK,GAAG;aAC/C,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,KAAK,CAAC,CAAC,EAAE,CAAC;YAC7D,oDAAoD;YACpD,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,aAAa;gBACrB,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,iCAAiC,MAAM,CAAC,KAAK,GAAG;aACzD,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,uCAAuC;YACvC,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,eAAe;gBACvB,MAAM,EAAE,OAAO,CAAC,aAAa;gBAC7B,MAAM,EAAE,yBAAyB,MAAM,CAAC,KAAK,GAAG;aACjD,CAAC,CAAC;QACL,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"scoring.js","sourceRoot":"","sources":["../../../src/core/retrieval/scoring.ts"],"names":[],"mappings":"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"}
|