@agentxm/workspace-state 0.28.4 → 0.28.6

package/dist/src/workspace/service.d.ts

@@ -22,6 +22,7 @@ import * as Path from "effect/Path";
 import * as Option from "effect/Option";
 import type { Handle } from "@agentxm/extension-model/unstable/extensions/handle";
 import { DesiredPackGraphIncomplete, InvalidAgentId, LockedSkillMissing, SettingsEntryMissing, WorkspaceNotInitialized } from "./errors.js";
+import { LockfileVersionUnsupported } from "./read-model/errors.js";
 import { LockfileValidationError } from "../lockfile/errors.js";
 import { type HookEntry, type KnowledgeEntry, type InstructionsConfigValue, type McpServerEntry, type SkillEntry, type SubagentEntry, type PackEntry, type RuleEntry, type SourceHostConfig } from "../settings/index.js";
 import { type ScopedReleaseAgeExcludePattern } from "@agentxm/extension-model/unstable/extensions/release-age";
@@ -36,8 +37,9 @@ export type WorkspaceLayerOptions = WorkspaceMutationsOptions;
 /**
  * Create the workspace mutations service from an existing workspace on disk.
  *
- * The workspace must already be initialized. Missing or invalid settings fail
- * fast with a typed `WorkspaceMutationsError`. The two operations-side
+ * The workspace must already be initialized. Missing or invalid settings and
+ * invalid or unsupported lockfiles fail fast with a typed
+ * `WorkspaceMutationsError`. The two operations-side
  * capabilities — the transaction runner and transition acquirer — are
  * injected through `makeCapabilities`; the composition seam in
  * `./operations/load-workspace.ts` supplies the live implementation.
@@ -52,7 +54,7 @@ export declare const makeWorkspaceMutations: (options: WorkspaceLayerOptions, ma
     getLockfileState: () => Effect.Effect<LockfileState, LockfileValidationError | WorkspaceRootEscape>;
     getDesiredStateGraph: (graphOptions?: Parameters<(graphOptions?: {
         readonly prospectivePacks?: Parameters<typeof buildDesiredStateGraph>[0]["prospectivePacks"];
-    }) => Effect.Effect<import("./desired-state-graph.js").DesiredStateGraph, SettingsReadError | LockfileReadError | WorkspaceRootEscape, never>>[0]) => Effect.Effect<import("./desired-state-graph.js").DesiredStateGraph, SettingsReadError | LockfileReadError | WorkspaceRootEscape, never>;
+    }) => Effect.Effect<import("./desired-state-graph.js").DesiredStateGraph, import("./read-model/errors.js").SettingsIoError | import("./read-model/errors.js").SettingsParseError | import("./read-model/errors.js").SettingsDecodeError | import("./read-model/errors.js").LockfileIoError | import("./read-model/errors.js").LockfileParseError | import("./read-model/errors.js").LockfileDecodeError | LockfileVersionUnsupported | WorkspaceRootEscape, never>>[0]) => Effect.Effect<import("./desired-state-graph.js").DesiredStateGraph, import("./read-model/errors.js").SettingsIoError | import("./read-model/errors.js").SettingsParseError | import("./read-model/errors.js").SettingsDecodeError | import("./read-model/errors.js").LockfileIoError | import("./read-model/errors.js").LockfileParseError | import("./read-model/errors.js").LockfileDecodeError | LockfileVersionUnsupported | WorkspaceRootEscape, never>;
     getConfiguredSources: () => Effect.Effect<ReadonlyArray<SourceHostConfig>, WorkspaceSettingsReadFailure>;
     getConfiguredSourceByName: (name: string) => Effect.Effect<Option.Option<{
         readonly name: string;
@@ -115,7 +117,6 @@ export declare const makeWorkspaceMutations: (options: WorkspaceLayerOptions, ma
                 readonly [x: string]: string;
             };
             readonly url?: string | undefined;
-            readonly agents?: readonly ("adal" | "aider-desk" | "amp" | "antigravity" | "antigravity-cli" | "augment" | "claude-code" | "cline" | "codearts-agent" | "codebuddy" | "codemaker" | "codestudio" | "codex" | "command-code" | "continue" | "cortex" | "crush" | "cursor" | "deepagents" | "devin" | "dexto" | "droid" | "firebender" | "forgecode" | "gemini-cli" | "github-copilot-cli" | "goose" | "grok-cli" | "hermes" | "ibm-bob" | "iflow-cli" | "junie" | "lingma" | "kilo" | "kimi-cli" | "kiro-cli" | "kode" | "mcpjam" | "minimax-code" | "mistral-vibe" | "mux" | "neovate" | "openclaw" | "opencode" | "openhands" | "ona" | "pi" | "pochi" | "qoder" | "qoder-cn" | "qwen-code" | "replit" | "roo" | "rovodev" | "tabnine-cli" | "trae-cn" | "trae" | "warp" | "windsurf" | "zencoder" | "zed" | "zenflow")[] | undefined;
             readonly command?: string | undefined;
             readonly args?: readonly string[] | undefined;
             readonly headers?: {
@@ -130,7 +131,6 @@ export declare const makeWorkspaceMutations: (options: WorkspaceLayerOptions, ma
             readonly kind: "inline";
             readonly url?: string | undefined;
             readonly source?: undefined;
-            readonly agents?: readonly ("adal" | "aider-desk" | "amp" | "antigravity" | "antigravity-cli" | "augment" | "claude-code" | "cline" | "codearts-agent" | "codebuddy" | "codemaker" | "codestudio" | "codex" | "command-code" | "continue" | "cortex" | "crush" | "cursor" | "deepagents" | "devin" | "dexto" | "droid" | "firebender" | "forgecode" | "gemini-cli" | "github-copilot-cli" | "goose" | "grok-cli" | "hermes" | "ibm-bob" | "iflow-cli" | "junie" | "lingma" | "kilo" | "kimi-cli" | "kiro-cli" | "kode" | "mcpjam" | "minimax-code" | "mistral-vibe" | "mux" | "neovate" | "openclaw" | "opencode" | "openhands" | "ona" | "pi" | "pochi" | "qoder" | "qoder-cn" | "qwen-code" | "replit" | "roo" | "rovodev" | "tabnine-cli" | "trae-cn" | "trae" | "warp" | "windsurf" | "zencoder" | "zed" | "zenflow")[] | undefined;
             readonly command?: string | undefined;
             readonly args?: readonly string[] | undefined;
             readonly headers?: {
@@ -1534,7 +1534,7 @@ export declare const makeWorkspaceMutations: (options: WorkspaceLayerOptions, ma
             readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
         };
     }, LockfileReadError | WorkspaceRootEscape, never>;
-    getLockedMcpServer: (name: string) => Effect.Effect<Option.Option<{
+    getLockedMcpServer: (resolutionKey: string) => Effect.Effect<Option.Option<{
         readonly type: "github";
         readonly owner: string;
         readonly sourceType: "github";
@@ -1650,8 +1650,239 @@ export declare const makeWorkspaceMutations: (options: WorkspaceLayerOptions, ma
         readonly publisherBindingId: string;
         readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
     }>, LockfileReadError | WorkspaceRootEscape, never>;
-    setMcpServer: ({ name, lockEntry, versionRange, env, enabled, agents }: SetMcpServerArgs) => Effect.Effect<void, import("../settings/errors.ts").SettingsWriteError | import("./transaction.ts").WorkspaceSnapshotError | import("../lockfile/errors.js").LockfileWriteError | LockfileValidationError | SettingsReadError | LockfileReadError | WorkspaceRootEscape, never>;
-    setMcpServerLock: ({ name, lockEntry }: SetMcpServerArgs) => Effect.Effect<void, import("../lockfile/errors.js").LockfileWriteError | LockfileValidationError | LockfileReadError | WorkspaceRootEscape, never>;
+    getLockedMcpServerForConnection: (localName: string) => Effect.Effect<Option.None<{
+        readonly type: "github";
+        readonly owner: string;
+        readonly sourceType: "github";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "gitlab";
+        readonly owner: string;
+        readonly sourceType: "gitlab";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "bitbucket";
+        readonly owner: string;
+        readonly sourceType: "bitbucket";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "azurerepos";
+        readonly sourceType: "azurerepos";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly organization: string;
+        readonly project: string;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "git";
+        readonly url: string;
+        readonly sourceType: "git";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: "git";
+        readonly packageFormat: "agentxm";
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "local";
+        readonly sourceType: "local";
+        readonly sourceName: "local";
+        readonly extensionType: "mcp-server";
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageFormat: "agentxm";
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly path: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+    } | {
+        readonly type: "registry";
+        readonly sourceType: "registry";
+        readonly endpoint: URL;
+        readonly extensionType: "mcp-server";
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageFormat: "agentxm";
+        readonly owner: string & import("effect/Brand").Brand<"Handle">;
+        readonly name: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly resolvedVersion: string & import("effect/Brand").Brand<"Version">;
+        readonly integrity: string;
+        readonly sourceName: string;
+        readonly publisherBindingId: string;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+    }> | Option.Some<{
+        readonly type: "github";
+        readonly owner: string;
+        readonly sourceType: "github";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "gitlab";
+        readonly owner: string;
+        readonly sourceType: "gitlab";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "bitbucket";
+        readonly owner: string;
+        readonly sourceType: "bitbucket";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "azurerepos";
+        readonly sourceType: "azurerepos";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: string;
+        readonly packageFormat: "agentxm";
+        readonly endpoint: URL;
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly repo: string;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly organization: string;
+        readonly project: string;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "git";
+        readonly url: string;
+        readonly sourceType: "git";
+        readonly extensionType: "mcp-server";
+        readonly sourceName: "git";
+        readonly packageFormat: "agentxm";
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly resolvedCommit: string;
+        readonly resolvedTree: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+        readonly path?: string | undefined;
+        readonly ref?: string | undefined;
+    } | {
+        readonly type: "local";
+        readonly sourceType: "local";
+        readonly sourceName: "local";
+        readonly extensionType: "mcp-server";
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageFormat: "agentxm";
+        readonly packageOwner: string & import("effect/Brand").Brand<"Handle">;
+        readonly packageName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly path: string;
+        readonly contentIdentity: string & import("effect/Brand").Brand<"SourceHash">;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+    } | {
+        readonly type: "registry";
+        readonly sourceType: "registry";
+        readonly endpoint: URL;
+        readonly extensionType: "mcp-server";
+        readonly workspaceName: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly packageFormat: "agentxm";
+        readonly owner: string & import("effect/Brand").Brand<"Handle">;
+        readonly name: string & import("effect/Brand").Brand<"ExtensionName">;
+        readonly resolvedVersion: string & import("effect/Brand").Brand<"Version">;
+        readonly integrity: string;
+        readonly sourceName: string;
+        readonly publisherBindingId: string;
+        readonly treeIntegrity: string & import("effect/Brand").Brand<"TreeIntegrity">;
+    }>, import("./read-model/errors.js").SettingsIoError | import("./read-model/errors.js").SettingsParseError | import("./read-model/errors.js").SettingsDecodeError | LockfileReadError | WorkspaceRootEscape, never>;
+    setMcpServer: ({ name, resolutionKey, lockEntry, versionRange, env, enabled, }: SetMcpServerArgs) => Effect.Effect<void, import("../settings/errors.ts").SettingsWriteError | import("./transaction.ts").WorkspaceSnapshotError | import("../lockfile/errors.js").LockfileWriteError | LockfileValidationError | SettingsReadError | LockfileReadError | WorkspaceRootEscape, never>;
+    setMcpServerLock: ({ name: _name, resolutionKey, lockEntry }: SetMcpServerArgs) => Effect.Effect<void, import("../lockfile/errors.js").LockfileWriteError | LockfileValidationError | LockfileReadError | WorkspaceRootEscape, never>;
     updateMcpServerEntry: (name: string, updater: (entry: McpServerEntry) => McpServerEntry) => Effect.Effect<void, import("../settings/errors.ts").SettingsWriteError | import("./transaction.ts").WorkspaceSnapshotError | SettingsEntryMissing | SettingsReadError | WorkspaceRootEscape, never>;
     setMcpServerEntry: (name: string, entry: McpServerEntry) => Effect.Effect<void, import("../settings/errors.ts").SettingsWriteError | import("./transaction.ts").WorkspaceSnapshotError | SettingsReadError | WorkspaceRootEscape, never>;
     removeMcpServer: (name: string) => Effect.Effect<void, import("../settings/errors.ts").SettingsWriteError | import("./transaction.ts").WorkspaceSnapshotError | import("../lockfile/errors.js").LockfileWriteError | LockfileValidationError | SettingsReadError | LockfileReadError | WorkspaceRootEscape, never>;
@@ -1660,6 +1891,6 @@ export declare const makeWorkspaceMutations: (options: WorkspaceLayerOptions, ma
     removeMcpServerLock: (name: string) => Effect.Effect<void, import("../lockfile/errors.js").LockfileWriteError | LockfileValidationError | LockfileReadError | WorkspaceRootEscape, never>;
     removePackSettings: (name: string) => Effect.Effect<void, import("../settings/errors.ts").SettingsWriteError | import("./transaction.ts").WorkspaceSnapshotError | SettingsReadError | WorkspaceRootEscape, never>;
     removePackLock: (name: string) => Effect.Effect<void, import("../lockfile/errors.js").LockfileWriteError | LockfileValidationError | LockfileReadError | WorkspaceRootEscape, never>;
-    isExtensionRequiredByInstalledPack: (target: ExtensionTarget) => Effect.Effect<boolean, DesiredPackGraphIncomplete | SettingsReadError | LockfileReadError | WorkspaceRootEscape, never>;
-}, import("./errors.js").WorkspaceLayoutError | WorkspaceNotInitialized | WorkspaceSettingsReadFailure, FileSystem.FileSystem | Path.Path>;
+    isExtensionRequiredByInstalledPack: (target: ExtensionTarget) => Effect.Effect<boolean, DesiredPackGraphIncomplete | import("./read-model/errors.js").SettingsIoError | import("./read-model/errors.js").SettingsParseError | import("./read-model/errors.js").SettingsDecodeError | import("./read-model/errors.js").LockfileIoError | import("./read-model/errors.js").LockfileParseError | import("./read-model/errors.js").LockfileDecodeError | LockfileVersionUnsupported | WorkspaceRootEscape, never>;
+}, import("./errors.js").WorkspaceLayoutError | WorkspaceNotInitialized | LockfileReadError | WorkspaceSettingsReadFailure, FileSystem.FileSystem | Path.Path>;
 //# sourceMappingURL=service.d.ts.map

package/dist/src/workspace/service.js

@@ -28,6 +28,7 @@ import { computePackPathsForLayout } from "./pack-paths.js";
 import { sanitizeName } from "./extension-name.js";
 import { ConfigurableAgentIdSchema, decodeExtensionNameSync, formatFqn, parseSourceQualifiedRegistrySourcePatternParts, } from "@agentxm/extension-model/unstable/extensions";
 import { DesiredPackGraphIncomplete, InvalidAgentId, LockedSkillMissing, SettingsEntryMissing, WorkspaceNotInitialized, } from "./errors.js";
+import { LockfileVersionUnsupported } from "./read-model/errors.js";
 import { LockfileValidationError } from "../lockfile/errors.js";
 import { createDefaultSettings, writeSettingsAtPath, } from "../settings/index.js";
 import { DEFAULT_MINIMUM_RELEASE_AGE } from "@agentxm/registry-protocol/unstable/registry/release-age-policy";
@@ -71,15 +72,22 @@ const lockEntrySemanticallyEqual = (current, next) => current !== undefined && s
 const skillLockEntrySemanticallyEqual = (current, next) => lockEntrySemanticallyEqual(current, next);
 const preserveAcceptedResolutionOnNoop = (current, next) => (lockEntrySemanticallyEqual(current, next) && current !== undefined ? current : next);
 const subagentLockEntrySemanticallyEqual = (current, next) => lockEntrySemanticallyEqual(current, next);
-const requireInitializedWorkspace = (settingsPath, settings) => settings.pipe(Effect.flatMap(Option.match({
-    onNone: () => Effect.fail(new WorkspaceNotInitialized({ settingsPath })),
+const requireInitializedWorkspace = (settingsPath, settings, lockfile) => settings.pipe(Effect.flatMap(Option.match({
+    onNone: () => lockfile.pipe(Effect.matchEffect({
+        onFailure: (error) => error instanceof LockfileVersionUnsupported &&
+            error.observedVersion > error.supportedVersion
+            ? Effect.fail(error)
+            : Effect.fail(new WorkspaceNotInitialized({ settingsPath })),
+        onSuccess: () => Effect.fail(new WorkspaceNotInitialized({ settingsPath })),
+    })),
     onSome: () => Effect.void,
 })));
 /**
  * Create the workspace mutations service from an existing workspace on disk.
  *
- * The workspace must already be initialized. Missing or invalid settings fail
- * fast with a typed `WorkspaceMutationsError`. The two operations-side
+ * The workspace must already be initialized. Missing or invalid settings and
+ * invalid or unsupported lockfiles fail fast with a typed
+ * `WorkspaceMutationsError`. The two operations-side
  * capabilities — the transaction runner and transition acquirer — are
  * injected through `makeCapabilities`; the composition seam in
  * `./operations/load-workspace.ts` supplies the live implementation.
@@ -112,7 +120,8 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
     const readSettingsCell = (dir, sharedScope) => makeWorkspaceReadModel(scopeForDir(dir, sharedScope)).pipe(Effect.flatMap((readModel) => readModel.state.settings), Effect.provide(contextEnv));
     const readLockfileCell = (dir, sharedScope) => makeWorkspaceReadModel(scopeForDir(dir, sharedScope)).pipe(Effect.flatMap((readModel) => readModel.state.lockfile), Effect.map(Option.getOrElse(createEmptyLockfile)), Effect.provide(contextEnv));
     if (options.allowUninitialized !== true) {
-        yield* requireInitializedWorkspace(settingsPath, readSettingsCell(workspaceDir));
+        yield* requireInitializedWorkspace(settingsPath, readSettingsCell(workspaceDir), readLockfileCell(workspaceDir));
+        yield* readLockfileCell(workspaceDir);
     }
     const projectSettings = yield* readSettingsCell(localRuntimeDir, "project").pipe(Effect.map(Option.getOrElse(() => createDefaultSettings())));
     const userSettings = yield* readSettingsCell(userRuntimeDir, "user").pipe(Effect.map(Option.getOrElse(() => createDefaultSettings())));
@@ -161,15 +170,23 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
         }
         // An unreadable or corrupt lockfile is actionable workspace state,
         // not a violated invariant.
-        return yield* readLockfileSafe(workspaceDir).pipe(Effect.as("ok"), Effect.catchTag(["LockfileIoError", "LockfileParseError", "LockfileDecodeError"], () => Effect.succeed("invalid")));
+        return yield* readLockfileSafe(workspaceDir).pipe(Effect.as("ok"), Effect.catchTag([
+            "LockfileIoError",
+            "LockfileParseError",
+            "LockfileDecodeError",
+            "LockfileVersionUnsupported",
+        ], () => Effect.succeed("invalid")));
     }).pipe(Effect.withSpan("WorkspaceMutations.getLockfileState"));
     const readScopedContext = (f) => makeWorkspaceReadModel(scopeForDir(workspaceDir)).pipe(Effect.flatMap(f), Effect.provide(contextEnv));
     const readDesiredStateGraph = (graphOptions) => Effect.gen(function* () {
         const settings = yield* readSettingsSafe(workspaceDir);
+        const configuredSources = yield* getConfiguredSources();
+        const registryAuthorities = Object.fromEntries(configuredSources.flatMap((source) => source.type === "registry" ? [[source.name, source.location]] : []));
         const graph = yield* buildDesiredStateGraph({
             baseDir,
             settings,
             layout,
+            registryAuthorities,
             ...(graphOptions?.prospectivePacks === undefined
                 ? {}
                 : { prospectivePacks: graphOptions.prospectivePacks }),
@@ -1083,14 +1100,21 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
         // MCP Server methods
         // -----------------------------------------------------------------------
         getLockedMcpServers: () => readLockfileSafe(workspaceDir).pipe(Effect.map((lf) => lf.mcpServers ?? {})),
-        getLockedMcpServer: (name) => readLockfileSafe(workspaceDir).pipe(Effect.map((lf) => Option.fromUndefinedOr((lf.mcpServers ?? {})[name]))),
-        setMcpServer: ({ name, lockEntry, versionRange, env, enabled, agents }) => withMutex(Effect.gen(function* () {
+        getLockedMcpServer: (resolutionKey) => readLockfileSafe(workspaceDir).pipe(Effect.map((lf) => Option.fromUndefinedOr((lf.mcpServers ?? {})[resolutionKey]))),
+        getLockedMcpServerForConnection: (localName) => Effect.gen(function* () {
+            const graph = yield* readDesiredStateGraph();
+            const node = graph.nodes.find((candidate) => candidate.type === "mcp-server" && candidate.name === localName);
+            if (node === undefined || node.authority === "inline")
+                return Option.none();
+            const lockfile = yield* readLockfileSafe(workspaceDir);
+            return Option.fromUndefinedOr((lockfile.mcpServers ?? {})[node.identity]);
+        }),
+        setMcpServer: ({ name, resolutionKey, lockEntry, versionRange, env, enabled, }) => withMutex(Effect.gen(function* () {
             // Update settings (uses "mcpServers" key)
             const currentSettings = yield* readSettingsSafe(workspaceDir);
             const currentMcpServers = currentSettings.mcpServers ?? {};
             const currentEnabled = currentMcpServers[name]?.enabled ?? true;
             const currentEnv = currentMcpServers[name]?.env ?? {};
-            const currentAgents = currentMcpServers[name]?.agents;
             const settingsEntry = {
                 kind: "sourced",
                 source: lockEntry.type === "registry"
@@ -1098,7 +1122,7 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
                         const fqn = formatFqn({
                             owner: lockEntry.owner,
                             type: "mcp-server",
-                            name: decodeExtensionNameSync(name),
+                            name: lockEntry.name,
                         });
                         const locator = Option.isSome(versionRange)
                             ? `${fqn}@${versionRange.value}`
@@ -1108,9 +1132,6 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
                     : printSourceParams(lockEntryToSourceParams(lockEntry)),
                 enabled: enabled ?? currentEnabled,
                 env: env ?? currentEnv,
-                ...((agents ?? currentAgents) === undefined
-                    ? {}
-                    : { agents: agents ?? currentAgents }),
             };
             const updatedSettings = {
                 ...currentSettings,
@@ -1127,12 +1148,12 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
                 ...currentLockfile,
                 mcpServers: {
                     ...currentLockedMcpServers,
-                    [name]: preserveAcceptedResolutionOnNoop(currentLockedMcpServers[name], lockEntry),
+                    [resolutionKey]: preserveAcceptedResolutionOnNoop(currentLockedMcpServers[resolutionKey], lockEntry),
                 },
             };
             yield* commitWorkspaceState(currentLockfile, updatedLockfile);
         })).pipe(Effect.withSpan("WorkspaceMutations.setMcpServer")),
-        setMcpServerLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
+        setMcpServerLock: ({ name: _name, resolutionKey, lockEntry }) => withMutex(Effect.gen(function* () {
             // Update lockfile only (skip settings) — used for pack dependencies
             const currentLockfile = yield* readLockfileSafe(workspaceDir);
             const currentLockedMcpServers = currentLockfile.mcpServers ?? {};
@@ -1140,7 +1161,7 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
                 ...currentLockfile,
                 mcpServers: {
                     ...currentLockedMcpServers,
-                    [name]: preserveAcceptedResolutionOnNoop(currentLockedMcpServers[name], lockEntry),
+                    [resolutionKey]: preserveAcceptedResolutionOnNoop(currentLockedMcpServers[resolutionKey], lockEntry),
                 },
             };
             yield* commitWorkspaceState(currentLockfile, updatedLockfile);
@@ -1166,6 +1187,11 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
             yield* writeScopedSettings(updatedSettings).pipe(Effect.provide(fsLayer));
         })),
         removeMcpServer: (name) => withMutex(Effect.gen(function* () {
+            const graph = yield* readDesiredStateGraph();
+            const desiredNode = graph.nodes.find((node) => node.type === "mcp-server" && node.name === name);
+            const closure = desiredNode === undefined || desiredNode.authority === "inline"
+                ? undefined
+                : graph.mcpSourceClosures.find((candidate) => candidate.identity === desiredNode.identity);
             // Update settings (uses "mcpServers" key)
             const currentSettings = yield* readSettingsSafe(workspaceDir);
             const currentMcpServers = currentSettings.mcpServers ?? {};
@@ -1182,8 +1208,14 @@ export const makeWorkspaceMutations = (options, makeCapabilities) => Effect.gen(
             // Update lockfile (uses "mcpServers" key)
             const currentLockfile = yield* readLockfileSafe(workspaceDir);
             const currentLockedMcpServers = currentLockfile.mcpServers ?? {};
-            if (name in currentLockedMcpServers) {
-                const { [name]: __, ...remainingLockedMcpServers } = currentLockedMcpServers;
+            const resolutionKey = desiredNode?.identity;
+            const keepSharedResolution = closure !== undefined &&
+                (closure.localNames.length > 1 ||
+                    closure.origins.some((origin) => origin.type === "pack"));
+            if (resolutionKey !== undefined &&
+                !keepSharedResolution &&
+                resolutionKey in currentLockedMcpServers) {
+                const { [resolutionKey]: __, ...remainingLockedMcpServers } = currentLockedMcpServers;
                 void __;
                 const updatedLockfile = {
                     ...currentLockfile,

package/dist/src/workspace/test-stubs.js

@@ -188,7 +188,7 @@ export const makeBaseWorkspaceMock = (axmDir = "/tmp/axm", overrides) => {
                 ],
             };
         }));
-        return { complete: true, nodes, problems: [] };
+        return { complete: true, nodes, mcpSourceClosures: [], problems: [] };
     });
     const runTransaction = (args) => Effect.gen(function* () {
         const value = yield* args.transition;
@@ -304,6 +304,7 @@ export const makeBaseWorkspaceMock = (axmDir = "/tmp/axm", overrides) => {
         removeSubagentLock: () => Effect.void,
         getLockedMcpServers: lockedMcpServers,
         getLockedMcpServer: entryFrom(lockedMcpServers),
+        getLockedMcpServerForConnection: entryFrom(lockedMcpServers),
         setMcpServer: () => Effect.void,
         setMcpServerLock: () => Effect.void,
         updateMcpServerEntry: () => Effect.void,
@@ -337,7 +338,7 @@ export const writeWorkspaceFiles = (runtimeDir, opts = {}) => {
         ...(opts.sources && { sources: opts.sources }),
     };
     const lockfile = {
-        lockfileVersion: 6,
+        lockfileVersion: 7,
         skills: opts.lockfileSkills ?? {},
         ...(hasEntries(opts.lockfileMcpServers) && { mcps: opts.lockfileMcpServers }),
         ...(hasEntries(opts.lockfileSubagents) && { subagents: opts.lockfileSubagents }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentxm/workspace-state",
-  "version": "0.28.4",
+  "version": "0.28.6",
   "description": "AXM workspace state kernel: settings, lockfile, read model, and desired-state vocabulary for the axm CLI. Unstable and unsupported — use the axm.sh CLI.",
   "type": "module",
   "license": "FSL-1.1-MIT",
@@ -18,10 +18,12 @@
   "exports": {
     ".": {
       "types": "./dist/src/index.d.ts",
+      "axm-source": "./src/index.ts",
       "default": "./dist/src/index.js"
     },
     "./testing": {
       "types": "./dist/src/testing.d.ts",
+      "axm-source": "./src/testing.ts",
       "default": "./dist/src/testing.js"
     }
   },
@@ -43,8 +45,8 @@
     "jsonc-parser": "^3.3.1",
     "semver": "^7.8.5",
     "yaml": "^2.9.0",
-    "@agentxm/extension-model": "^0.28.4",
-    "@agentxm/registry-protocol": "^0.28.4"
+    "@agentxm/extension-model": "^0.28.6",
+    "@agentxm/registry-protocol": "^0.28.6"
   },
   "devDependencies": {
     "@effect/platform-node": "4.0.0-rc.112",