@savvy-web/mcp 3.4.19 → 3.4.21

package/errors.js

@@ -1,4 +1,4 @@
-import { ToolFailure, ToolRefusal } from "@effected/mcp";
+import { ToolFailure, ToolRefusal } from "@effected/mcp-kit";
 import { Schema } from "effect";
 
 // src/errors.ts

package/index.d.ts

@@ -1,5 +1,5 @@
-import { Distribution } from "@effected/engine";
-import { ToolRefusal } from "@effected/mcp";
+import { Distribution } from "@effected/kit";
+import { ToolRefusal } from "@effected/mcp-kit";
 import { FileSystem, Layer, Path, Schema, Stdio } from "effect";
 import { ToolDiscovery } from "@effected/commands";
 import { Git } from "@effected/git";
@@ -128,7 +128,7 @@ interface ServerOptions {
 }
 /**
  * The whole server as one layer: the ten-tool toolkit, the silk-effects
- * runtime discharging its dependencies, over `@effected/mcp`'s
+ * runtime discharging its dependencies, over `@effected/mcp-kit`'s
  * `McpStdio.layer`.
  *
  * `McpStdio.layer` is `McpServer.layerStdio` with the kit's default
@@ -203,7 +203,7 @@ declare const changesetDepsDetectTool: Tool.Tool<"changeset_deps_detect", {
       readonly packages: Schema.$Array<Schema.String>;
     }>>;
   }>;
-  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp").ToolRefusal]>;
+  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp-kit").ToolRefusal]>;
   readonly failureMode: "error";
 }, Changesets.DepsRegen | WorkspaceRoot>;
 /** The `changeset_deps_regen` tool value. Mutating: not read-only, not idempotent. */
@@ -227,7 +227,7 @@ declare const changesetDepsRegenTool: Tool.Tool<"changeset_deps_regen", {
     }>>;
     readonly dryRun: Schema.Boolean;
   }>;
-  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp").ToolRefusal]>;
+  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp-kit").ToolRefusal]>;
   readonly failureMode: "error";
 }, Changesets.DepsRegen | WorkspaceRoot>;
 /** The `changeset_inspect` tool value. */
@@ -301,7 +301,7 @@ declare const changesetInspectTool: Tool.Tool<"changeset_inspect", {
       }>, Schema.Null]>;
     }>>;
   }>]>;
-  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp").ToolRefusal]>;
+  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp-kit").ToolRefusal]>;
   readonly failureMode: "error";
 }, Changesets.BranchAnalyzer | Changesets.ConfigInspector | WorkspaceRoot>;
 /** The `changeset_preview` tool value. */
@@ -328,7 +328,7 @@ declare const changesetPreviewTool: Tool.Tool<"changeset_preview", {
       }>>;
     }>>;
   }>;
-  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp").ToolRefusal]>;
+  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp-kit").ToolRefusal]>;
   readonly failureMode: "error";
 }, Changesets.ReleasePlanner | WorkspaceRoot>;
 /** The `changeset_validate` tool value. */
@@ -412,7 +412,7 @@ declare const reposInspectTool: Tool.Tool<"repos_inspect", {
     }>>;
     readonly parseError: Schema.optionalKey<Schema.String>;
   }>]>;
-  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp").ToolRefusal]>;
+  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp-kit").ToolRefusal]>;
   readonly failureMode: "error";
 }, FileSystem.FileSystem | Path.Path | Repos.ReposConfigStore | Repos.ReposDrift | Repos.ReposManager | WorkspaceRoot>;
 /**
@@ -421,7 +421,7 @@ declare const reposInspectTool: Tool.Tool<"repos_inspect", {
  * call is rejected as invalid parameters before the handler runs. Mutating:
  * not read-only, not idempotent.
  */
-declare const reposManageTool: import("@effected/mcp").UnionTool<"repos_manage", Schema.Union<readonly [Schema.Struct<{
+declare const reposManageTool: import("@effected/mcp-kit").UnionTool<"repos_manage", Schema.Union<readonly [Schema.Struct<{
   readonly action: Schema.Literal<"sync">;
   readonly cwd: Schema.optionalKey<Schema.String>;
 }>, Schema.Struct<{
@@ -617,7 +617,7 @@ declare const turboInspectTool: Tool.Tool<"turbo_inspect", {
       readonly dependents: Schema.$Array<Schema.String>;
     }>;
   }>]>;
-  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp").ToolRefusal]>;
+  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp-kit").ToolRefusal]>;
   readonly failureMode: "error";
 }, Turbo.TurboInspector | WorkspaceRoot>;
 /**
@@ -652,7 +652,7 @@ declare const workspaceInfoTool: Tool.Tool<"workspace_info", {
       readonly fixed: Schema.$Array<Schema.String>;
     }>>;
   }>;
-  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp").ToolRefusal]>;
+  readonly failure: Schema.Union<readonly [typeof WorkspaceNotFound, typeof EngineError, typeof BiomeFailed, typeof import("@effected/mcp-kit").ToolRefusal]>;
   readonly failureMode: "error";
 }, SilkWorkspaceAnalyzer | WorkspaceRoot>;
 /**

package/index.js

@@ -1,7 +1,7 @@
 import { BiomeFailed, EngineError, McpToolError, WorkspaceNotFound } from "./errors.js";
 import { makeSilkRuntimeLayer } from "./runtime.js";
+import { ServerLayer } from "./server.js";
 import { SilkToolkit, ToolsLayer } from "./toolkit.js";
 import { CURRENT_MCP_VERSION } from "./version.js";
-import { ServerLayer } from "./server.js";
 
 export { BiomeFailed, CURRENT_MCP_VERSION, EngineError, McpToolError, ServerLayer, SilkToolkit, ToolsLayer, WorkspaceNotFound, makeSilkRuntimeLayer };

package/main.d.ts

@@ -1,4 +1,4 @@
-import { Distribution } from "@effected/engine";
+import { Distribution } from "@effected/kit";
 /**
  * Options for {@link main}.
  *

package/main.js

@@ -1,4 +1,4 @@
-import { McpGuard } from "@effected/mcp/guard";
+import { McpGuard } from "@effected/mcp-kit/guard";
 
 // src/main.ts
 /**
@@ -21,7 +21,7 @@ const main = (options = {}) => McpGuard.run({
 		const NodeRuntime = await import("@effect/platform-node/NodeRuntime");
 		const NodeServices = await import("@effect/platform-node/NodeServices");
 		const { Layer } = await import("effect");
-		const { LaunchContext } = await import("@effected/engine");
+		const { LaunchContext } = await import("@effected/kit");
 		const { ServerLayer } = await import("./server.js");
 		return {
 			layer: ServerLayer(LaunchContext.projectDir({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/mcp",
-	"version": "3.4.19",
+	"version": "3.4.21",
 	"private": false,
 	"description": "The savvy MCP server — Silk Suite tooling and library knowledge for coding agents",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/mcp",
@@ -36,14 +36,14 @@
 		"savvy-mcp": "bin/savvy-mcp.js"
 	},
 	"dependencies": {
-		"@effect/platform-node": "^4.0.7",
-		"@effected/commands": "^0.18.0",
-		"@effected/engine": "^0.10.0",
-		"@effected/git": "^0.27.0",
-		"@effected/mcp": "^0.11.0",
-		"@effected/templates": "^0.15.0",
-		"@effected/workspaces": "^0.40.0",
-		"@savvy-web/silk-effects": "^10.2.1",
-		"effect": "^4.0.7"
+		"@effect/platform-node": "~4.1.2",
+		"@effected/commands": "^0.20.0",
+		"@effected/git": "^0.30.0",
+		"@effected/kit": "^0.12.0",
+		"@effected/mcp-kit": "^0.13.0",
+		"@effected/templates": "^0.17.0",
+		"@effected/workspaces": "^0.42.0",
+		"@savvy-web/silk-effects": "^11.0.1",
+		"effect": "~4.1.2"
 	}
 }

package/server.js

@@ -1,9 +1,10 @@
 import { makeSilkRuntimeLayer } from "./runtime.js";
 import { SilkToolkit, ToolsLayer } from "./toolkit.js";
 import { CURRENT_MCP_VERSION } from "./version.js";
-import { McpStdio, McpToolkit } from "@effected/mcp";
-import { Layer, Option } from "effect";
-import { distributionSuffix } from "@effected/engine";
+import { McpStdio, McpToolkit } from "@effected/mcp-kit";
+import { Effect, Layer, Option } from "effect";
+import { distributionSuffix } from "@effected/kit";
+import { McpServer } from "effect/ai";
 
 // src/server.ts
 /**
@@ -26,15 +27,34 @@ const SERVER_INSTRUCTIONS = [
 	"Every successful result is a typed object in structuredContent (content[0].text carries the same object as JSON). A failure is an isError result whose content[0].text carries the message and remediation, with no structuredContent. Every tool takes an optional cwd; omit it to use the server's project directory."
 ].join("\n");
 /**
-* The toolkit registration as a layer: `McpToolkit.layer` over core's
-* module-level `McpServer.McpServer.layer` — the same reference
-* `McpStdio.layer` serves, so layer memoization lands the registration on the
-* served instance — with the handlers bound to `cwd`.
+* Discharges every tool's declared `dependencies`. Since effect 4.1 a service a
+* tool lists in `dependencies` is a per-request `McpRequest<"Requires", S>`
+* requirement that only MCP middleware or the transport can meet;
+* `Layer.provide` no longer does. The silk runtime is built ONCE (it holds the
+* process-lifetime `ConfigInspector`, #229), so the middleware captures its
+* context when the layer is built and provides that same context to every
+* request.
+*
+* `Effect.context` captures the whole layer-build context, not only
+* `McpServices` (also `Scope`, `Clock`, `Console`, `McpServer`, the memo map),
+* and `Effect.provideContext` merges it OVER the request's context. Probed on
+* 4.1.1: a handler finalizer still runs at the end of its own request, and no
+* request-scoped key (`McpRequestContext`, log level, parent span) is in the
+* build context today. Core's own registration capture filters those keys
+* (`omitRequestServices`); this capture does not, so do not build this layer
+* inside a span or under a request-level reference.
+*/
+const RuntimeMiddleware = McpServer.middleware()(Effect.map(Effect.context(), (context) => (effect) => Effect.provideContext(effect, context)));
+/**
+* The toolkit registration as a layer: `McpToolkit.layer` with the handlers
+* bound to `cwd` and {@link RuntimeMiddleware} meeting their request-level
+* dependencies. Passed to `McpStdio.layer` as `registrations`, so it builds
+* before the first request.
 */
-const SilkToolsLayer = (cwd) => McpToolkit.layer(SilkToolkit, { strict: "annotated" }).pipe(Layer.provide(ToolsLayer(cwd)));
+const SilkToolsLayer = (cwd) => McpToolkit.layer(SilkToolkit, { strict: "annotated" }).pipe(Layer.provide(ToolsLayer(cwd)), Layer.provide(RuntimeMiddleware.layer));
 /**
 * The whole server as one layer: the ten-tool toolkit, the silk-effects
-* runtime discharging its dependencies, over `@effected/mcp`'s
+* runtime discharging its dependencies, over `@effected/mcp-kit`'s
 * `McpStdio.layer`.
 *
 * `McpStdio.layer` is `McpServer.layerStdio` with the kit's default
@@ -44,11 +64,12 @@ const SilkToolsLayer = (cwd) => McpToolkit.layer(SilkToolkit, { strict: "annotat
 *
 * @public
 */
-const ServerLayer = (cwd, options = {}) => SilkToolsLayer(cwd).pipe(Layer.provide(makeSilkRuntimeLayer(cwd)), Layer.provide(McpStdio.layer({
+const ServerLayer = (cwd, options = {}) => McpStdio.layer({
 	name: "savvy-mcp",
 	version: `${CURRENT_MCP_VERSION}${distributionSuffix(Option.fromNullishOr(options.distribution))}`,
 	description: "Structured Silk Suite workspace tools: workspace, turbo, biome, changesets and vendored repos.",
-	instructions: SERVER_INSTRUCTIONS
-})));
+	instructions: SERVER_INSTRUCTIONS,
+	registrations: SilkToolsLayer(cwd)
+}).pipe(Layer.provide(makeSilkRuntimeLayer(cwd)));
 
 export { SERVER_INSTRUCTIONS, ServerLayer };

package/toolkit.js

@@ -9,7 +9,7 @@ import { handleReposManage, reposManageTool } from "./tools/repos-manage.js";
 import { handleTurboInspect, turboInspectTool } from "./tools/turbo-inspect.js";
 import { handleWorkspaceInfo, workspaceInfoTool } from "./tools/workspace-info.js";
 import { Effect } from "effect";
-import { Exclusive } from "@effected/engine";
+import { Exclusive } from "@effected/kit";
 import { Toolkit } from "effect/ai";
 
 // src/toolkit.ts

package/tools/biome-check.js

@@ -1,5 +1,5 @@
 import { BiomeFailed, McpToolError } from "../errors.js";
-import { ToolFailure, ToolRefusal } from "@effected/mcp";
+import { ToolFailure, ToolRefusal } from "@effected/mcp-kit";
 import { Effect, Option, Schema } from "effect";
 import { Run, Tool, ToolDiscovery } from "@effected/commands";
 import { Tool as Tool$1 } from "effect/ai";
@@ -71,8 +71,8 @@ const GitlabDiagnostic = Schema.Struct({
 		lines: Schema.Struct({ begin: Schema.Number })
 	})
 });
-const GitlabArray = Schema.Array(GitlabDiagnostic);
-const decodeGitlab = Schema.decodeUnknownSync(GitlabArray);
+/** Biome's gitlab stdout, parsed and decoded in one step; `None` for non-JSON or a shape mismatch. */
+const decodeGitlab = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Array(GitlabDiagnostic)));
 /**
 * Map a gitlab severity back onto the Biome severity it was produced from.
 *
@@ -91,19 +91,9 @@ const mapSeverity = (s) => s === "info" || s === "minor" ? "info" : s === "major
 const parseBiomeGitlab = (stdout) => {
 	const trimmed = stdout.trim();
 	if (!trimmed) return [];
-	let raw;
-	try {
-		raw = JSON.parse(trimmed);
-	} catch {
-		return [];
-	}
-	let decoded;
-	try {
-		decoded = decodeGitlab(raw);
-	} catch {
-		return [];
-	}
-	return decoded.map((d) => ({
+	const decoded = decodeGitlab(trimmed);
+	if (Option.isNone(decoded)) return [];
+	return decoded.value.map((d) => ({
 		file: d.location.path,
 		line: d.location.lines.begin,
 		severity: mapSeverity(d.severity),

package/tools/changeset-inspect.js

@@ -1,5 +1,5 @@
 import { McpToolError, mapEngineError } from "../errors.js";
-import { ToolOutputSchema } from "@effected/mcp";
+import { ToolOutputSchema } from "@effected/mcp-kit";
 import { Effect, Schema } from "effect";
 import { WorkspaceRoot } from "@effected/workspaces";
 import { Changesets } from "@savvy-web/silk-effects";

package/tools/changeset-validate.js

@@ -1,5 +1,5 @@
 import { McpToolError, mapEngineError } from "../errors.js";
-import { ToolFailure, ToolRefusal } from "@effected/mcp";
+import { ToolFailure, ToolRefusal } from "@effected/mcp-kit";
 import { Data, Effect, Schema } from "effect";
 import { WorkspaceRoot } from "@effected/workspaces";
 import { Changesets } from "@savvy-web/silk-effects";

package/tools/repos-inspect.js

@@ -1,5 +1,5 @@
 import { McpToolError, mapEngineError } from "../errors.js";
-import { ToolOutputSchema } from "@effected/mcp";
+import { ToolOutputSchema } from "@effected/mcp-kit";
 import { Effect, FileSystem, Option, Path, Result, Schema } from "effect";
 import { WorkspaceRoot } from "@effected/workspaces";
 import { Repos } from "@savvy-web/silk-effects";

package/tools/repos-manage.js

@@ -1,5 +1,5 @@
 import { McpToolError, mapEngineError } from "../errors.js";
-import { McpToolkit, ToolOutputSchema, ToolRefusal } from "@effected/mcp";
+import { McpToolkit, ToolOutputSchema, ToolRefusal } from "@effected/mcp-kit";
 import { Effect, Result, Schema } from "effect";
 import { WorkspaceRoot } from "@effected/workspaces";
 import { Repos } from "@savvy-web/silk-effects";
@@ -10,7 +10,7 @@ import { Tool } from "effect/ai";
 * The `repos_manage` MCP tool: one action-discriminated mutating tool
 * covering `sync`, `pin`, `add`, `note`, `remove`, `rename`, `restore`, and
 * `deregister` against the vendored `.repos/` submodules. Its parameters are
-* a `Schema.Union` of one struct per action, served by `@effected/mcp`'s
+* a `Schema.Union` of one struct per action, served by `@effected/mcp-kit`'s
 * `McpToolkit.unionTool` as a strict `oneOf` keyed by `action`; the handler
 * receives the decoded member. Mutating — no `readOnlyHint`.
 *

package/tools/turbo-inspect.js

@@ -1,5 +1,5 @@
 import { McpToolError, mapEngineError } from "../errors.js";
-import { ToolOutputSchema } from "@effected/mcp";
+import { ToolOutputSchema } from "@effected/mcp-kit";
 import { Effect, Schema } from "effect";
 import { WorkspaceRoot } from "@effected/workspaces";
 import { Turbo } from "@savvy-web/silk-effects";

package/version.js

@@ -6,6 +6,6 @@
 *
 * @packageDocumentation
 */
-const CURRENT_MCP_VERSION = "3.4.19";
+const CURRENT_MCP_VERSION = "3.4.21";
 
 export { CURRENT_MCP_VERSION };