daftari 1.31.0 → 2.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 +179 -1
- package/README.md +89 -9
- package/dist/access/rbac.d.ts +1 -0
- package/dist/access/rbac.d.ts.map +1 -1
- package/dist/access/rbac.js +16 -0
- package/dist/access/rbac.js.map +1 -1
- package/dist/asof/index.d.ts.map +1 -1
- package/dist/asof/index.js +23 -2
- package/dist/asof/index.js.map +1 -1
- package/dist/asof/report.d.ts.map +1 -1
- package/dist/asof/report.js +24 -0
- package/dist/asof/report.js.map +1 -1
- package/dist/asof/snapshot.d.ts +7 -1
- package/dist/asof/snapshot.d.ts.map +1 -1
- package/dist/asof/snapshot.js +28 -1
- package/dist/asof/snapshot.js.map +1 -1
- package/dist/backfill/derive.d.ts.map +1 -1
- package/dist/backfill/derive.js +7 -0
- package/dist/backfill/derive.js.map +1 -1
- package/dist/canary/fixtures.d.ts +12 -0
- package/dist/canary/fixtures.d.ts.map +1 -0
- package/dist/canary/fixtures.js +132 -0
- package/dist/canary/fixtures.js.map +1 -0
- package/dist/canary/index.d.ts +16 -0
- package/dist/canary/index.d.ts.map +1 -0
- package/dist/canary/index.js +105 -0
- package/dist/canary/index.js.map +1 -0
- package/dist/canary/run.d.ts +39 -0
- package/dist/canary/run.d.ts.map +1 -0
- package/dist/canary/run.js +266 -0
- package/dist/canary/run.js.map +1 -0
- package/dist/canary/stats.d.ts +36 -0
- package/dist/canary/stats.d.ts.map +1 -0
- package/dist/canary/stats.js +143 -0
- package/dist/canary/stats.js.map +1 -0
- package/dist/canon/index.d.ts +15 -0
- package/dist/canon/index.d.ts.map +1 -0
- package/dist/canon/index.js +167 -0
- package/dist/canon/index.js.map +1 -0
- package/dist/canon/resolve.d.ts +12 -0
- package/dist/canon/resolve.d.ts.map +1 -0
- package/dist/canon/resolve.js +67 -0
- package/dist/canon/resolve.js.map +1 -0
- package/dist/canon/topic.d.ts +20 -0
- package/dist/canon/topic.d.ts.map +1 -0
- package/dist/canon/topic.js +81 -0
- package/dist/canon/topic.js.map +1 -0
- package/dist/canon/types.d.ts +37 -0
- package/dist/canon/types.d.ts.map +1 -0
- package/dist/canon/types.js +9 -0
- package/dist/canon/types.js.map +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +12 -0
- package/dist/cli.js.map +1 -1
- package/dist/consolidate/index.d.ts.map +1 -1
- package/dist/consolidate/index.js +10 -12
- package/dist/consolidate/index.js.map +1 -1
- package/dist/curation/edges.d.ts.map +1 -1
- package/dist/curation/edges.js +36 -17
- package/dist/curation/edges.js.map +1 -1
- package/dist/curation/lint-voice.d.ts +3 -0
- package/dist/curation/lint-voice.d.ts.map +1 -0
- package/dist/curation/lint-voice.js +87 -0
- package/dist/curation/lint-voice.js.map +1 -0
- package/dist/curation/lint.d.ts +7 -1
- package/dist/curation/lint.d.ts.map +1 -1
- package/dist/curation/lint.js +62 -18
- package/dist/curation/lint.js.map +1 -1
- package/dist/curation/shadow.d.ts +1 -0
- package/dist/curation/shadow.d.ts.map +1 -1
- package/dist/curation/shadow.js +17 -11
- package/dist/curation/shadow.js.map +1 -1
- package/dist/curation/staged-actions.d.ts +1 -0
- package/dist/curation/staged-actions.d.ts.map +1 -1
- package/dist/curation/staged-actions.js +21 -24
- package/dist/curation/staged-actions.js.map +1 -1
- package/dist/curation/validity.d.ts +20 -0
- package/dist/curation/validity.d.ts.map +1 -0
- package/dist/curation/validity.js +191 -0
- package/dist/curation/validity.js.map +1 -0
- package/dist/eval/generate.d.ts.map +1 -1
- package/dist/eval/generate.js +16 -0
- package/dist/eval/generate.js.map +1 -1
- package/dist/eval/index.d.ts +1 -0
- package/dist/eval/index.d.ts.map +1 -1
- package/dist/eval/index.js +79 -28
- package/dist/eval/index.js.map +1 -1
- package/dist/eval/llm-openrouter.d.ts.map +1 -1
- package/dist/eval/llm-openrouter.js +158 -65
- package/dist/eval/llm-openrouter.js.map +1 -1
- package/dist/fence/detect.d.ts +10 -0
- package/dist/fence/detect.d.ts.map +1 -0
- package/dist/fence/detect.js +161 -0
- package/dist/fence/detect.js.map +1 -0
- package/dist/fence/index.d.ts +22 -0
- package/dist/fence/index.d.ts.map +1 -0
- package/dist/fence/index.js +117 -0
- package/dist/fence/index.js.map +1 -0
- package/dist/frontmatter/schema.d.ts.map +1 -1
- package/dist/frontmatter/schema.js +26 -0
- package/dist/frontmatter/schema.js.map +1 -1
- package/dist/frontmatter/types.d.ts +3 -1
- package/dist/frontmatter/types.d.ts.map +1 -1
- package/dist/frontmatter/types.js +2 -0
- package/dist/frontmatter/types.js.map +1 -1
- package/dist/holders/registry.d.ts +8 -0
- package/dist/holders/registry.d.ts.map +1 -0
- package/dist/holders/registry.js +18 -0
- package/dist/holders/registry.js.map +1 -0
- package/dist/holders/types.d.ts +10 -0
- package/dist/holders/types.d.ts.map +1 -0
- package/dist/holders/types.js +2 -0
- package/dist/holders/types.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -6
- package/dist/index.js.map +1 -1
- package/dist/interview/index.d.ts +7 -0
- package/dist/interview/index.d.ts.map +1 -0
- package/dist/interview/index.js +219 -0
- package/dist/interview/index.js.map +1 -0
- package/dist/interview/questions.d.ts +18 -0
- package/dist/interview/questions.d.ts.map +1 -0
- package/dist/interview/questions.js +201 -0
- package/dist/interview/questions.js.map +1 -0
- package/dist/interview/transcript.d.ts +23 -0
- package/dist/interview/transcript.d.ts.map +1 -0
- package/dist/interview/transcript.js +155 -0
- package/dist/interview/transcript.js.map +1 -0
- package/dist/okf/export.d.ts.map +1 -1
- package/dist/okf/export.js +4 -2
- package/dist/okf/export.js.map +1 -1
- package/dist/okf/import.d.ts.map +1 -1
- package/dist/okf/import.js +11 -3
- package/dist/okf/import.js.map +1 -1
- package/dist/okf/index.d.ts.map +1 -1
- package/dist/okf/index.js +13 -1
- package/dist/okf/index.js.map +1 -1
- package/dist/okf/map.d.ts +11 -0
- package/dist/okf/map.d.ts.map +1 -1
- package/dist/okf/map.js +191 -13
- package/dist/okf/map.js.map +1 -1
- package/dist/okf/types.d.ts +6 -2
- package/dist/okf/types.d.ts.map +1 -1
- package/dist/okf/types.js +39 -5
- package/dist/okf/types.js.map +1 -1
- package/dist/resources.d.ts +27 -0
- package/dist/resources.d.ts.map +1 -0
- package/dist/resources.js +169 -0
- package/dist/resources.js.map +1 -0
- package/dist/search/current-source.d.ts +1 -0
- package/dist/search/current-source.d.ts.map +1 -1
- package/dist/search/current-source.js +3 -1
- package/dist/search/current-source.js.map +1 -1
- package/dist/search/hybrid.d.ts +5 -0
- package/dist/search/hybrid.d.ts.map +1 -1
- package/dist/search/hybrid.js +25 -9
- package/dist/search/hybrid.js.map +1 -1
- package/dist/search/reindex.d.ts +3 -0
- package/dist/search/reindex.d.ts.map +1 -1
- package/dist/search/reindex.js +78 -23
- package/dist/search/reindex.js.map +1 -1
- package/dist/search/valid-at-source.d.ts +25 -0
- package/dist/search/valid-at-source.d.ts.map +1 -0
- package/dist/search/valid-at-source.js +131 -0
- package/dist/search/valid-at-source.js.map +1 -0
- package/dist/search/watcher.d.ts.map +1 -1
- package/dist/search/watcher.js +8 -17
- package/dist/search/watcher.js.map +1 -1
- package/dist/serve/index.d.ts.map +1 -1
- package/dist/serve/index.js +58 -89
- package/dist/serve/index.js.map +1 -1
- package/dist/server.d.ts +3 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +159 -11
- package/dist/server.js.map +1 -1
- package/dist/sleep/cycle.d.ts.map +1 -1
- package/dist/sleep/cycle.js +20 -4
- package/dist/sleep/cycle.js.map +1 -1
- package/dist/storage/index-db.d.ts +7 -1
- package/dist/storage/index-db.d.ts.map +1 -1
- package/dist/storage/index-db.js +134 -8
- package/dist/storage/index-db.js.map +1 -1
- package/dist/tools/canon.d.ts +3 -0
- package/dist/tools/canon.d.ts.map +1 -0
- package/dist/tools/canon.js +177 -0
- package/dist/tools/canon.js.map +1 -0
- package/dist/tools/consumes.d.ts.map +1 -1
- package/dist/tools/consumes.js +47 -1
- package/dist/tools/consumes.js.map +1 -1
- package/dist/tools/curation.d.ts +2 -0
- package/dist/tools/curation.d.ts.map +1 -1
- package/dist/tools/curation.js +506 -3
- package/dist/tools/curation.js.map +1 -1
- package/dist/tools/edge-staleness.d.ts.map +1 -1
- package/dist/tools/edge-staleness.js +115 -0
- package/dist/tools/edge-staleness.js.map +1 -1
- package/dist/tools/edges.d.ts.map +1 -1
- package/dist/tools/edges.js +94 -0
- package/dist/tools/edges.js.map +1 -1
- package/dist/tools/read.d.ts +14 -0
- package/dist/tools/read.d.ts.map +1 -1
- package/dist/tools/read.js +452 -51
- package/dist/tools/read.js.map +1 -1
- package/dist/tools/receipt.d.ts +1 -1
- package/dist/tools/receipt.d.ts.map +1 -1
- package/dist/tools/receipt.js +147 -2
- package/dist/tools/receipt.js.map +1 -1
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js +454 -3
- package/dist/tools/search.js.map +1 -1
- package/dist/tools/staged-actions.d.ts +7 -0
- package/dist/tools/staged-actions.d.ts.map +1 -1
- package/dist/tools/staged-actions.js +138 -36
- package/dist/tools/staged-actions.js.map +1 -1
- package/dist/tools/themes.d.ts.map +1 -1
- package/dist/tools/themes.js +120 -0
- package/dist/tools/themes.js.map +1 -1
- package/dist/tools/tier1.d.ts.map +1 -1
- package/dist/tools/tier1.js +56 -0
- package/dist/tools/tier1.js.map +1 -1
- package/dist/tools/tier2.d.ts.map +1 -1
- package/dist/tools/tier2.js +111 -1
- package/dist/tools/tier2.js.map +1 -1
- package/dist/tools/witness.d.ts.map +1 -1
- package/dist/tools/witness.js +93 -0
- package/dist/tools/witness.js.map +1 -1
- package/dist/tools/write.d.ts +1 -0
- package/dist/tools/write.d.ts.map +1 -1
- package/dist/tools/write.js +479 -216
- package/dist/tools/write.js.map +1 -1
- package/dist/utils/config.d.ts +2 -0
- package/dist/utils/config.d.ts.map +1 -1
- package/dist/utils/config.js +160 -86
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/dates.d.ts +1 -0
- package/dist/utils/dates.d.ts.map +1 -1
- package/dist/utils/dates.js +5 -0
- package/dist/utils/dates.js.map +1 -1
- package/package.json +5 -2
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
// Canon orchestrator — wires the belief-layer modules with RBAC.
|
|
2
|
+
//
|
|
3
|
+
// computeCanon loads all vault data in a single consistent snapshot, applies
|
|
4
|
+
// access control to restrict candidate docs and tensions, computes visibility
|
|
5
|
+
// and unindexed flags, delegates resolution to resolveCanon (pure), and
|
|
6
|
+
// attaches a vault_receipt over the cited paths. The receipt is resilient:
|
|
7
|
+
// if building it fails (e.g. in a bare temp vault without git), the canon
|
|
8
|
+
// result is still returned with receipt: null rather than propagating the
|
|
9
|
+
// failure.
|
|
10
|
+
//
|
|
11
|
+
// v1 known limitation: the receipt's git anchor is pinned inside vaultReceipt
|
|
12
|
+
// at call end, not captured up front; acceptable under the working-tree read
|
|
13
|
+
// strategy for a quiet vault; revisit if used in a concurrently-written vault.
|
|
14
|
+
import { canRead } from "../access/rbac.js";
|
|
15
|
+
import { listEdges } from "../curation/edges.js";
|
|
16
|
+
import { listTensions } from "../curation/tension.js";
|
|
17
|
+
import { loadDocuments } from "../curation/vault-docs.js";
|
|
18
|
+
import { ok } from "../frontmatter/types.js";
|
|
19
|
+
import { buildRegistry, resolveHolder } from "../holders/registry.js";
|
|
20
|
+
import { vaultReceipt } from "../tools/receipt.js";
|
|
21
|
+
import { loadConfig } from "../utils/config.js";
|
|
22
|
+
import { resolveCanon } from "./resolve.js";
|
|
23
|
+
import { topicEgoGraphFrom } from "./topic.js";
|
|
24
|
+
// Top-level directory of a vault-relative path — used for RBAC when a doc's
|
|
25
|
+
// collection frontmatter is absent (mirrors receipt.ts's topCollection).
|
|
26
|
+
function topCollection(relPath) {
|
|
27
|
+
return relPath.split("/")[0] ?? "";
|
|
28
|
+
}
|
|
29
|
+
export async function computeCanon(vaultRoot, args, access) {
|
|
30
|
+
const asOf = args.asOf ?? new Date().toISOString().slice(0, 10);
|
|
31
|
+
const depth = args.depth ?? 2;
|
|
32
|
+
// Step 1: load documents, tensions, and edges — one consistent snapshot.
|
|
33
|
+
// All three are loaded here and reused throughout; no subsequent listTensions
|
|
34
|
+
// or listEdges calls are made, eliminating write-window inconsistency.
|
|
35
|
+
const allDocsRes = await loadDocuments(vaultRoot);
|
|
36
|
+
if (!allDocsRes.ok)
|
|
37
|
+
return allDocsRes;
|
|
38
|
+
const tensionsRes = await listTensions(vaultRoot);
|
|
39
|
+
if (!tensionsRes.ok)
|
|
40
|
+
return tensionsRes;
|
|
41
|
+
const allTensions = tensionsRes.value;
|
|
42
|
+
const edgesRes = await listEdges(vaultRoot, {});
|
|
43
|
+
if (!edgesRes.ok)
|
|
44
|
+
return edgesRes;
|
|
45
|
+
const allEdges = edgesRes.value;
|
|
46
|
+
// Step 2: topic ego-graph — candidate paths, using pre-loaded data.
|
|
47
|
+
const candidateSet = new Set(topicEgoGraphFrom(allTensions, allEdges, args.seed, depth));
|
|
48
|
+
const allDocsMap = new Map(allDocsRes.value.map((d) => [d.path, d]));
|
|
49
|
+
// Step 3: build CanonDoc[] for candidate paths present in the vault.
|
|
50
|
+
const candidateDocs = [];
|
|
51
|
+
for (const path of candidateSet) {
|
|
52
|
+
const doc = allDocsMap.get(path);
|
|
53
|
+
if (!doc)
|
|
54
|
+
continue;
|
|
55
|
+
candidateDocs.push({
|
|
56
|
+
path,
|
|
57
|
+
holder: doc.frontmatter.updated_by || "unknown:unattributed",
|
|
58
|
+
valid_from: doc.frontmatter.valid_from,
|
|
59
|
+
valid_until: doc.frontmatter.valid_until,
|
|
60
|
+
updated: doc.frontmatter.updated,
|
|
61
|
+
collection: doc.frontmatter.collection || topCollection(path),
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
// Pre-RBAC set: all topic candidate paths that exist in the vault.
|
|
65
|
+
// Used for tension filtering — a tension is "touching" the topic if
|
|
66
|
+
// either endpoint is a vault-resident candidate doc (regardless of
|
|
67
|
+
// whether that doc's collection is readable by the current caller).
|
|
68
|
+
const existingCandidatePaths = new Set(candidateDocs.map((d) => d.path));
|
|
69
|
+
// Step 4: RBAC — filter candidate docs to those whose collection is readable.
|
|
70
|
+
// If access is undefined, treat as full access (no filtering).
|
|
71
|
+
const visibleCandidates = access
|
|
72
|
+
? candidateDocs.filter((d) => canRead(access.role, d.collection))
|
|
73
|
+
: candidateDocs;
|
|
74
|
+
// Helper: is a given vault path readable under the current access context?
|
|
75
|
+
// A path not present in allDocsMap is treated as unreadable.
|
|
76
|
+
function readable(path) {
|
|
77
|
+
if (!access)
|
|
78
|
+
return true;
|
|
79
|
+
const doc = allDocsMap.get(path);
|
|
80
|
+
if (!doc)
|
|
81
|
+
return false;
|
|
82
|
+
const collection = doc.frontmatter.collection || topCollection(path);
|
|
83
|
+
return canRead(access.role, collection);
|
|
84
|
+
}
|
|
85
|
+
// Step 5: compute visibility flags using the already-loaded tensions.
|
|
86
|
+
// A tension touches the topic if either endpoint is a vault-resident
|
|
87
|
+
// candidate doc — tested against the PRE-RBAC existingCandidatePaths set
|
|
88
|
+
// so that tensions between two hidden docs are not silently omitted.
|
|
89
|
+
const touchingTensions = allTensions.filter((t) => existingCandidatePaths.has(t.sourceA) || existingCandidatePaths.has(t.sourceB));
|
|
90
|
+
const visibleTensions = [];
|
|
91
|
+
let hiddenTensionCount = 0;
|
|
92
|
+
for (const t of touchingTensions) {
|
|
93
|
+
const bothVisible = readable(t.sourceA) && readable(t.sourceB);
|
|
94
|
+
if (bothVisible) {
|
|
95
|
+
visibleTensions.push({ sourceA: t.sourceA, sourceB: t.sourceB });
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
// At least one side is unreadable (covers one-side-hidden AND both-sides-hidden).
|
|
99
|
+
// We only COUNT the tension; we never expose its claims or paths in output.
|
|
100
|
+
hiddenTensionCount += 1;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
const partialVisibility = hiddenTensionCount > 0;
|
|
104
|
+
// Step 6: unindexed paths — visible candidates that appear in NO tension and NO edge
|
|
105
|
+
// (vault-wide, never consolidated anywhere), using the already-loaded allTensions and allEdges.
|
|
106
|
+
const consolidatedPaths = new Set();
|
|
107
|
+
for (const t of allTensions) {
|
|
108
|
+
consolidatedPaths.add(t.sourceA);
|
|
109
|
+
consolidatedPaths.add(t.sourceB);
|
|
110
|
+
}
|
|
111
|
+
for (const e of allEdges) {
|
|
112
|
+
consolidatedPaths.add(e.fromPath);
|
|
113
|
+
consolidatedPaths.add(e.toPath);
|
|
114
|
+
}
|
|
115
|
+
const unindexedPaths = visibleCandidates
|
|
116
|
+
.filter((d) => !consolidatedPaths.has(d.path))
|
|
117
|
+
.map((d) => d.path);
|
|
118
|
+
// Step 7: build holder registry from config (empty on error or missing config).
|
|
119
|
+
let holderAliases = {};
|
|
120
|
+
const configRes = loadConfig(vaultRoot);
|
|
121
|
+
if (configRes.ok) {
|
|
122
|
+
holderAliases = configRes.value.holderAliases;
|
|
123
|
+
}
|
|
124
|
+
const registry = buildRegistry(holderAliases);
|
|
125
|
+
// Step 8: determine holders.
|
|
126
|
+
let holders;
|
|
127
|
+
if (args.holders !== undefined) {
|
|
128
|
+
holders = args.holders;
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
const holderSet = new Set(visibleCandidates.map((d) => resolveHolder(registry, d.holder)));
|
|
132
|
+
holders = [...holderSet];
|
|
133
|
+
}
|
|
134
|
+
// Step 9: resolve canon (pure).
|
|
135
|
+
const canonResult = resolveCanon(visibleCandidates, holders, asOf, registry, visibleTensions, { partial_visibility: partialVisibility, hidden_tension_count: hiddenTensionCount }, unindexedPaths);
|
|
136
|
+
// Step 10: build receipt over all cited paths (settled citations + contested trajectory paths).
|
|
137
|
+
const citedPaths = [];
|
|
138
|
+
const citedSet = new Set();
|
|
139
|
+
for (const s of canonResult.settled) {
|
|
140
|
+
for (const p of s.citations) {
|
|
141
|
+
if (!citedSet.has(p)) {
|
|
142
|
+
citedSet.add(p);
|
|
143
|
+
citedPaths.push(p);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
for (const c of canonResult.contested) {
|
|
148
|
+
for (const node of c.trajectory) {
|
|
149
|
+
if (!citedSet.has(node.path)) {
|
|
150
|
+
citedSet.add(node.path);
|
|
151
|
+
citedPaths.push(node.path);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
// Receipt is resilient: failures (e.g. bare vault with no git or missing
|
|
156
|
+
// files) do not propagate — canon result is returned with receipt: null.
|
|
157
|
+
let receipt = null;
|
|
158
|
+
if (citedPaths.length > 0) {
|
|
159
|
+
const receiptRes = await vaultReceipt(vaultRoot, { paths: citedPaths }, access);
|
|
160
|
+
if (receiptRes.ok) {
|
|
161
|
+
receipt = receiptRes.value;
|
|
162
|
+
}
|
|
163
|
+
// On error: leave receipt as null and continue.
|
|
164
|
+
}
|
|
165
|
+
return ok({ ...canonResult, receipt });
|
|
166
|
+
}
|
|
167
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/canon/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { HolderRegistry } from "../holders/types.js";
|
|
2
|
+
import type { CanonDoc, CanonResult } from "./types.js";
|
|
3
|
+
interface TensionPair {
|
|
4
|
+
sourceA: string;
|
|
5
|
+
sourceB: string;
|
|
6
|
+
}
|
|
7
|
+
export declare function resolveCanon(docs: CanonDoc[], holders: string[], asOf: string, registry: HolderRegistry, tensions: TensionPair[], hidden?: {
|
|
8
|
+
partial_visibility: boolean;
|
|
9
|
+
hidden_tension_count: number;
|
|
10
|
+
}, unindexed?: string[]): CanonResult;
|
|
11
|
+
export {};
|
|
12
|
+
//# sourceMappingURL=resolve.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/canon/resolve.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAuB,MAAM,YAAY,CAAC;AAE7E,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD,wBAAgB,YAAY,CAC1B,IAAI,EAAE,QAAQ,EAAE,EAChB,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,WAAW,EAAE,EACvB,MAAM;;;CAAyD,EAC/D,SAAS,GAAE,MAAM,EAAO,GACvB,WAAW,CAwDb"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
// Canon resolver — pure belief-layer computation.
|
|
2
|
+
//
|
|
3
|
+
// Given already-loaded docs, a holder-set, an as-of date, the registry, and
|
|
4
|
+
// the topic's tensions, produces a CanonResult without performing any I/O.
|
|
5
|
+
// The orchestrator (Task 4) is responsible for loading data and passing it in.
|
|
6
|
+
// A tension whose both sides are in-scope surviving docs becomes a contested
|
|
7
|
+
// trajectory (sorted ascending by valid_from); all other in-scope docs are
|
|
8
|
+
// settled. Ghost-holder warnings fire only when the registry is non-empty —
|
|
9
|
+
// an empty registry is the zero-config baseline, not a misconfiguration.
|
|
10
|
+
import { computeValidity } from "../curation/validity.js";
|
|
11
|
+
import { isRegistered, resolveHolder } from "../holders/registry.js";
|
|
12
|
+
/** A doc is in canon if it has no validity window, or is in-window at asOf. */
|
|
13
|
+
function currentlyValid(doc, asOf) {
|
|
14
|
+
const report = computeValidity({ valid_from: doc.valid_from, valid_until: doc.valid_until }, asOf);
|
|
15
|
+
return report === null || report.state === "in-window";
|
|
16
|
+
}
|
|
17
|
+
export function resolveCanon(docs, holders, asOf, registry, tensions, hidden = { partial_visibility: false, hidden_tension_count: 0 }, unindexed = []) {
|
|
18
|
+
const holderSet = new Set(holders);
|
|
19
|
+
const inScope = docs.filter((d) => currentlyValid(d, asOf) && holderSet.has(resolveHolder(registry, d.holder)));
|
|
20
|
+
const byPath = new Map(inScope.map((d) => [d.path, d]));
|
|
21
|
+
const ghostStrings = [
|
|
22
|
+
...new Set(inScope
|
|
23
|
+
.map((d) => d.holder)
|
|
24
|
+
.filter((s) => !isRegistered(registry, s) && registry.aliases.size > 0)),
|
|
25
|
+
];
|
|
26
|
+
const contested = [];
|
|
27
|
+
const contestedPaths = new Set();
|
|
28
|
+
for (const t of tensions) {
|
|
29
|
+
const a = byPath.get(t.sourceA);
|
|
30
|
+
const b = byPath.get(t.sourceB);
|
|
31
|
+
if (a === undefined || b === undefined)
|
|
32
|
+
continue;
|
|
33
|
+
const nodes = [a, b]
|
|
34
|
+
.map((d) => ({
|
|
35
|
+
holder: resolveHolder(registry, d.holder),
|
|
36
|
+
path: d.path,
|
|
37
|
+
valid_from: d.valid_from,
|
|
38
|
+
updated: d.updated,
|
|
39
|
+
}))
|
|
40
|
+
.sort((x, y) => (x.valid_from ?? "").localeCompare(y.valid_from ?? ""));
|
|
41
|
+
contested.push({ trajectory: nodes, hint_ordering: "by_valid_from" });
|
|
42
|
+
contestedPaths.add(a.path);
|
|
43
|
+
contestedPaths.add(b.path);
|
|
44
|
+
}
|
|
45
|
+
// Settled is one claim per doc (citations: [d.path]). Two non-contested docs
|
|
46
|
+
// from the same resolved holder therefore produce two SettledClaims rather
|
|
47
|
+
// than one grouped claim. Grouping multiple same-holder docs into a single
|
|
48
|
+
// multi-citation claim is intentionally deferred to a later iteration.
|
|
49
|
+
const settled = inScope
|
|
50
|
+
.filter((d) => !contestedPaths.has(d.path))
|
|
51
|
+
.map((d) => ({ holder: resolveHolder(registry, d.holder), citations: [d.path] }));
|
|
52
|
+
return {
|
|
53
|
+
settled,
|
|
54
|
+
contested,
|
|
55
|
+
flags: {
|
|
56
|
+
graph_completeness: "curated",
|
|
57
|
+
partial_visibility: hidden.partial_visibility,
|
|
58
|
+
hidden_tension_count: hidden.hidden_tension_count,
|
|
59
|
+
unindexed: unindexed.length > 0,
|
|
60
|
+
unindexed_paths: unindexed,
|
|
61
|
+
...(ghostStrings.length > 0
|
|
62
|
+
? { ghost_holder_warning: { count: ghostStrings.length, strings: ghostStrings } }
|
|
63
|
+
: {}),
|
|
64
|
+
},
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=resolve.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/canon/resolve.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { Result } from "../frontmatter/types.js";
|
|
2
|
+
/**
|
|
3
|
+
* Pure variant — works from already-loaded data. Use this when tensions and
|
|
4
|
+
* edges have already been fetched (e.g. in computeCanon) to avoid a second
|
|
5
|
+
* round-trip to the store.
|
|
6
|
+
*
|
|
7
|
+
* Builds the same undirected adjacency as topicEgoGraph (union of all tension
|
|
8
|
+
* pairs + non-revoked derives_from edges) and runs BFS to `depth`.
|
|
9
|
+
*/
|
|
10
|
+
export declare function topicEgoGraphFrom(tensions: {
|
|
11
|
+
sourceA: string;
|
|
12
|
+
sourceB: string;
|
|
13
|
+
}[], edges: {
|
|
14
|
+
fromPath: string;
|
|
15
|
+
toPath: string;
|
|
16
|
+
status: string;
|
|
17
|
+
}[], seed: string, depth?: number): string[];
|
|
18
|
+
/** Doc paths within `depth` hops of `seed` over tension+derives_from. Includes the seed. */
|
|
19
|
+
export declare function topicEgoGraph(vaultRoot: string, seed: string, depth?: number): Promise<Result<string[], Error>>;
|
|
20
|
+
//# sourceMappingURL=topic.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"topic.d.ts","sourceRoot":"","sources":["../../src/canon/topic.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAoDtD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,EAChD,KAAK,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,EAC7D,IAAI,EAAE,MAAM,EACZ,KAAK,SAAI,GACR,MAAM,EAAE,CAGV;AAED,4FAA4F;AAC5F,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,SAAI,GACR,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC,CAQlC"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
// Topic ego-graph — breadth-first neighborhood over the tension + derives_from graph.
|
|
2
|
+
//
|
|
3
|
+
// A "topic" for a seed document is the set of docs reachable within `depth` hops
|
|
4
|
+
// across an undirected union of two edge kinds: tension pairs (sourceA ↔ sourceB)
|
|
5
|
+
// and derives_from edges (from ↔ to). Both kinds are treated as undirected —
|
|
6
|
+
// "near in the knowledge graph" is what matters, not causal direction.
|
|
7
|
+
//
|
|
8
|
+
// Inclusion rule for edge status:
|
|
9
|
+
// - Resolved tensions ARE still topic links: the disagreement is topically real
|
|
10
|
+
// regardless of how it was closed.
|
|
11
|
+
// - Revoked derives_from edges are NOT topic links: revocation means the
|
|
12
|
+
// derivation was contested and invalidated, so the topical connection is gone.
|
|
13
|
+
import { listEdges } from "../curation/edges.js";
|
|
14
|
+
import { listTensions } from "../curation/tension.js";
|
|
15
|
+
/** Build an undirected adjacency map from already-loaded tensions and edges. */
|
|
16
|
+
function buildAdjacencyFrom(tensions, edges) {
|
|
17
|
+
const adj = new Map();
|
|
18
|
+
const link = (a, b) => {
|
|
19
|
+
const setA = adj.get(a) ?? new Set();
|
|
20
|
+
setA.add(b);
|
|
21
|
+
adj.set(a, setA);
|
|
22
|
+
const setB = adj.get(b) ?? new Set();
|
|
23
|
+
setB.add(a);
|
|
24
|
+
adj.set(b, setB);
|
|
25
|
+
};
|
|
26
|
+
// All statuses: a resolved tension is still a topic link.
|
|
27
|
+
for (const t of tensions)
|
|
28
|
+
link(t.sourceA, t.sourceB);
|
|
29
|
+
for (const e of edges) {
|
|
30
|
+
// Revoked edges are excluded: revocation means the derivation was invalidated,
|
|
31
|
+
// so it no longer constitutes a topical connection. Resolved tensions are still
|
|
32
|
+
// included above — the disagreement is topically real even after resolution.
|
|
33
|
+
if (e.status === "revoked")
|
|
34
|
+
continue;
|
|
35
|
+
link(e.fromPath, e.toPath);
|
|
36
|
+
}
|
|
37
|
+
return adj;
|
|
38
|
+
}
|
|
39
|
+
/** BFS over a pre-built adjacency map. Shared logic for both variants below. */
|
|
40
|
+
function bfsFromAdj(adj, seed, depth) {
|
|
41
|
+
const visited = new Set([seed]);
|
|
42
|
+
let frontier = [seed];
|
|
43
|
+
for (let d = 0; d < depth; d++) {
|
|
44
|
+
const next = [];
|
|
45
|
+
for (const node of frontier) {
|
|
46
|
+
for (const nbr of adj.get(node) ?? []) {
|
|
47
|
+
if (!visited.has(nbr)) {
|
|
48
|
+
visited.add(nbr);
|
|
49
|
+
next.push(nbr);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
frontier = next;
|
|
54
|
+
if (frontier.length === 0)
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
return [...visited];
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Pure variant — works from already-loaded data. Use this when tensions and
|
|
61
|
+
* edges have already been fetched (e.g. in computeCanon) to avoid a second
|
|
62
|
+
* round-trip to the store.
|
|
63
|
+
*
|
|
64
|
+
* Builds the same undirected adjacency as topicEgoGraph (union of all tension
|
|
65
|
+
* pairs + non-revoked derives_from edges) and runs BFS to `depth`.
|
|
66
|
+
*/
|
|
67
|
+
export function topicEgoGraphFrom(tensions, edges, seed, depth = 2) {
|
|
68
|
+
const adj = buildAdjacencyFrom(tensions, edges);
|
|
69
|
+
return bfsFromAdj(adj, seed, depth);
|
|
70
|
+
}
|
|
71
|
+
/** Doc paths within `depth` hops of `seed` over tension+derives_from. Includes the seed. */
|
|
72
|
+
export async function topicEgoGraph(vaultRoot, seed, depth = 2) {
|
|
73
|
+
const tensionsRes = await listTensions(vaultRoot);
|
|
74
|
+
if (!tensionsRes.ok)
|
|
75
|
+
return tensionsRes;
|
|
76
|
+
const edgesRes = await listEdges(vaultRoot, {});
|
|
77
|
+
if (!edgesRes.ok)
|
|
78
|
+
return edgesRes;
|
|
79
|
+
return { ok: true, value: topicEgoGraphFrom(tensionsRes.value, edgesRes.value, seed, depth) };
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=topic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"topic.js","sourceRoot":"","sources":["../../src/canon/topic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { GhostHolderWarning } from "../holders/types.js";
|
|
2
|
+
export interface CanonDoc {
|
|
3
|
+
path: string;
|
|
4
|
+
holder: string;
|
|
5
|
+
valid_from: string | null;
|
|
6
|
+
valid_until: string | null;
|
|
7
|
+
updated: string;
|
|
8
|
+
collection: string;
|
|
9
|
+
}
|
|
10
|
+
export interface SettledClaim {
|
|
11
|
+
holder: string;
|
|
12
|
+
citations: string[];
|
|
13
|
+
}
|
|
14
|
+
export interface TrajectoryNode {
|
|
15
|
+
holder: string;
|
|
16
|
+
path: string;
|
|
17
|
+
valid_from: string | null;
|
|
18
|
+
updated: string;
|
|
19
|
+
}
|
|
20
|
+
export interface ContestedTrajectory {
|
|
21
|
+
trajectory: TrajectoryNode[];
|
|
22
|
+
hint_ordering: "by_valid_from";
|
|
23
|
+
}
|
|
24
|
+
export interface CanonFlags {
|
|
25
|
+
graph_completeness: "curated";
|
|
26
|
+
partial_visibility: boolean;
|
|
27
|
+
hidden_tension_count: number;
|
|
28
|
+
unindexed: boolean;
|
|
29
|
+
unindexed_paths: string[];
|
|
30
|
+
ghost_holder_warning?: GhostHolderWarning;
|
|
31
|
+
}
|
|
32
|
+
export interface CanonResult {
|
|
33
|
+
settled: SettledClaim[];
|
|
34
|
+
contested: ContestedTrajectory[];
|
|
35
|
+
flags: CanonFlags;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/canon/types.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,aAAa,EAAE,eAAe,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,KAAK,EAAE,UAAU,CAAC;CACnB"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
// Canon resolver types — the belief layer output contract.
|
|
2
|
+
//
|
|
3
|
+
// A CanonResult is always pure data: no I/O, no side effects. The orchestrator
|
|
4
|
+
// (Task 4) loads documents and passes them in; this module only defines shapes.
|
|
5
|
+
// CanonFlags carries orchestrator-computed provenance inputs (partial_visibility,
|
|
6
|
+
// hidden_tension_count, unindexed) so callers can attach them without the
|
|
7
|
+
// resolver needing to know where they came from.
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/canon/types.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,EAAE;AACF,+EAA+E;AAC/E,gFAAgF;AAChF,kFAAkF;AAClF,0EAA0E;AAC1E,iDAAiD"}
|
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA2KA,wBAAsB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgEnE;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmGvD"}
|
package/dist/cli.js
CHANGED
|
@@ -23,11 +23,13 @@ Usage:
|
|
|
23
23
|
daftari --vault <path> [options] Start the MCP server (stdio) against a vault
|
|
24
24
|
daftari asof <ref-or-date> Belief archaeology — the vault at a past commit (see: daftari asof --help)
|
|
25
25
|
daftari audit [options] Run a cross-repo coherence audit (see: daftari audit --help)
|
|
26
|
+
daftari canary [options] Falsify the read-path fence (see: daftari canary --help)
|
|
26
27
|
daftari eval [options] Cortex quality metric (see: daftari eval --help)
|
|
27
28
|
daftari backfill [options] Derive frontmatter for an existing wiki (see: daftari backfill --help)
|
|
28
29
|
daftari consolidate [options] Cortex loop scheduler — emit due/birth queues (see: daftari consolidate --help)
|
|
29
30
|
daftari court [rule <id>] [options] Tension Court — docket, briefs, rulings (see: daftari court --help)
|
|
30
31
|
daftari import obsidian <v> Adopt an Obsidian vault in place (see: daftari import --help)
|
|
32
|
+
daftari interview [ask] [options] Interview the principal on what the vault finds unclear (see: daftari interview --help)
|
|
31
33
|
daftari okf <export|import> ... Bridge a vault and the Open Knowledge Format (see: daftari okf --help)
|
|
32
34
|
daftari serve --vault <path> Server mode over Streamable HTTP for multiple clients (see: daftari serve --help)
|
|
33
35
|
daftari sleep [options] Nightly metabolic pass — wake list + Morning Report (see: daftari sleep --help)
|
|
@@ -215,6 +217,11 @@ export async function run(argv) {
|
|
|
215
217
|
process.exitCode = await runServe(argv.slice(1));
|
|
216
218
|
return;
|
|
217
219
|
}
|
|
220
|
+
if (argv[0] === "canary") {
|
|
221
|
+
const { runCanaryCli } = await import("./canary/index.js");
|
|
222
|
+
process.exitCode = await runCanaryCli(argv.slice(1));
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
218
225
|
if (argv[0] === "eval") {
|
|
219
226
|
const { runEval } = await import("./eval/index.js");
|
|
220
227
|
process.exitCode = await runEval(argv.slice(1));
|
|
@@ -245,6 +252,11 @@ export async function run(argv) {
|
|
|
245
252
|
process.exitCode = await runCourt(argv.slice(1));
|
|
246
253
|
return;
|
|
247
254
|
}
|
|
255
|
+
if (argv[0] === "interview") {
|
|
256
|
+
const { runInterview } = await import("./interview/index.js");
|
|
257
|
+
process.exitCode = await runInterview(argv.slice(1));
|
|
258
|
+
return;
|
|
259
|
+
}
|
|
248
260
|
if (argv[0] === "import") {
|
|
249
261
|
const { runImport } = await import("./import/index.js");
|
|
250
262
|
process.exitCode = await runImport(argv.slice(1));
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,eAAe;AACf,EAAE;AACF,0DAA0D;AAC1D,0EAA0E;AAC1E,EAAE;AACF,4EAA4E;AAC5E,4EAA4E;AAC5E,0EAA0E;AAC1E,+BAA+B;AAE/B,OAAO,EACL,UAAU,EACV,SAAS,EACT,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAErD,MAAM,KAAK,GAAG
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/consolidate/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/consolidate/index.ts"],"names":[],"mappings":"AAwKA,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAkUpE"}
|
|
@@ -125,15 +125,13 @@ const VALID_MODES = new Set(["scan", "birth", "revision", "both"]);
|
|
|
125
125
|
function constructLlm(transport) {
|
|
126
126
|
const keyVar = transport === "openrouter" ? "OPENROUTER_API_KEY" : "ANTHROPIC_API_KEY";
|
|
127
127
|
if (!process.env[keyVar]) {
|
|
128
|
-
return
|
|
128
|
+
return err(new Error(`${keyVar} env var is required (transport: ${transport})`));
|
|
129
129
|
}
|
|
130
130
|
try {
|
|
131
|
-
return
|
|
132
|
-
llm: transport === "openrouter" ? createOpenRouterClient() : createAnthropicClient(),
|
|
133
|
-
};
|
|
131
|
+
return ok(transport === "openrouter" ? createOpenRouterClient() : createAnthropicClient());
|
|
134
132
|
}
|
|
135
133
|
catch (e) {
|
|
136
|
-
return
|
|
134
|
+
return err(e instanceof Error ? e : new Error(String(e)));
|
|
137
135
|
}
|
|
138
136
|
}
|
|
139
137
|
export async function runConsolidate(argv) {
|
|
@@ -277,7 +275,7 @@ export async function runConsolidate(argv) {
|
|
|
277
275
|
// --- Stage 2: Component A dispatch ---------------------------------------
|
|
278
276
|
const stage2 = emptyStage2();
|
|
279
277
|
if (mode !== "scan") {
|
|
280
|
-
const cfg =
|
|
278
|
+
const cfg = loadConfig(vaultRoot);
|
|
281
279
|
if (!cfg.ok) {
|
|
282
280
|
process.stderr.write(`consolidate: ${cfg.error.message}\n`);
|
|
283
281
|
return 2;
|
|
@@ -294,13 +292,13 @@ export async function runConsolidate(argv) {
|
|
|
294
292
|
return 2;
|
|
295
293
|
}
|
|
296
294
|
const llmRes = constructLlm(transport);
|
|
297
|
-
if (
|
|
298
|
-
process.stderr.write(`consolidate: ${llmRes.error}\n`);
|
|
295
|
+
if (!llmRes.ok) {
|
|
296
|
+
process.stderr.write(`consolidate: ${llmRes.error.message}\n`);
|
|
299
297
|
return 2;
|
|
300
298
|
}
|
|
301
299
|
// Cap total Stage-2 LLM spend when --max-llm-calls is given (a real spend
|
|
302
300
|
// bound; --budget only caps queue items). Undefined leaves calls unlimited.
|
|
303
|
-
const llm = maxLlmCalls.value !== null ? withCallBudget(llmRes.
|
|
301
|
+
const llm = maxLlmCalls.value !== null ? withCallBudget(llmRes.value, maxLlmCalls.value) : llmRes.value;
|
|
304
302
|
stage2.shadowMode = cfg.value.shadowMode;
|
|
305
303
|
const observe = makeObserve({
|
|
306
304
|
vaultRoot,
|
|
@@ -579,11 +577,11 @@ async function runDecorrelationReportCli(argv) {
|
|
|
579
577
|
return 2;
|
|
580
578
|
}
|
|
581
579
|
const llmRes = constructLlm(transportRes.value);
|
|
582
|
-
if (
|
|
583
|
-
process.stderr.write(`consolidate: ${llmRes.error}\n`);
|
|
580
|
+
if (!llmRes.ok) {
|
|
581
|
+
process.stderr.write(`consolidate: ${llmRes.error.message}\n`);
|
|
584
582
|
return 2;
|
|
585
583
|
}
|
|
586
|
-
const llm = llmRes.
|
|
584
|
+
const llm = llmRes.value;
|
|
587
585
|
const model = flag(argv, "model") ??
|
|
588
586
|
(transportRes.value === "openrouter"
|
|
589
587
|
? CONSOLIDATE_DEFAULT_MODEL_OPENROUTER
|