@okfit/mcp 0.6.4 → 0.6.6

package/index.d.ts

@@ -1,8 +1,7 @@
 import { Remediation } from "@effected/engine";
 import { FileSystem, Layer, Path, Schema, Stdio } from "effect";
 import { AppDirs, Xdg } from "@effected/xdg";
-import { LoadedConcept } from "@okfit/core";
-import { Distribution } from "@okfit/engine";
+import { ConceptSummary, Distribution, toConceptSummary } from "@okfit/engine";
 import { ChildProcessSpawner } from "effect/process";
 import { Toolkit } from "effect/ai";
 //#region src/errors.d.ts
@@ -144,22 +143,6 @@ export declare const ConceptResources: (projectRoot: string) => Layer.Layer<neve
  */
 export declare const IndexResource: (projectRoot: string) => import("effect/Layer").Layer<never, never, import("@effected/xdg").AppDirs | FileSystem.FileSystem | Path.Path | import("@effected/xdg").Xdg>;
 //#endregion
-//#region src/schema/ConceptSummary.d.ts
-/** The seven-field shape every list-like tool result carries (N-16). @public */
-export declare const ConceptSummary: Schema.Struct<{
-  readonly id: Schema.String;
-  readonly type: Schema.String;
-  readonly title: Schema.String;
-  readonly description: Schema.NullOr<Schema.String>;
-  readonly status: Schema.Literals<readonly ["draft", "stable", "deprecated"]>;
-  readonly tags: Schema.$Array<Schema.String>;
-  readonly path: Schema.String;
-}>;
-/** @public */
-export type ConceptSummary = typeof ConceptSummary.Type;
-/** Project one loaded concept into its summary. @public */
-export declare const toConceptSummary: (concept: LoadedConcept) => ConceptSummary;
-//#endregion
 //#region src/schema/tools.d.ts
 /** `describe_vocabulary`'s result (§5.2). @public */
 export declare const DescribeVocabularySuccess: Schema.Struct<{
@@ -789,5 +772,5 @@ export declare const ToolsLayer: (projectRoot: string, distribution?: Distributi
  */
 export declare const MCP_VERSION: string;
 //#endregion
-export { type PlatformServices, Remediation, type ServerOptions };
+export { ConceptSummary, type PlatformServices, Remediation, type ServerOptions, toConceptSummary };
 //# sourceMappingURL=index.d.ts.map

package/internal/conceptNotFound.js

@@ -0,0 +1,39 @@
+import { ConceptNotFound, InvalidArgument } from "../errors.js";
+import { ToolFailure } from "@effected/mcp";
+import { Effect } from "effect";
+
+//#region src/internal/conceptNotFound.ts
+/**
+* Maps the engine's `QueryConceptNotFoundError` to the tool-facing failure
+* `get_concept` and `concept_neighbors` share: `InvalidArgument` for an empty
+* id, `ConceptNotFound` otherwise. `message` is composed through
+* `ToolFailure.message` at construction, since a declared typed failure under
+* `failureMode: "error"` reaches the wire as `error.message` alone.
+*
+* @internal
+*/
+const toConceptLookupFailure = (id, error) => {
+	if (error.reason === "empty-id") {
+		const remediation = {
+			hint: "Pass a bundle-relative concept id such as decisions/cli-exit-codes.",
+			suggestedTool: "list_concepts"
+		};
+		return Effect.fail(new InvalidArgument({
+			argument: "id",
+			message: ToolFailure.message("id must not be empty", remediation),
+			remediation
+		}));
+	}
+	const remediation = {
+		hint: "Call list_concepts to see the ids this bundle contains.",
+		suggestedTool: "list_concepts"
+	};
+	return Effect.fail(new ConceptNotFound({
+		id,
+		message: ToolFailure.message(`no concept "${ToolFailure.truncate(id)}" in this bundle`, remediation),
+		remediation
+	}));
+};
+
+//#endregion
+export { toConceptLookupFailure };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@okfit/mcp",
-	"version": "0.6.4",
+	"version": "0.6.6",
 	"private": false,
 	"description": "Model Context Protocol server for okfit: query and understand Open Knowledge Format (OKF) bundles from an agent.",
 	"keywords": [
@@ -54,11 +54,11 @@
 		"@effected/mcp": "^0.3.0",
 		"@effected/schemastore": "^0.17.0",
 		"@effected/toml": "^0.10.0",
-		"@effected/walker": "^0.14.0",
-		"@effected/xdg": "^0.8.1",
+		"@effected/walker": "^0.14.1",
+		"@effected/xdg": "^0.8.2",
 		"@effected/yaml": "^0.18.0",
 		"@okfit/core": "0.8.3",
-		"@okfit/engine": "0.9.3",
+		"@okfit/engine": "0.10.0",
 		"@okfit/profiles": "0.8.2",
 		"effect": "4.0.0-rc.118"
 	},

package/schema/ConceptSummary.js

@@ -1,27 +1,3 @@
-import { Schema } from "effect";
-import { Derive, Status } from "@okfit/core";
+import { ConceptSummary, toConceptSummary } from "@okfit/engine";
 
-//#region src/schema/ConceptSummary.ts
-/** The seven-field shape every list-like tool result carries (N-16). @public */
-const ConceptSummary = Schema.Struct({
-	id: Schema.String,
-	type: Schema.String,
-	title: Schema.String,
-	description: Schema.NullOr(Schema.String),
-	status: Status,
-	tags: Schema.Array(Schema.String),
-	path: Schema.String
-});
-/** Project one loaded concept into its summary. @public */
-const toConceptSummary = (concept) => ({
-	id: concept.id,
-	type: concept.frontmatter.type,
-	title: Derive.title(concept),
-	description: concept.frontmatter.description ?? null,
-	status: Derive.status(concept.frontmatter),
-	tags: [...concept.frontmatter.tags ?? []],
-	path: concept.path
-});
-
-//#endregion
 export { ConceptSummary, toConceptSummary };

package/tools/conceptNeighbors.js

@@ -1,11 +1,11 @@
-import { ConceptNotFound, InvalidArgument, McpToolError } from "../errors.js";
+import { McpToolError } from "../errors.js";
 import { loadToolContext } from "../internal/toolContext.js";
 import { toConceptSummary } from "../schema/ConceptSummary.js";
 import { ConceptNeighborsSuccess } from "../schema/tools.js";
-import { ToolFailure } from "@effected/mcp";
-import { Effect, FileSystem, Option, Path, Schema } from "effect";
-import { ConceptId, Graph } from "@okfit/core";
+import { toConceptLookupFailure } from "../internal/conceptNotFound.js";
+import { Effect, FileSystem, Path, Schema } from "effect";
 import { Tool } from "effect/ai";
+import { ConceptQuery } from "@okfit/engine";
 import { AppDirs, Xdg } from "@effected/xdg";
 
 //#region src/tools/conceptNeighbors.ts
@@ -40,47 +40,15 @@ const conceptNeighbors = Tool.make("concept_neighbors", {
 */
 const handleConceptNeighbors = (projectRoot, params) => Effect.gen(function* () {
 	const ctx = yield* loadToolContext(projectRoot);
-	const normalized = ConceptId.normalize(params.id);
-	if (Option.isNone(normalized)) {
-		const remediation = {
-			hint: "Pass a bundle-relative concept id such as decisions/cli-exit-codes.",
-			suggestedTool: "list_concepts"
-		};
-		return yield* Effect.fail(new InvalidArgument({
-			argument: "id",
-			message: ToolFailure.message("id must not be empty", remediation),
-			remediation
-		}));
-	}
-	const id = normalized.value;
-	if (!ctx.bundle.concepts.has(id)) {
-		const remediation = {
-			hint: "Call list_concepts to see the ids this bundle contains.",
-			suggestedTool: "list_concepts"
-		};
-		return yield* Effect.fail(new ConceptNotFound({
-			id: params.id,
-			message: ToolFailure.message(`no concept "${ToolFailure.truncate(params.id)}" in this bundle`, remediation),
-			remediation
-		}));
-	}
-	const graph = Graph.fromBundle(ctx.bundle);
-	const project = (node) => {
-		if (node.kind !== "concept") return {
-			id: node.id,
-			kind: node.kind,
-			summary: null
-		};
-		const concept = ctx.bundle.concepts.get(node.id);
-		return {
-			id: node.id,
-			kind: node.kind,
-			summary: concept === void 0 ? null : toConceptSummary(concept)
-		};
-	};
+	const result = yield* ConceptQuery.neighbors(ctx.bundle, params.id).pipe(Effect.catchTag("QueryConceptNotFoundError", (e) => toConceptLookupFailure(params.id, e)));
+	const project = (neighbor) => ({
+		id: neighbor.id,
+		kind: neighbor.kind,
+		summary: neighbor.concept === null ? null : toConceptSummary(neighbor.concept)
+	});
 	return {
-		outgoing: graph.successors(id).map(project),
-		incoming: graph.predecessors(id).map(project)
+		outgoing: result.outgoing.map(project),
+		incoming: result.incoming.map(project)
 	};
 });
 

package/tools/getConcept.js

@@ -1,10 +1,11 @@
-import { ConceptNotFound, InvalidArgument, McpToolError } from "../errors.js";
+import { McpToolError } from "../errors.js";
 import { loadToolContext } from "../internal/toolContext.js";
 import { GetConceptSuccess } from "../schema/tools.js";
-import { ToolFailure } from "@effected/mcp";
-import { Effect, FileSystem, Option, Path, Schema } from "effect";
-import { ConceptId, Derive, Graph } from "@okfit/core";
+import { toConceptLookupFailure } from "../internal/conceptNotFound.js";
+import { Effect, FileSystem, Path, Schema } from "effect";
+import { Derive } from "@okfit/core";
 import { Tool } from "effect/ai";
+import { ConceptQuery } from "@okfit/engine";
 import { AppDirs, Xdg } from "@effected/xdg";
 
 //#region src/tools/getConcept.ts
@@ -41,43 +42,9 @@ const getConcept = Tool.make("get_concept", {
 */
 const handleGetConcept = (projectRoot, params) => Effect.gen(function* () {
 	const ctx = yield* loadToolContext(projectRoot);
-	const normalized = ConceptId.normalize(params.id);
-	if (Option.isNone(normalized)) {
-		const remediation = {
-			hint: "Pass a bundle-relative concept id such as decisions/cli-exit-codes.",
-			suggestedTool: "list_concepts"
-		};
-		return yield* Effect.fail(new InvalidArgument({
-			argument: "id",
-			message: ToolFailure.message("id must not be empty", remediation),
-			remediation
-		}));
-	}
-	const id = normalized.value;
-	const concept = ctx.bundle.concepts.get(id);
-	if (concept === void 0) {
-		const remediation = {
-			hint: "Call list_concepts to see the ids this bundle contains.",
-			suggestedTool: "list_concepts"
-		};
-		return yield* Effect.fail(new ConceptNotFound({
-			id: params.id,
-			message: ToolFailure.message(`no concept "${ToolFailure.truncate(params.id)}" in this bundle`, remediation),
-			remediation
-		}));
-	}
-	const graph = Graph.fromBundle(ctx.bundle);
-	const links = graph.edges.filter((edge) => edge.from === id).map((edge) => ({
-		to: edge.to,
-		kind: Option.match(graph.node(edge.to), {
-			onNone: () => "missing",
-			onSome: (node) => node.kind
-		}),
-		source: edge.data.source,
-		...edge.data.field === void 0 ? {} : { field: edge.data.field }
-	}));
+	const { concept, links } = yield* ConceptQuery.get(ctx.bundle, params.id).pipe(Effect.catchTag("QueryConceptNotFoundError", (e) => toConceptLookupFailure(params.id, e)));
 	return {
-		id,
+		id: concept.id,
 		type: concept.frontmatter.type,
 		title: Derive.title(concept),
 		description: concept.frontmatter.description ?? null,

package/tools/listConcepts.js

@@ -4,8 +4,8 @@ import { toConceptSummary } from "../schema/ConceptSummary.js";
 import { ListConceptsParams, ListConceptsSuccess } from "../schema/tools.js";
 import { ToolFailure } from "@effected/mcp";
 import { Effect, FileSystem, Path } from "effect";
-import { Derive } from "@okfit/core";
 import { Tool } from "effect/ai";
+import { ConceptQuery } from "@okfit/engine";
 import { AppDirs, Xdg } from "@effected/xdg";
 
 //#region src/tools/listConcepts.ts
@@ -58,18 +58,11 @@ const unknown = (kind, requested, valid) => {
 /** @public */
 const handleListConcepts = (projectRoot, params) => Effect.gen(function* () {
 	const ctx = yield* loadToolContext(projectRoot);
-	const declaredTypes = Object.keys(ctx.config.types ?? {}).toSorted();
-	const declaredTags = Object.keys(ctx.config.tags ?? {}).toSorted();
-	if (params.type !== void 0 && !declaredTypes.includes(params.type)) return yield* Effect.fail(unknown("type", params.type, declaredTypes));
-	const requestedTags = params.tags ?? [];
-	for (const tag of requestedTags) if (!declaredTags.includes(tag)) return yield* Effect.fail(unknown("tag", tag, declaredTags));
-	const filtered = [...ctx.bundle.concepts.values()].filter((concept) => {
-		if (params.type !== void 0 && concept.frontmatter.type !== params.type) return false;
-		const tags = concept.frontmatter.tags ?? [];
-		if (!requestedTags.every((tag) => tags.includes(tag))) return false;
-		if (params.status !== void 0 && Derive.status(concept.frontmatter) !== params.status) return false;
-		return true;
-	}).toSorted((a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0);
+	const filtered = yield* ConceptQuery.list(ctx.bundle, ctx.config, {
+		...params.type === void 0 ? {} : { types: [params.type] },
+		...params.tags === void 0 ? {} : { tags: params.tags },
+		...params.status === void 0 ? {} : { statuses: [params.status] }
+	}).pipe(Effect.catchTag("QueryUnknownVocabularyError", (e) => Effect.fail(unknown(e.kind, e.requested, e.valid))));
 	const limit = params.limit ?? 200;
 	const offset = params.offset ?? 0;
 	return {

package/version.js

@@ -5,7 +5,7 @@
 *
 * @public
 */
-const MCP_VERSION = "0.6.4";
+const MCP_VERSION = "0.6.6";
 
 //#endregion
 export { MCP_VERSION };