@okfit/engine 0.4.1 → 0.6.0

package/index.d.ts

@@ -4,6 +4,7 @@ import { AppDirs, Xdg } from "@effected/xdg";
 import { ConfigReadError } from "@effected/config-file";
 import { GeneratedAtError, GitHistory, GitHistoryError, Layout, Profile, ProfileDiagnostic } from "@okfit/profiles";
 import { FrontmatterWriteError, MarkdownParseError } from "@effected/markdown";
+import { HostedSchema } from "@effected/schemastore";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { Git, GitCommandError, UnknownRefError } from "@effected/git";
 //#region src/config/anchor.d.ts
@@ -353,8 +354,17 @@ export declare const runGraph: (options: GraphRunOptions) => Effect.Effect<Graph
 //#region src/init/scaffold.d.ts
 /** `.config/okfit.toml`, relative to the project root (C-10). @public */
 export declare const CONFIG_RELATIVE_PATH = ".config/okfit.toml";
+/**
+ * Where the published `config` JSON Schema document lives and which version
+ * is current — the one identity `schemastore.config.ts` and `okfit init`'s
+ * `#:schema` directive both derive from, so the URL a fresh config points at
+ * and the one the generated document declares can never disagree (C-18).
+ *
+ * @public
+ */
+export declare const okfitConfigSchemaHost: HostedSchema;
 /** C-22's directive, plus the blank line Tombi requires. @public */
-export declare const SCHEMA_DIRECTIVE = "#:schema https://raw.githubusercontent.com/spencerbeggs/okfit/main/schemas/config/okfit-1.0.0.json\n\n";
+export declare const SCHEMA_DIRECTIVE: string;
 /** @public */
 interface ScaffoldOptions {
   /** Absolute. */

package/index.js

@@ -4,7 +4,7 @@ import { buildConfigLayer, provideConfig } from "./config/layer.js";
 import { DEFAULT_PROFILE_NAME, resolveProjectConfig } from "./config/resolve.js";
 import { runContext } from "./context/run.js";
 import { runGraph } from "./graph/run.js";
-import { CONFIG_RELATIVE_PATH, SCHEMA_DIRECTIVE, configValue, files, targetPaths } from "./init/scaffold.js";
+import { CONFIG_RELATIVE_PATH, SCHEMA_DIRECTIVE, configValue, files, okfitConfigSchemaHost, targetPaths } from "./init/scaffold.js";
 import { OkfitPlatform } from "./platform.js";
 import { ContextEnvelope, ContextField, ContextFieldValue, ContextTag, ContextType, contextEnvelope } from "./render/context.js";
 import { forDiagnostics, tally } from "./render/exit.js";
@@ -19,4 +19,4 @@ import { runStale } from "./stale/run.js";
 import { Now, run } from "./validate/run.js";
 import { runVerify } from "./verify/run.js";
 
-export { CONFIG_RELATIVE_PATH, ConfigMalformedError, ConfigPathNotFoundError, ContextEnvelope, ContextField, ContextFieldValue, ContextTag, ContextType, DEFAULT_PROFILE_NAME, GraphEdgeEnvelope, GraphEnvelope, GraphNodeEnvelope, GraphSummary, InitOverwriteError, JsonDiagnostic, JsonEnvelope, JsonErrorEnvelope, JsonSummary, Now, OkfitPlatform, SCHEMA_DIRECTIVE, SkipReason, StaleEnvelope, StaleItem, StaleSummary, SyncEnvelope, SyncModeEnvelope, VerifyConceptNotFoundError, VerifyEnvelope, VerifyUnsupportedFrontmatterError, buildConfigLayer, collect, configValue, contextEnvelope, files, forDiagnostics, graphEnvelope, json, jsonError, provideConfig, resolveBundleRoot, resolveProjectConfig, resolveProjectRoot, run, runContext, runGraph, runStale, runSync, runVerify, sort, staleEnvelope, syncEnvelope, tally, targetPaths, verifyEnvelope };
+export { CONFIG_RELATIVE_PATH, ConfigMalformedError, ConfigPathNotFoundError, ContextEnvelope, ContextField, ContextFieldValue, ContextTag, ContextType, DEFAULT_PROFILE_NAME, GraphEdgeEnvelope, GraphEnvelope, GraphNodeEnvelope, GraphSummary, InitOverwriteError, JsonDiagnostic, JsonEnvelope, JsonErrorEnvelope, JsonSummary, Now, OkfitPlatform, SCHEMA_DIRECTIVE, SkipReason, StaleEnvelope, StaleItem, StaleSummary, SyncEnvelope, SyncModeEnvelope, VerifyConceptNotFoundError, VerifyEnvelope, VerifyUnsupportedFrontmatterError, buildConfigLayer, collect, configValue, contextEnvelope, files, forDiagnostics, graphEnvelope, json, jsonError, okfitConfigSchemaHost, provideConfig, resolveBundleRoot, resolveProjectConfig, resolveProjectRoot, run, runContext, runGraph, runStale, runSync, runVerify, sort, staleEnvelope, syncEnvelope, tally, targetPaths, verifyEnvelope };

package/init/scaffold.js

@@ -1,6 +1,7 @@
 import { Concept, ConceptId, Derive, LoadedConcept, OKF_SPEC_VERSION } from "@okfit/core";
 import { Effect, Option, Schema } from "effect";
 import { MarkdownDocument, MarkdownFrontmatter, MarkdownParseOptions, YamlFrontmatter } from "@effected/markdown";
+import { HostedSchema } from "@effected/schemastore";
 
 //#region src/init/scaffold.ts
 /** `.config/okfit.toml`, relative to the project root (C-10). @public */
@@ -21,8 +22,23 @@ const PROJECT_CONFIG_NAMES = [
 	"okfit.toml",
 	".config/okfit.toml"
 ];
+/**
+* Where the published `config` JSON Schema document lives and which version
+* is current — the one identity `schemastore.config.ts` and `okfit init`'s
+* `#:schema` directive both derive from, so the URL a fresh config points at
+* and the one the generated document declares can never disagree (C-18).
+*
+* @public
+*/
+const okfitConfigSchemaHost = HostedSchema.github({
+	repo: "spencerbeggs/okfit",
+	path: "schemas",
+	name: "config",
+	versions: ["1.0"],
+	appendVersion: false
+});
 /** C-22's directive, plus the blank line Tombi requires. @public */
-const SCHEMA_DIRECTIVE = "#:schema https://raw.githubusercontent.com/spencerbeggs/okfit/main/schemas/config/okfit-1.0.0.json\n\n";
+const SCHEMA_DIRECTIVE = `#:schema ${okfitConfigSchemaHost.$id}\n\n`;
 /**
 * K-23: the THIN override only — never the merged config. `bundle.path` is
 * the bundle root relative to the project root; `extensions: {}` satisfies
@@ -171,4 +187,4 @@ const files = (options) => Effect.gen(function* () {
 });
 
 //#endregion
-export { CONFIG_RELATIVE_PATH, PROJECT_CONFIG_NAMES, SCHEMA_DIRECTIVE, configValue, files, targetPaths };
+export { CONFIG_RELATIVE_PATH, PROJECT_CONFIG_NAMES, SCHEMA_DIRECTIVE, configValue, files, okfitConfigSchemaHost, targetPaths };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@okfit/engine",
-	"version": "0.4.1",
+	"version": "0.6.0",
 	"private": false,
 	"description": "The okfit engine: platform layer, config discovery, and the validate, verify, sync, init and context programs shared by the okfit CLI and MCP server.",
 	"keywords": [
@@ -35,19 +35,20 @@
 	},
 	"dependencies": {
 		"@effect/platform-node": "4.0.0-rc.115",
-		"@effected/app": "^0.16.1",
-		"@effected/config-file": "^0.9.0",
+		"@effected/app": "^0.16.2",
+		"@effected/config-file": "^0.10.0",
 		"@effected/git": "^0.15.1",
 		"@effected/glob": "^0.6.0",
 		"@effected/jsonc": "^0.11.0",
 		"@effected/markdown": "^0.10.0",
+		"@effected/schemastore": "^0.12.0",
 		"@effected/store": "^0.8.0",
 		"@effected/toml": "^0.7.0",
 		"@effected/walker": "^0.9.0",
-		"@effected/xdg": "^0.5.1",
+		"@effected/xdg": "^0.5.2",
 		"@effected/yaml": "^0.15.1",
-		"@okfit/core": "0.4.1",
-		"@okfit/profiles": "0.6.0",
+		"@okfit/core": "0.6.0",
+		"@okfit/profiles": "0.7.1",
 		"effect": "4.0.0-rc.115"
 	},
 	"engines": {

package/validate/resources.js

@@ -0,0 +1,73 @@
+import { Diagnostic, OkfitConfig } from "@okfit/core";
+import { Effect, FileSystem, Path } from "effect";
+
+//#region src/validate/resources.ts
+/** A `resource`/`sources[].resource` value that names a URL, not a bundle-relative path (D-24). */
+const SCHEME_RE = /^[a-zA-Z][a-zA-Z0-9+.-]*:/;
+/** Glob metacharacters that mark a value as a descriptor pattern, not a literal path. */
+const GLOB_RE = /[*?[{]/;
+/**
+* True when `value` is a descriptor (a URL, a scope description, or a glob
+* pattern) rather than a literal bundle-relative path — D-24 leaves
+* `Source.resource` untyped for exactly this reason: "a URL, a bundle path or
+* a scope descriptor; never resolved here". Anything with a URL scheme
+* (`https:`, `git:`, …) or a bare `://`, anything containing whitespace (a
+* prose description like "the git history"), and anything containing a glob
+* metacharacter (`src/**`) is a descriptor and is skipped, never resolved
+* against the filesystem.
+*/
+const isDescriptor = (value) => SCHEME_RE.test(value) || value.includes("://") || /\s/.test(value) || GLOB_RE.test(value);
+/** Strips a trailing `#fragment` or `?query` suffix before filesystem resolution. */
+const stripSuffix = (value) => {
+	const at = value.search(/[?#]/);
+	return at === -1 ? value : value.slice(0, at);
+};
+/** Every `resource` value on a concept: the top-level field, then each source's. */
+const resourceValuesOf = (concept) => {
+	const values = [];
+	if (concept.frontmatter.resource !== void 0) values.push(concept.frontmatter.resource);
+	for (const source of concept.frontmatter.sources ?? []) values.push(source.resource);
+	return values;
+};
+/**
+* D-24's `resource`/`sources[].resource` value resolves to nothing in the
+* bundle for every non-descriptor value on every concept (issue #106). A
+* `resource` is a descriptor (a URL, a scope description, or a glob
+* pattern) or a literal path resolved in D-23 order: relative to the
+* concept's own directory, then (for a bare path) relative to the bundle
+* root, or with a leading `/` relative to the bundle root only; only the
+* latter is checked against the filesystem. Total over severity (mirrors
+* `Provenance.lint`'s S-28 posture): returns `[]`, touching neither
+* `FileSystem` nor `Path`, the moment
+* `OkfitConfig.severityFor(config, "source-resource-missing")` is `"off"`.
+*
+* @public
+*/
+const lintResources = (bundle, config) => Effect.gen(function* () {
+	const severity = OkfitConfig.severityFor(config, "source-resource-missing");
+	if (severity === "off") return [];
+	const fs = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const diagnostics = [];
+	for (const [, concept] of bundle.concepts) for (const value of resourceValuesOf(concept)) {
+		if (isDescriptor(value)) continue;
+		const stripped = stripSuffix(value);
+		const candidates = stripped.startsWith("/") ? [path.join(bundle.root, stripped.slice(1))] : [path.resolve(bundle.root, path.dirname(concept.path), stripped), ...stripped.startsWith("./") || stripped.startsWith("../") ? [] : [path.resolve(bundle.root, stripped)]];
+		let exists = false;
+		for (const candidate of candidates) if (yield* fs.exists(candidate)) {
+			exists = true;
+			break;
+		}
+		if (exists) continue;
+		diagnostics.push(Diagnostic.make({
+			file: concept.path,
+			code: "source-resource-missing",
+			severity,
+			message: `Resource "${value}" does not exist relative to ${concept.path}`
+		}));
+	}
+	return diagnostics;
+});
+
+//#endregion
+export { lintResources };

package/validate/run.js

@@ -1,3 +1,4 @@
+import { lintResources } from "./resources.js";
 import { Bundle, OkfitConfig, Validate } from "@okfit/core";
 import { Context, Effect, Option } from "effect";
 import { Provenance } from "@okfit/profiles";
@@ -53,11 +54,16 @@ const run = (options) => Effect.gen(function* () {
 		onSome: (profile) => profile.check(bundle)
 	});
 	const provenance = OkfitConfig.severityFor(options.config, "generated-at-drift") === "off" ? [] : yield* Provenance.lint(bundle, options.config, { skipGitTier: options.skipProvenance === true });
+	const resources = yield* lintResources(bundle, options.config);
 	return {
 		bundle,
 		report: {
 			...report,
-			lint: [...report.lint, ...provenance]
+			lint: [
+				...report.lint,
+				...provenance,
+				...resources
+			]
 		},
 		profileDiagnostics
 	};