@agentxm/client-core 0.16.2 → 0.18.0

package/dist/src/unstable/workspace/service.js

@@ -2,10 +2,11 @@
  * WorkspaceMutations mutation facade implementation.
  *
  * This is the sole public gateway for all settings and lockfile read/write
- * operations. It reads through `WorkspaceReadModel` and calls the write I/O
- * functions (`writeSettings`, `writeLockfile`) directly while managing mutation
- * serialization via a single Semaphore(1). No other service should perform
- * settings or lockfile I/O in production; the per-service semaphores in
+ * operations. It reads through `WorkspaceReadModel`, writes settings directly,
+ * and commits lockfile snapshots through the lockfile module so cross-process
+ * updates are serialized and merged per entry. It also serializes in-process
+ * mutations via a single Semaphore(1). No other service should perform settings
+ * or lockfile I/O in production; the per-service semaphores in
  * `settings/service.ts` and `lockfile/service.ts` have been removed.
  *
  * Supporting logic is split into focused modules:
@@ -21,13 +22,14 @@ import * as Path from "effect/Path";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as Semaphore from "effect/Semaphore";
-import { LOCKFILE_NAME, LOCKFILE_VERSION, makeRegistryPackLockEntry, writeLockfile, } from "../lockfile/index.js";
+import { LOCKFILE_NAME, LOCKFILE_VERSION, commitLockfileSnapshotUpdate, makeRegistryLibraryLockEntry, makeRegistryPackLockEntry, } from "../lockfile/index.js";
 import { computeSkillPaths } from "../skills/paths.js";
 import { computePackPaths } from "../packs/paths.js";
 import { sanitizeName } from "../extensions/utils.js";
 import { ConfigurableAgentIdSchema, decodeExtensionNameSync, formatFqn, parseExtensionFqnParts, parseRegistrySourcePatternParts, } from "../extensions/index.js";
 import { makeAppError } from "../app-error/index.js";
 import { createDefaultSettings, SETTINGS_FILENAME, writeSettings, } from "../settings/index.js";
+import { DEFAULT_MINIMUM_RELEASE_AGE } from "../registry/index.js";
 import { lockEntryToSourceParams, printSourceParams } from "../sources/index.js";
 import { makeAbsolutePath } from "../utils/path-types.js";
 import { getAxmDir } from "./paths.js";
@@ -274,6 +276,19 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 return Option.some(globalSettings.owner);
             return Option.none();
         }),
+        getMinimumReleaseAge: Effect.fn("WorkspaceMutations.getMinimumReleaseAge")(function* () {
+            const scopedSettings = yield* readSettingsSafe(workspaceDir);
+            if (scopedSettings.minimumReleaseAge !== undefined) {
+                return scopedSettings.minimumReleaseAge;
+            }
+            if (options.scope === "project") {
+                const globalSettings = yield* readSettingsSafe(globalDir);
+                if (globalSettings.minimumReleaseAge !== undefined) {
+                    return globalSettings.minimumReleaseAge;
+                }
+            }
+            return DEFAULT_MINIMUM_RELEASE_AGE;
+        }),
         addConfiguredSource: (source) => withMutex(Effect.gen(function* () {
             const current = yield* readSettingsSafe(workspaceDir);
             const currentSources = current.sources ?? [];
@@ -337,7 +352,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setFiles")),
         setFilesLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
             const currentLockfile = yield* readLockfileSafe(workspaceDir);
@@ -354,7 +369,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setFilesLock")),
         removeFiles: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -376,7 +391,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 })()
                 : currentLockfile;
             yield* writeSettings(workspaceDir, remainingSettings).pipe(Effect.provide(fsLayer));
-            yield* writeLockfile(workspaceDir, remainingLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, remainingLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeFiles")),
         removeFilesSettings: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -397,10 +412,11 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 return;
             const { [name]: _, ...remainingContext } = currentLockedContext;
             void _;
-            yield* writeLockfile(workspaceDir, {
+            const updatedLockfile = {
                 ...currentLockfile,
                 files: remainingContext,
-            }).pipe(Effect.provide(fsLayer));
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeFilesLock")),
         updateFilesEntry: (name, updater) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -449,7 +465,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
             const currentLockfile = yield* readLockfileSafe(workspaceDir);
             const currentLockedRules = currentLockfile.rules ?? {};
             const previous = currentLockedRules[name];
-            yield* writeLockfile(workspaceDir, {
+            const updatedLockfile = {
                 ...currentLockfile,
                 rules: {
                     ...currentLockedRules,
@@ -459,13 +475,14 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                         updatedAt: new Date(),
                     },
                 },
-            }).pipe(Effect.provide(fsLayer));
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setRule")),
         setRuleLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
             const currentLockfile = yield* readLockfileSafe(workspaceDir);
             const currentLockedRules = currentLockfile.rules ?? {};
             const previous = currentLockedRules[name];
-            yield* writeLockfile(workspaceDir, {
+            const updatedLockfile = {
                 ...currentLockfile,
                 rules: {
                     ...currentLockedRules,
@@ -475,7 +492,8 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                         updatedAt: new Date(),
                     },
                 },
-            }).pipe(Effect.provide(fsLayer));
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setRuleLock")),
         removeRule: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -497,7 +515,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 })()
                 : currentLockfile;
             yield* writeSettings(workspaceDir, remainingSettings).pipe(Effect.provide(fsLayer));
-            yield* writeLockfile(workspaceDir, remainingLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, remainingLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeRule")),
         removeRuleSettings: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -518,10 +536,11 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 return;
             const { [name]: _, ...remainingRules } = currentLockedRules;
             void _;
-            yield* writeLockfile(workspaceDir, {
+            const updatedLockfile = {
                 ...currentLockfile,
                 rules: remainingRules,
-            }).pipe(Effect.provide(fsLayer));
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeRuleLock")),
         updateRuleEntry: (name, updater) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -570,7 +589,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
             const currentLockfile = yield* readLockfileSafe(workspaceDir);
             const currentLockedHooks = currentLockfile.hooks ?? {};
             const previous = currentLockedHooks[name];
-            yield* writeLockfile(workspaceDir, {
+            const updatedLockfile = {
                 ...currentLockfile,
                 hooks: {
                     ...currentLockedHooks,
@@ -580,13 +599,14 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                         updatedAt: new Date(),
                     },
                 },
-            }).pipe(Effect.provide(fsLayer));
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setHook")),
         setHookLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
             const currentLockfile = yield* readLockfileSafe(workspaceDir);
             const currentLockedHooks = currentLockfile.hooks ?? {};
             const previous = currentLockedHooks[name];
-            yield* writeLockfile(workspaceDir, {
+            const updatedLockfile = {
                 ...currentLockfile,
                 hooks: {
                     ...currentLockedHooks,
@@ -596,7 +616,8 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                         updatedAt: new Date(),
                     },
                 },
-            }).pipe(Effect.provide(fsLayer));
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setHookLock")),
         removeHook: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -618,7 +639,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 })()
                 : currentLockfile;
             yield* writeSettings(workspaceDir, remainingSettings).pipe(Effect.provide(fsLayer));
-            yield* writeLockfile(workspaceDir, remainingLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, remainingLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeHook")),
         removeHookSettings: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -639,10 +660,11 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 return;
             const { [name]: _, ...remainingHooks } = currentLockedHooks;
             void _;
-            yield* writeLockfile(workspaceDir, {
+            const updatedLockfile = {
                 ...currentLockfile,
                 hooks: remainingHooks,
-            }).pipe(Effect.provide(fsLayer));
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeHookLock")),
         updateHookEntry: (name, updater) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -733,7 +755,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setSkill")),
         setSkillLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
             // Update lockfile only (skip settings) — used for pack dependencies
@@ -751,7 +773,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setSkillLock")),
         removeSkill: (name) => withMutex(Effect.gen(function* () {
             // Update settings
@@ -771,7 +793,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 const { [name]: __, ...remainingLockSkills } = currentLockfile.skills;
                 void __;
                 const updatedLockfile = { ...currentLockfile, skills: remainingLockSkills };
-                yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
             }
         })).pipe(Effect.withSpan("WorkspaceMutations.removeSkill")),
         removeSkillFromSettings: (name) => withMutex(Effect.gen(function* () {
@@ -814,7 +836,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     [name]: { ...oldEntry, agents: [...agents] },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })),
         addConfiguredAgent: (agentId) => withMutex(Effect.gen(function* () {
             const validId = yield* Schema.decodeUnknownEffect(ConfigurableAgentIdSchema)(agentId).pipe(Effect.mapError((error) => makeAppError({
@@ -885,7 +907,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setPack")),
         setPackEntry: (name, entry) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -913,9 +935,65 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                 const { [name]: __, ...remainingLockedPacks } = currentLockedPacks;
                 void __;
                 const updatedLockfile = { ...currentLockfile, packs: remainingLockedPacks };
-                yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
             }
         })).pipe(Effect.withSpan("WorkspaceMutations.removePack")),
+        getConfiguredLibraryEntries: () => readSettingsSafe(workspaceDir).pipe(Effect.map((s) => s.libraries ?? {}), Effect.withSpan("WorkspaceMutations.getConfiguredLibraryEntries")),
+        getLockedLibraries: () => readLockfileSafe(workspaceDir).pipe(Effect.map((lf) => lf.libraries ?? {})),
+        getLockedLibrary: (name) => readLockfileSafe(workspaceDir).pipe(Effect.map((lf) => Option.fromUndefinedOr((lf.libraries ?? {})[name]))),
+        setLibrary: (args) => withMutex(Effect.gen(function* () {
+            const { source, name, ...lockFields } = args;
+            const lockEntry = makeRegistryLibraryLockEntry({
+                ...lockFields,
+                name,
+            });
+            const currentSettings = yield* readSettingsSafe(workspaceDir);
+            const currentLibraries = currentSettings.libraries ?? {};
+            const existing = currentLibraries[name];
+            const enabled = existing?.enabled ?? true;
+            const authored = existing?.authored ?? false;
+            const updatedSettings = {
+                ...currentSettings,
+                libraries: { ...currentLibraries, [name]: { source, enabled, authored } },
+            };
+            yield* writeSettings(workspaceDir, updatedSettings).pipe(Effect.provide(fsLayer));
+            const currentLockfile = yield* readLockfileSafe(workspaceDir);
+            const currentLockedLibraries = currentLockfile.libraries ?? {};
+            const updatedLockfile = {
+                ...currentLockfile,
+                libraries: {
+                    ...currentLockedLibraries,
+                    [name]: {
+                        ...lockEntry,
+                        updatedAt: new Date(),
+                    },
+                },
+            };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
+        })).pipe(Effect.withSpan("WorkspaceMutations.setLibrary")),
+        setLibraryEntry: (name, entry) => withMutex(Effect.gen(function* () {
+            const currentSettings = yield* readSettingsSafe(workspaceDir);
+            const currentLibraries = currentSettings.libraries ?? {};
+            const updatedSettings = {
+                ...currentSettings,
+                libraries: { ...currentLibraries, [name]: entry },
+            };
+            yield* writeSettings(workspaceDir, updatedSettings).pipe(Effect.provide(fsLayer));
+        })).pipe(Effect.withSpan("WorkspaceMutations.setLibraryEntry")),
+        removeLibrary: (name) => withMutex(Effect.gen(function* () {
+            const currentSettings = yield* readSettingsSafe(workspaceDir);
+            const currentLibraries = currentSettings.libraries ?? {};
+            const { [name]: removedLibrary, ...remainingLibraries } = currentLibraries;
+            void removedLibrary;
+            const updatedSettings = { ...currentSettings, libraries: remainingLibraries };
+            yield* writeSettings(workspaceDir, updatedSettings).pipe(Effect.provide(fsLayer));
+            const currentLockfile = yield* readLockfileSafe(workspaceDir);
+            const currentLockedLibraries = currentLockfile.libraries ?? {};
+            const { [name]: removedLock, ...remainingLockedLibraries } = currentLockedLibraries;
+            void removedLock;
+            const updatedLockfile = { ...currentLockfile, libraries: remainingLockedLibraries };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
+        })).pipe(Effect.withSpan("WorkspaceMutations.removeLibrary")),
         getPackDir: (name, owner) => Effect.succeed(computePackPaths(path.join, baseDir, owner, name)),
         // -----------------------------------------------------------------------
         // Command methods
@@ -952,7 +1030,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setCommand")),
         setCommandLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
             // Update lockfile only (skip settings) — used for pack dependencies
@@ -968,7 +1046,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })),
         removeCommand: (name) => withMutex(Effect.gen(function* () {
             // Update settings
@@ -991,7 +1069,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     ...currentLockfile,
                     commands: remainingLockedCommands,
                 };
-                yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
             }
         })).pipe(Effect.withSpan("WorkspaceMutations.removeCommand")),
         updateCommandEntry: (name, updater) => withMutex(Effect.gen(function* () {
@@ -1059,7 +1137,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setSubagent")),
         setSubagentLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
             // Update lockfile only (skip settings) — used for pack dependencies
@@ -1078,7 +1156,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })),
         removeSubagent: (name) => withMutex(Effect.gen(function* () {
             // Update settings
@@ -1101,7 +1179,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     ...currentLockfile,
                     subagents: remainingLockedSubagents,
                 };
-                yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
             }
         })).pipe(Effect.withSpan("WorkspaceMutations.removeSubagent")),
         updateSubagentEntry: (name, updater) => withMutex(Effect.gen(function* () {
@@ -1144,7 +1222,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
             const { [name]: _, ...remaining } = currentLockedSubagents;
             void _;
             const updatedLockfile = { ...currentLockfile, subagents: remaining };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeSubagentLock")),
         // -----------------------------------------------------------------------
         // MCP Server methods
@@ -1202,7 +1280,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.setMcpServer")),
         setMcpServerLock: ({ name, lockEntry }) => withMutex(Effect.gen(function* () {
             // Update lockfile only (skip settings) — used for pack dependencies
@@ -1218,7 +1296,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     },
                 },
             };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })),
         updateMcpServerEntry: (name, updater) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -1264,7 +1342,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                     ...currentLockfile,
                     mcpServers: remainingLockedMcpServers,
                 };
-                yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
             }
         })).pipe(Effect.withSpan("WorkspaceMutations.removeMcpServer")),
         // -----------------------------------------------------------------------
@@ -1277,7 +1355,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
             const { [name]: _, ...remainingSkills } = currentLockfile.skills;
             void _;
             const updatedLockfile = { ...currentLockfile, skills: remainingSkills };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })).pipe(Effect.withSpan("WorkspaceMutations.removeSkillLock")),
         removeCommandSettings: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -1297,7 +1375,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
             const { [name]: _, ...remainingCommands } = currentLockedCommands;
             void _;
             const updatedLockfile = { ...currentLockfile, commands: remainingCommands };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })),
         removeMcpServerSettings: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -1317,7 +1395,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
             const { [name]: _, ...remainingMcpServers } = currentLockedMcpServers;
             void _;
             const updatedLockfile = { ...currentLockfile, mcpServers: remainingMcpServers };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })),
         removePackSettings: (name) => withMutex(Effect.gen(function* () {
             const currentSettings = yield* readSettingsSafe(workspaceDir);
@@ -1337,7 +1415,27 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
             const { [name]: _, ...remainingPacks } = currentLockedPacks;
             void _;
             const updatedLockfile = { ...currentLockfile, packs: remainingPacks };
-            yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
+        })),
+        removeLibrarySettings: (name) => withMutex(Effect.gen(function* () {
+            const currentSettings = yield* readSettingsSafe(workspaceDir);
+            const currentLibraries = currentSettings.libraries ?? {};
+            if (!(name in currentLibraries))
+                return;
+            const { [name]: _, ...remainingLibraries } = currentLibraries;
+            void _;
+            const updatedSettings = { ...currentSettings, libraries: remainingLibraries };
+            yield* writeSettings(workspaceDir, updatedSettings).pipe(Effect.provide(fsLayer));
+        })),
+        removeLibraryLock: (name) => withMutex(Effect.gen(function* () {
+            const currentLockfile = yield* readLockfileSafe(workspaceDir);
+            const currentLockedLibraries = currentLockfile.libraries ?? {};
+            if (!(name in currentLockedLibraries))
+                return;
+            const { [name]: _, ...remainingLibraries } = currentLockedLibraries;
+            void _;
+            const updatedLockfile = { ...currentLockfile, libraries: remainingLibraries };
+            yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
         })),
         // -----------------------------------------------------------------------
         // Pack dependency queries
@@ -1383,7 +1481,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                             [target.name]: { ...entry, retainedByPack: true },
                         },
                     };
-                    yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                    yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
                     break;
                 }
                 case "command": {
@@ -1398,7 +1496,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                             [target.name]: { ...entry, retainedByPack: true },
                         },
                     };
-                    yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                    yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
                     break;
                 }
                 case "mcp-server": {
@@ -1413,7 +1511,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                             [target.name]: { ...entry, retainedByPack: true },
                         },
                     };
-                    yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                    yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
                     break;
                 }
                 case "files": {
@@ -1428,7 +1526,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                             [target.name]: { ...entry, retainedByPack: true },
                         },
                     };
-                    yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                    yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
                     break;
                 }
                 case "rule": {
@@ -1443,7 +1541,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                             [target.name]: { ...entry, retainedByPack: true },
                         },
                     };
-                    yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                    yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
                     break;
                 }
                 case "hook": {
@@ -1458,7 +1556,7 @@ export const loadWorkspace = (options) => Effect.gen(function* () {
                             [target.name]: { ...entry, retainedByPack: true },
                         },
                     };
-                    yield* writeLockfile(workspaceDir, updatedLockfile).pipe(Effect.provide(fsLayer));
+                    yield* commitLockfileSnapshotUpdate(workspaceDir, currentLockfile, updatedLockfile).pipe(Effect.provide(fsLayer));
                     break;
                 }
                 case "pack":