oh-my-second-brain 0.11.1 → 0.12.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/.claude-plugin/marketplace.json +2 -2
- package/.claude-plugin/plugin.json +1 -1
- package/.codex-plugin/plugin.json +1 -1
- package/CHANGELOG-assets.md +4 -0
- package/CHANGELOG-cli.md +4 -0
- package/CHANGELOG-kernel.md +4 -0
- package/CHANGELOG-mcp.md +2 -0
- package/CHANGELOG-vendors.md +2 -0
- package/CHANGELOG.md +4 -0
- package/assets/claude/CLAUDE.md +1 -1
- package/assets/codex/AGENTS.md +1 -1
- package/assets/hermes/SOUL.md +1 -1
- package/assets/hermes-manifest.json +1 -1
- package/assets/skills/template/SKILL.md +1 -1
- package/dist/cli/doctor-lint.js +12 -0
- package/dist/cli/doctor-lint.js.map +1 -1
- package/dist/kernel/conventions/note-exclude.js +5 -6
- package/dist/kernel/conventions/note-exclude.js.map +1 -1
- package/dist/kernel/engine/mcp/facade.js +1 -1
- package/dist/kernel/engine/mcp/types.d.ts +2 -2
- package/dist/kernel/engine/retrieval/taxonomy-context.d.ts +1 -1
- package/dist/kernel/engine/retrieval/taxonomy-context.js +2 -2
- package/dist/kernel/link/link.d.ts +2 -2
- package/dist/kernel/link/link.js +3 -3
- package/dist/kernel/search/morning-test-fixtures.js +2 -2
- package/dist/kernel/search/morning-test-fixtures.js.map +1 -1
- package/dist/kernel/templates/doctor.js +13 -9
- package/dist/kernel/templates/doctor.js.map +1 -1
- package/dist/kernel/templates/migration.js +48 -23
- package/dist/kernel/templates/migration.js.map +1 -1
- package/dist/kernel/templates/paths.js +1 -1
- package/dist/kernel/templates/resolver.js +18 -13
- package/dist/kernel/templates/resolver.js.map +1 -1
- package/dist/kernel/templates/transaction.js +1 -1
- package/dist/kernel/templates/types.d.ts +2 -2
- package/dist/mcp/server.js +3 -3
- package/dist/vendors/claude/hook/pre-tool-use.d.ts +1 -1
- package/dist/vendors/claude/hook/pre-tool-use.js +5 -6
- package/dist/vendors/claude/hook/pre-tool-use.js.map +1 -1
- package/docs/architecture.md +2 -2
- package/docs/conventions.md +1 -1
- package/package.json +1 -1
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
{
|
|
11
11
|
"name": "oms",
|
|
12
12
|
"description": "Oh My Second Brain convention layer for Obsidian vaults — capture, retrieve, and validate knowledge under a declared semantic convention.",
|
|
13
|
-
"version": "0.
|
|
13
|
+
"version": "0.12.0",
|
|
14
14
|
"author": {
|
|
15
15
|
"name": "gobeumsu",
|
|
16
16
|
"email": "gobeumsu@gmail.com"
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
]
|
|
38
38
|
}
|
|
39
39
|
],
|
|
40
|
-
"version": "0.
|
|
40
|
+
"version": "0.12.0"
|
|
41
41
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oms",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.12.0",
|
|
4
4
|
"description": "Oh My Second Brain convention layer for Obsidian vaults — Codex native rules, skills, and MCP adapter.",
|
|
5
5
|
"_note": "oms install writes Codex MCP config, installs ~/.codex/rules/oms.md, and installs ~/.codex/skills/oms-*.",
|
|
6
6
|
"skills": "./assets/skills/",
|
package/CHANGELOG-assets.md
CHANGED
|
@@ -4,6 +4,10 @@ Skills, agents, templates, and host guidance changes belong here.
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [0.12.0] - 2026-09-01
|
|
8
|
+
|
|
9
|
+
- **Guidance now identifies `.oms/taxonomy.json` as the user-owned folder/link authority.**
|
|
10
|
+
|
|
7
11
|
## [0.11.1] - 2026-09-01
|
|
8
12
|
|
|
9
13
|
## [0.11.0] - 2026-09-01
|
package/CHANGELOG-cli.md
CHANGED
|
@@ -4,6 +4,10 @@ Changes to the `oms` command surface belong here.
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [0.12.0] - 2026-09-01
|
|
8
|
+
|
|
9
|
+
- **Breaking: `oms doctor` no longer accepts `.oms/taxonomy.yaml`.** It reports one conversion error for a YAML-only vault (or cleanup guidance when both files remain); run `oms setup` and approve the returned digest to publish `.oms/taxonomy.json`.
|
|
10
|
+
|
|
7
11
|
## [0.11.1] - 2026-09-01
|
|
8
12
|
|
|
9
13
|
### Changed
|
package/CHANGELOG-kernel.md
CHANGED
|
@@ -4,6 +4,10 @@ Domain logic changes belong here.
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [0.12.0] - 2026-09-01
|
|
8
|
+
|
|
9
|
+
- **Breaking: template taxonomy authority moved from `.oms/taxonomy.yaml` to `.oms/taxonomy.json`.** Resolution, transaction manifests, signatures, and derived folder ontology read JSON only. Approved setup converts legacy YAML and removes it after publishing the JSON authority; rerun setup and approve its newly returned digest for existing vaults.
|
|
10
|
+
|
|
7
11
|
## [0.11.1] - 2026-09-01
|
|
8
12
|
|
|
9
13
|
### Changed
|
package/CHANGELOG-mcp.md
CHANGED
package/CHANGELOG-vendors.md
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -10,6 +10,10 @@ This aggregate changelog contains changes that span multiple layers.
|
|
|
10
10
|
|
|
11
11
|
## [Unreleased]
|
|
12
12
|
|
|
13
|
+
## [0.12.0] - 2026-09-01
|
|
14
|
+
|
|
15
|
+
- **Breaking: taxonomy authority is JSON-only across setup and validation.** Vaults now publish `.oms/taxonomy.json`; setup converts a legacy YAML taxonomy only after approval, removes it on apply, and requires a newly approved digest because the signed authority path changes.
|
|
16
|
+
|
|
13
17
|
## [0.11.1] - 2026-09-01
|
|
14
18
|
|
|
15
19
|
### Fixed
|
package/assets/claude/CLAUDE.md
CHANGED
|
@@ -5,7 +5,7 @@ This vault is governed by user-owned template conventions in `.oms/`.
|
|
|
5
5
|
Before vault work:
|
|
6
6
|
- Treat actual Obsidian `.md` templates as the note-shape and body source of truth.
|
|
7
7
|
- Treat `.obsidian/types.json` as read-only property-type authority.
|
|
8
|
-
- Read the user-owned ontology from `.oms/template-policy.json` for note/field meaning and policy, and `.oms/taxonomy.
|
|
8
|
+
- Read the user-owned ontology from `.oms/template-policy.json` for note/field meaning and policy, and `.oms/taxonomy.json` for folder/link meaning and placement.
|
|
9
9
|
- Never hand-edit derived `.oms/types.json`; use doctor diagnosis and an approved regeneration.
|
|
10
10
|
- People and agents follow the same stable `templateId` rules.
|
|
11
11
|
|
package/assets/codex/AGENTS.md
CHANGED
|
@@ -8,7 +8,7 @@ The vault is governed by user-owned template conventions in `.oms/`.
|
|
|
8
8
|
|
|
9
9
|
- Actual Obsidian `.md` templates own note shape and body scaffolding.
|
|
10
10
|
- `.obsidian/types.json` is read-only type authority.
|
|
11
|
-
- The user-owned ontology remains active: `.oms/template-policy.json` records note/field meaning and policy; `.oms/taxonomy.
|
|
11
|
+
- The user-owned ontology remains active: `.oms/template-policy.json` records note/field meaning and policy; `.oms/taxonomy.json` records folder/link meaning and placement.
|
|
12
12
|
- `.oms/types.json` is derived; never hand-edit it.
|
|
13
13
|
- Humans and agents use the same stable `templateId` rules.
|
|
14
14
|
|
package/assets/hermes/SOUL.md
CHANGED
|
@@ -5,7 +5,7 @@ This vault uses user-owned template conventions in `.oms/`.
|
|
|
5
5
|
Before vault work:
|
|
6
6
|
- Actual Obsidian `.md` templates own note shape and body scaffolding.
|
|
7
7
|
- `.obsidian/types.json` is read-only type authority.
|
|
8
|
-
- The user-owned ontology remains active: `.oms/template-policy.json` records note/field meaning and policy; `.oms/taxonomy.
|
|
8
|
+
- The user-owned ontology remains active: `.oms/template-policy.json` records note/field meaning and policy; `.oms/taxonomy.json` records folder/link meaning and placement.
|
|
9
9
|
- `.oms/types.json` is derived and must never be hand-edited.
|
|
10
10
|
- Humans and agents use identical stable `templateId` rules.
|
|
11
11
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "oms",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.12.0",
|
|
4
4
|
"description": "Oh My Second Brain convention layer for Obsidian vaults — Hermes skill bundle and MCP adapter.",
|
|
5
5
|
"_note": "oms install writes ~/.hermes/config.yaml mcp_servers.oms and installs skills under ~/.hermes/skills/knowledge-management/oms/."
|
|
6
6
|
}
|
|
@@ -12,7 +12,7 @@ Turn the user's natural-language note design into an actual Obsidian Markdown te
|
|
|
12
12
|
- The actual `.md` template owns frontmatter order/default scaffolding and body shape.
|
|
13
13
|
- `.obsidian/types.json` is read-only property-type authority.
|
|
14
14
|
- The user-owned ontology remains active: `.oms/template-policy.json` owns note/field `intent` plus BaseContract inheritance, requiredness, formats, allowed values, naming, stable identity, and bindings.
|
|
15
|
-
- `.oms/taxonomy.
|
|
15
|
+
- `.oms/taxonomy.json` owns folder/link `intent`, note placement, and global axes.
|
|
16
16
|
- `.oms/types.json` is derived state. Never edit it directly.
|
|
17
17
|
|
|
18
18
|
Use an existing stable `templateId` when updating or moving a template. A path or digest change never creates a new identity. New OMS-managed templates default to `<templateFolder>/<templateId>.md`; registered existing templates keep their explicitly verified `sourcePath`.
|
package/dist/cli/doctor-lint.js
CHANGED
|
@@ -32,6 +32,18 @@ function formatHermesProvenanceStatus(status) {
|
|
|
32
32
|
}
|
|
33
33
|
export async function runDoctor(opts) {
|
|
34
34
|
try {
|
|
35
|
+
const legacyTaxonomy = path.join(opts.vault, ".oms", "taxonomy.yaml");
|
|
36
|
+
if (existsSync(legacyTaxonomy)) {
|
|
37
|
+
const taxonomy = path.join(opts.vault, ".oms", "taxonomy.json");
|
|
38
|
+
const message = existsSync(taxonomy)
|
|
39
|
+
? "legacy .oms/taxonomy.yaml remains after conversion — remove it; .oms/taxonomy.json is authoritative"
|
|
40
|
+
: "legacy .oms/taxonomy.yaml is no longer read — run oms setup to convert to taxonomy.json";
|
|
41
|
+
if (opts.json)
|
|
42
|
+
console.log(JSON.stringify({ vault: opts.vault, status: "needs-repair", diagnostics: [{ code: "LEGACY_TAXONOMY_YAML", path: ".oms/taxonomy.yaml", remediation: message }] }, null, 2));
|
|
43
|
+
else
|
|
44
|
+
console.error(`[oms] ${message}`);
|
|
45
|
+
return 1;
|
|
46
|
+
}
|
|
35
47
|
const diagnosis = await diagnoseTemplates({ vault: opts.vault, source: "explicit", maxPerTemplate: opts.maxPerTemplate });
|
|
36
48
|
const hermesProvenance = await hermesProvenanceStatus();
|
|
37
49
|
if (opts.json) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor-lint.js","sourceRoot":"","sources":["../../src/cli/doctor-lint.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"doctor-lint.js","sourceRoot":"","sources":["../../src/cli/doctor-lint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Vault-declared note exclusions for the scanning walkers.
|
|
3
3
|
*
|
|
4
|
-
* `taxonomy.
|
|
4
|
+
* `taxonomy.json: exclude` names markdown files that are not notes - template
|
|
5
5
|
* sources whose pre-substitution frontmatter is intentionally not valid YAML
|
|
6
6
|
* (Templater tags, agent {{var}} placeholders), build staging, skill files.
|
|
7
7
|
* Every template-derived graph/index walker uses this declaration so excluded
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
*/
|
|
14
14
|
import { readFile, realpath } from "node:fs/promises";
|
|
15
15
|
import path from "node:path";
|
|
16
|
-
import { parse as parseYaml } from "yaml";
|
|
17
16
|
/**
|
|
18
17
|
* Default audit exemptions - build artifacts, self-documenting templates, and
|
|
19
18
|
* skill files that intentionally carry no frontmatter. This is the single
|
|
@@ -73,8 +72,8 @@ async function loadExcludeMatchers(vaultRoot) {
|
|
|
73
72
|
pending = (async () => {
|
|
74
73
|
let declared = [];
|
|
75
74
|
try {
|
|
76
|
-
const raw = await readFile(path.join(key, ".oms", "taxonomy.
|
|
77
|
-
const parsed =
|
|
75
|
+
const raw = await readFile(path.join(key, ".oms", "taxonomy.json"), "utf-8");
|
|
76
|
+
const parsed = JSON.parse(raw);
|
|
78
77
|
const rawExclude = parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)
|
|
79
78
|
? parsed["exclude"]
|
|
80
79
|
: undefined;
|
|
@@ -82,7 +81,7 @@ async function loadExcludeMatchers(vaultRoot) {
|
|
|
82
81
|
declared = rawExclude;
|
|
83
82
|
}
|
|
84
83
|
else if (rawExclude !== undefined) {
|
|
85
|
-
failure("NOTE_EXCLUSION_RESOLUTION_FAILED", ".oms/taxonomy.
|
|
84
|
+
failure("NOTE_EXCLUSION_RESOLUTION_FAILED", ".oms/taxonomy.json: exclude must be a list of strings");
|
|
86
85
|
}
|
|
87
86
|
}
|
|
88
87
|
catch (error) {
|
|
@@ -90,7 +89,7 @@ async function loadExcludeMatchers(vaultRoot) {
|
|
|
90
89
|
declared = [];
|
|
91
90
|
}
|
|
92
91
|
else {
|
|
93
|
-
failure("NOTE_EXCLUSION_RESOLUTION_FAILED", `.oms/taxonomy.
|
|
92
|
+
failure("NOTE_EXCLUSION_RESOLUTION_FAILED", `.oms/taxonomy.json: ${error instanceof Error ? error.message : String(error)}`);
|
|
94
93
|
}
|
|
95
94
|
}
|
|
96
95
|
const externalTemplatePaths = await loadExternalTemplatePaths(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"note-exclude.js","sourceRoot":"","sources":["../../../src/kernel/conventions/note-exclude.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"note-exclude.js","sourceRoot":"","sources":["../../../src/kernel/conventions/note-exclude.ts"],"names":[],"mappings":"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"}
|
|
@@ -810,7 +810,7 @@ export class McpEngineAdapter {
|
|
|
810
810
|
const indexedPaths = typeof store.listDocPaths === "function" ? store.listDocPaths() : [];
|
|
811
811
|
const vault = opts.vault ?? this.vaultPath;
|
|
812
812
|
const projection = await loadTaxonomyIntentProjection(vault, indexedPaths);
|
|
813
|
-
const taxonomyPath = path.join(vault, ".oms", "taxonomy.
|
|
813
|
+
const taxonomyPath = path.join(vault, ".oms", "taxonomy.json");
|
|
814
814
|
const updatedAt = projection.matched.length === 0
|
|
815
815
|
? ""
|
|
816
816
|
: statSync(taxonomyPath).mtime.toISOString();
|
|
@@ -134,7 +134,7 @@ export interface McpSemanticReceipt {
|
|
|
134
134
|
readonly taxonomyIntents: readonly {
|
|
135
135
|
readonly folder: string;
|
|
136
136
|
readonly intent: string;
|
|
137
|
-
readonly source: ".oms/taxonomy.
|
|
137
|
+
readonly source: ".oms/taxonomy.json";
|
|
138
138
|
}[];
|
|
139
139
|
readonly warnings: readonly string[];
|
|
140
140
|
}
|
|
@@ -292,7 +292,7 @@ export interface McpSemanticStoredContext {
|
|
|
292
292
|
readonly pathPrefix: string;
|
|
293
293
|
readonly context: string;
|
|
294
294
|
readonly updatedAt: string;
|
|
295
|
-
readonly source: ".oms/taxonomy.
|
|
295
|
+
readonly source: ".oms/taxonomy.json";
|
|
296
296
|
}
|
|
297
297
|
/** Output of oms_semantic_contexts (mirrors SemanticContextResult). */
|
|
298
298
|
export type McpSemanticContextResult = {
|
|
@@ -2,7 +2,7 @@ export interface TaxonomyIntentProvenance {
|
|
|
2
2
|
readonly folder: string;
|
|
3
3
|
readonly intent: string;
|
|
4
4
|
/** The sole source allowed to contribute prompt text. */
|
|
5
|
-
readonly source: ".oms/taxonomy.
|
|
5
|
+
readonly source: ".oms/taxonomy.json";
|
|
6
6
|
}
|
|
7
7
|
export interface TaxonomyIntentProjection {
|
|
8
8
|
readonly matched: readonly TaxonomyIntentProvenance[];
|
|
@@ -36,7 +36,7 @@ export function projectTaxonomyIntents(intents, indexedPaths, collectionPath) {
|
|
|
36
36
|
const intent = intents.get(folder)?.trim();
|
|
37
37
|
return intent === undefined || intent === ""
|
|
38
38
|
? []
|
|
39
|
-
: [{ folder, intent, source: ".oms/taxonomy.
|
|
39
|
+
: [{ folder, intent, source: ".oms/taxonomy.json" }];
|
|
40
40
|
})
|
|
41
41
|
.sort((left, right) => compareText(left.folder, right.folder));
|
|
42
42
|
const indexedWithoutIntent = [...indexed]
|
|
@@ -48,7 +48,7 @@ export function projectTaxonomyIntents(intents, indexedPaths, collectionPath) {
|
|
|
48
48
|
.filter((folder) => !indexed.has(folder))
|
|
49
49
|
.sort(compareText);
|
|
50
50
|
const warnings = [
|
|
51
|
-
...indexedWithoutIntent.map((folder) => `Indexed folder "${folder}" has no intent in .oms/taxonomy.
|
|
51
|
+
...indexedWithoutIntent.map((folder) => `Indexed folder "${folder}" has no intent in .oms/taxonomy.json.`),
|
|
52
52
|
...taxonomyWithoutIndexed.map((folder) => `Taxonomy folder "${folder}" has no indexed Markdown files.`),
|
|
53
53
|
];
|
|
54
54
|
return {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Two distinct `.oms/` profiles exist, distinguished by content:
|
|
5
5
|
*
|
|
6
6
|
* - Vault `.oms/` — template-first controls: `template-policy.json`,
|
|
7
|
-
* `taxonomy.
|
|
7
|
+
* `taxonomy.json`, and derived `types.json`.
|
|
8
8
|
* Written by `oms setup`. Owned by the user's Obsidian vault.
|
|
9
9
|
* - Bridge `.oms/` — a link into a vault from some *other* repo (e.g. a GitHub
|
|
10
10
|
* project). Holds NO convention yaml; only `links.yaml`
|
|
@@ -78,7 +78,7 @@ export declare function writeLinkRecord(omsDir: string, record: LinkRecord): Pro
|
|
|
78
78
|
*
|
|
79
79
|
* Precedence (content-based, so the two `.oms/` profiles never collide):
|
|
80
80
|
* 1. Local template convention (`.oms/template-policy.json` or
|
|
81
|
-
* `.oms/taxonomy.
|
|
81
|
+
* `.oms/taxonomy.json`) → vault.
|
|
82
82
|
* 2. Local bridge (`.oms/links.yaml`) → bridge.
|
|
83
83
|
* 3. `OMS_VAULT` environment variable → env.
|
|
84
84
|
* 4. Fallback to `startDir` → cwd.
|
package/dist/kernel/link/link.js
CHANGED
|
@@ -8,7 +8,7 @@ import { parse as yamlParse, stringify as yamlStringify } from "yaml";
|
|
|
8
8
|
* Two distinct `.oms/` profiles exist, distinguished by content:
|
|
9
9
|
*
|
|
10
10
|
* - Vault `.oms/` — template-first controls: `template-policy.json`,
|
|
11
|
-
* `taxonomy.
|
|
11
|
+
* `taxonomy.json`, and derived `types.json`.
|
|
12
12
|
* Written by `oms setup`. Owned by the user's Obsidian vault.
|
|
13
13
|
* - Bridge `.oms/` — a link into a vault from some *other* repo (e.g. a GitHub
|
|
14
14
|
* project). Holds NO convention yaml; only `links.yaml`
|
|
@@ -114,7 +114,7 @@ export async function writeLinkRecord(omsDir, record) {
|
|
|
114
114
|
*
|
|
115
115
|
* Precedence (content-based, so the two `.oms/` profiles never collide):
|
|
116
116
|
* 1. Local template convention (`.oms/template-policy.json` or
|
|
117
|
-
* `.oms/taxonomy.
|
|
117
|
+
* `.oms/taxonomy.json`) → vault.
|
|
118
118
|
* 2. Local bridge (`.oms/links.yaml`) → bridge.
|
|
119
119
|
* 3. `OMS_VAULT` environment variable → env.
|
|
120
120
|
* 4. Fallback to `startDir` → cwd.
|
|
@@ -122,7 +122,7 @@ export async function writeLinkRecord(omsDir, record) {
|
|
|
122
122
|
export async function resolveEffectiveVault(startDir, env = process.env) {
|
|
123
123
|
const omsDir = path.join(startDir, ".oms");
|
|
124
124
|
const policyKind = await pathKind(path.join(omsDir, "template-policy.json"));
|
|
125
|
-
const taxonomyKind = await pathKind(path.join(omsDir, "taxonomy.
|
|
125
|
+
const taxonomyKind = await pathKind(path.join(omsDir, "taxonomy.json"));
|
|
126
126
|
if (policyKind === "file" || taxonomyKind === "file") {
|
|
127
127
|
return { vault: path.resolve(startDir), scope: null, source: "vault" };
|
|
128
128
|
}
|
|
@@ -9,14 +9,14 @@ export async function writeMorningVaultFixture() {
|
|
|
9
9
|
for (const directory of [".oms", ".obsidian", "Templates/OMS", "references"])
|
|
10
10
|
await mkdir(path.join(vault, directory), { recursive: true });
|
|
11
11
|
const policy = JSON.stringify({ version: 1, templateFolder: "Templates/OMS", base: { fields: {} }, contracts: { reference: { intent: "reference", fields: { template: { type: "text", required: true }, title: { type: "text", required: true }, "source-url": { type: "text" }, tags: { type: "list" } }, views: [] } }, templates: { reference: { templateId: "reference", destinationClass: "managed-default", sourcePath: "Templates/OMS/reference.md", contract: "reference", naming: "{{slug}}.md" } } });
|
|
12
|
-
const taxonomy =
|
|
12
|
+
const taxonomy = JSON.stringify({ folders: {} });
|
|
13
13
|
const obsidianTypes = JSON.stringify({ types: { template: "text", title: "text", "source-url": "text", tags: "list" } });
|
|
14
14
|
const template = "---\ntemplate: reference\ntitle: Untitled\nsource-url:\ntags: []\n---\n<!-- oms:content -->\n";
|
|
15
15
|
const sources = [{ logicalId: "template-policy", signature: digest(policy) }, { logicalId: "taxonomy", signature: digest(taxonomy) }, { logicalId: "obsidian-types", signature: digest(obsidianTypes) }, { path: "Templates/OMS/reference.md", signature: digest(template) }];
|
|
16
16
|
const projection = JSON.stringify({ version: "oms.types.v1", generatedFrom: { algorithm: "sha256-lp-v1", inputSignature: sourceSignature(sources), sources }, managed: { base: { fields: {} }, globalAxes: {}, templates: { reference: { templateId: "reference", destinationClass: "managed-default", sourcePath: "Templates/OMS/reference.md", targetFolder: "Inbox", keyOrder: ["template", "title", "source-url", "tags"], fields: { template: { type: "text", required: true }, title: { type: "text", required: true }, "source-url": { type: "text" }, tags: { type: "list" } }, views: [], naming: "{{slug}}.md", bodySignature: digest("<!-- oms:content -->\n") } } } });
|
|
17
17
|
await Promise.all([
|
|
18
18
|
writeFile(path.join(vault, ".oms/template-policy.json"), policy),
|
|
19
|
-
writeFile(path.join(vault, ".oms/taxonomy.
|
|
19
|
+
writeFile(path.join(vault, ".oms/taxonomy.json"), taxonomy),
|
|
20
20
|
writeFile(path.join(vault, ".oms/types.json"), projection),
|
|
21
21
|
writeFile(path.join(vault, ".obsidian/types.json"), obsidianTypes),
|
|
22
22
|
writeFile(path.join(vault, "Templates/OMS/reference.md"), template),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"morning-test-fixtures.js","sourceRoot":"","sources":["../../../src/kernel/search/morning-test-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,MAAM,GAAG,CAAC,KAAa,EAAsB,EAAE,CAAC,UAAU,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;AAEnH,MAAM,CAAC,KAAK,UAAU,wBAAwB;IAC5C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IACjE,KAAK,MAAM,SAAS,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC;QAAE,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5I,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,UAAU,EAAE,4BAA4B,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;IAChf,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"morning-test-fixtures.js","sourceRoot":"","sources":["../../../src/kernel/search/morning-test-fixtures.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { readFile } from "node:fs/promises";
|
|
3
3
|
import { join, resolve } from "node:path";
|
|
4
|
-
import { parseDocument } from "yaml";
|
|
5
4
|
import { admitWriteTarget } from "../capture/safe.js";
|
|
6
5
|
import { approvalDigest, inputDigest, outputDigest } from "./canonical.js";
|
|
7
6
|
import { parseNote } from "../conventions/frontmatter.js";
|
|
@@ -104,7 +103,7 @@ export async function regenerateTypes(input) {
|
|
|
104
103
|
return rejected("TEMPLATE_POLICY_INVALID", "restore .oms/template-policy.json before regenerating types");
|
|
105
104
|
}
|
|
106
105
|
try {
|
|
107
|
-
const controls = await Promise.all([state(root, ".oms/template-policy.json"), state(root, ".oms/taxonomy.
|
|
106
|
+
const controls = await Promise.all([state(root, ".oms/template-policy.json"), state(root, ".oms/taxonomy.json"), state(root, ".oms/types.json"), state(root, ".obsidian/types.json")]);
|
|
108
107
|
if (controls[0]?.state === "absent" || controls[1]?.state === "absent" || controls[3]?.state === "absent")
|
|
109
108
|
return rejected("TEMPLATE_CONTROL_MISSING", "restore template policy, taxonomy, and Obsidian types before regenerating types");
|
|
110
109
|
const sources = await Promise.all(Object.values(policy.templates).map(async (binding) => {
|
|
@@ -113,7 +112,7 @@ export async function regenerateTypes(input) {
|
|
|
113
112
|
}));
|
|
114
113
|
const authority = [
|
|
115
114
|
{ kind: "policy", logicalId: "template-policy", vaultRelativePath: ".oms/template-policy.json", contentDigest: controls[0].signature },
|
|
116
|
-
{ kind: "taxonomy", logicalId: "taxonomy", vaultRelativePath: ".oms/taxonomy.
|
|
115
|
+
{ kind: "taxonomy", logicalId: "taxonomy", vaultRelativePath: ".oms/taxonomy.json", contentDigest: controls[1].signature },
|
|
117
116
|
{ kind: "obsidian-types", logicalId: "obsidian-types", vaultRelativePath: ".obsidian/types.json", contentDigest: controls[3].signature },
|
|
118
117
|
];
|
|
119
118
|
for (const source of sources) {
|
|
@@ -140,9 +139,14 @@ function legacyTemplateId(policy, raw, taxonomyRaw, notePath) {
|
|
|
140
139
|
const concept = parsed.frontmatter["concept"];
|
|
141
140
|
if (typeof concept !== "string")
|
|
142
141
|
return null;
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
142
|
+
let root;
|
|
143
|
+
try {
|
|
144
|
+
root = JSON.parse(taxonomyRaw);
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
return null;
|
|
148
|
+
}
|
|
149
|
+
if (typeof root !== "object" || root === null || Array.isArray(root))
|
|
146
150
|
return null;
|
|
147
151
|
const folders = root["folders"];
|
|
148
152
|
if (typeof folders !== "object" || folders === null || Array.isArray(folders))
|
|
@@ -164,13 +168,13 @@ function legacyTemplateId(policy, raw, taxonomyRaw, notePath) {
|
|
|
164
168
|
return line.test(parsed.frontmatterRaw) ? matches[0].templateId : null;
|
|
165
169
|
}
|
|
166
170
|
async function noteManifest(root, notePath, before, after, templateId) {
|
|
167
|
-
const controlPaths = [".oms/template-policy.json", ".oms/taxonomy.
|
|
171
|
+
const controlPaths = [".oms/template-policy.json", ".oms/taxonomy.json", ".oms/types.json"];
|
|
168
172
|
const values = await Promise.all(controlPaths.map(path => state(root, path)));
|
|
169
173
|
if (values.some(value => value.state === "absent"))
|
|
170
174
|
throw new Error("TEMPLATE_CONTROL_MISSING");
|
|
171
175
|
const controls = controlPaths.map((path, index) => {
|
|
172
176
|
const value = values[index];
|
|
173
|
-
return { kind: path === ".oms/template-policy.json" ? "policy" : path === ".oms/taxonomy.
|
|
177
|
+
return { kind: path === ".oms/template-policy.json" ? "policy" : path === ".oms/taxonomy.json" ? "taxonomy" : "projection", path, expectedCurrent: expectation(value), current: value, proposed: value, action: "verify-only" };
|
|
174
178
|
});
|
|
175
179
|
const authority = { version: 2, authority: [{ kind: "template", logicalId: templateId, vaultRelativePath: notePath, contentDigest: digest(after) }], placement: [] };
|
|
176
180
|
const transition = { templateId, path: notePath, expectedCurrent: expectation(before), current: before, proposed: { state: "present", bytes: after, signature: digest(after) }, action: "write" };
|
|
@@ -197,7 +201,7 @@ export async function backfillDefaults(input) {
|
|
|
197
201
|
return rejected("TEMPLATE_SOURCE_UNSAFE", "provide one existing regular markdown note path inside the verified vault");
|
|
198
202
|
}
|
|
199
203
|
try {
|
|
200
|
-
const [before, policyRaw, taxonomyRaw] = await Promise.all([state(root, path), readFile(join(root, ".oms/template-policy.json"), "utf8"), readFile(join(root, ".oms/taxonomy.
|
|
204
|
+
const [before, policyRaw, taxonomyRaw] = await Promise.all([state(root, path), readFile(join(root, ".oms/template-policy.json"), "utf8"), readFile(join(root, ".oms/taxonomy.json"), "utf8")]);
|
|
201
205
|
if (before.state === "absent")
|
|
202
206
|
return rejected("TEMPLATE_SOURCE_INVALID", "provide one existing note path");
|
|
203
207
|
const policy = parseTemplatePolicy(policyRaw);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/kernel/templates/doctor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/kernel/templates/doctor.ts"],"names":[],"mappings":"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"}
|