@mcp-abap-adt/adt-clients 7.3.1 → 7.4.2

package/dist/core/domain/AdtDomain.js

@@ -21,6 +21,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdtDomain = void 0;
 const internalUtils_1 = require("../../utils/internalUtils");
+const LockRegistry_1 = require("../shared/LockRegistry");
 const versions_1 = require("../shared/versions");
 const activation_1 = require("./activation");
 const check_1 = require("./check");
@@ -35,11 +36,13 @@ class AdtDomain {
     connection;
     logger;
     systemContext;
+    lockTracker;
     objectType = 'Domain';
-    constructor(connection, logger, systemContext) {
+    constructor(connection, logger, systemContext, lockRegistry) {
         this.connection = connection;
         this.logger = logger;
         this.systemContext = systemContext ?? {};
+        this.lockTracker = (0, LockRegistry_1.createLockTracker)(lockRegistry, this.objectType, (domainName, lockHandle) => (0, unlock_1.unlockDomain)(this.connection, domainName, lockHandle));
     }
     /**
      * Validate domain configuration before creation
@@ -230,6 +233,7 @@ class AdtDomain {
             this.connection.setSessionType('stateful');
             lockHandle = await (0, lock_1.lockDomain)(this.connection, config.domainName);
             state.lockHandle = lockHandle;
+            this.lockTracker.track(config.domainName, lockHandle);
             this.logger?.info?.('locked');
             // 2. Check inactive with XML for update (if provided)
             const xmlToCheck = options?.xmlContent;
@@ -280,6 +284,7 @@ class AdtDomain {
                 const unlockResponse = await (0, unlock_1.unlockDomain)(this.connection, config.domainName, lockHandle);
                 state.unlockResult = unlockResponse;
                 this.connection.setSessionType('stateless');
+                this.lockTracker.untrack(config.domainName);
                 lockHandle = undefined;
                 this.logger?.info?.('unlocked');
             }
@@ -323,8 +328,11 @@ class AdtDomain {
                     this.connection.setSessionType('stateful');
                     await (0, unlock_1.unlockDomain)(this.connection, config.domainName, lockHandle);
                     this.connection.setSessionType('stateless');
+                    this.lockTracker.untrack(config.domainName);
                 }
                 catch (unlockError) {
+                    // Cleanup unlock failed — the lock stays tracked so unlockAll() (or
+                    // session-drop) remains the last resort.
                     this.logger?.warn?.('Failed to unlock during cleanup:', (0, internalUtils_1.safeErrorMessage)(unlockError));
                 }
             }
@@ -462,6 +470,7 @@ class AdtDomain {
         }
         this.connection.setSessionType('stateful');
         const lockHandle = await (0, lock_1.lockDomain)(this.connection, config.domainName);
+        this.lockTracker.track(config.domainName, lockHandle);
         return lockHandle;
     }
     /**
@@ -474,6 +483,7 @@ class AdtDomain {
         this.connection.setSessionType('stateful');
         const result = await (0, unlock_1.unlockDomain)(this.connection, config.domainName, lockHandle);
         this.connection.setSessionType('stateless');
+        this.lockTracker.untrack(config.domainName);
         return {
             unlockResult: result,
             errors: [],

package/dist/core/enhancement/AdtEnhancement.d.ts

@@ -26,14 +26,25 @@
  */
 import type { IAbapConnection, IAdtObject, IAdtOperationOptions, ILogger } from '@mcp-abap-adt/interfaces';
 import type { IAdtSystemContext } from '../../clients/AdtClient';
+import type { LockRegistry } from '../shared/LockRegistry';
 import type { IReadOptions } from '../shared/types';
 import { type IEnhancementConfig, type IEnhancementState } from './types';
 export declare class AdtEnhancement implements IAdtObject<IEnhancementConfig, IEnhancementState> {
     private readonly connection;
     private readonly logger?;
     private readonly systemContext;
+    private readonly lockRegistry?;
     readonly objectType: string;
-    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext);
+    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, lockRegistry?: LockRegistry);
+    /** Registry key for a held enhancement lock (e.g. `Enhancement/ZFOO`). */
+    private lockKey;
+    /**
+     * Record a held lock. Enhancement unlock needs the enhancement type, so the
+     * unlock thunk captures it alongside the name and handle.
+     */
+    private trackLock;
+    /** Drop a lock from the registry after a clean unlock. */
+    private untrackLock;
     /**
      * Validate enhancement configuration before creation
      */

package/dist/core/enhancement/AdtEnhancement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdtEnhancement.d.ts","sourceRoot":"","sources":["../../../src/core/enhancement/AdtEnhancement.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAEV,eAAe,EACf,UAAU,EACV,oBAAoB,EACpB,OAAO,EACR,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAWpD,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAEvB,MAAM,SAAS,CAAC;AASjB,qBAAa,cACX,YAAW,UAAU,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IAE5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAU;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,SAAgB,UAAU,EAAE,MAAM,CAAiB;gBAGjD,UAAU,EAAE,eAAe,EAC3B,MAAM,CAAC,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,iBAAiB;IAOnC;;OAEG;IACG,QAAQ,CACZ,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAClC,OAAO,CAAC,iBAAiB,CAAC;IAqC7B;;OAEG;IACG,MAAM,CACV,MAAM,EAAE,kBAAkB,EAC1B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,iBAAiB,CAAC;IA2E7B;;OAEG;IACG,IAAI,CACR,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACnC,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU,EAC/B,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAqDzC;;OAEG;IACG,YAAY,CAChB,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACnC,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,iBAAiB,CAAC;IAgD7B;;OAEG;IACG,aAAa,CACjB,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACnC,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GACtC,OAAO,CAAC,iBAAiB,CAAC;IA+C7B;;;;;OAKG;IACG,MAAM,CACV,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACnC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,iBAAiB,CAAC;IAkP7B;;OAEG;IACG,MAAM,CACV,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAClC,OAAO,CAAC,iBAAiB,CAAC;IAiD7B;;;OAGG;IACG,QAAQ,CACZ,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAClC,OAAO,CAAC,iBAAiB,CAAC;IAqC7B;;OAEG;IACG,KAAK,CACT,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACnC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,CAAC;IAoC7B;;OAEG;IACG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAchE;;OAEG;IACG,MAAM,CACV,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACnC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC;IAoB7B,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC;IAI/C,gBAAgB,CAAC,UAAU,EAAE,MAAM;CAGpC"}
+{"version":3,"file":"AdtEnhancement.d.ts","sourceRoot":"","sources":["../../../src/core/enhancement/AdtEnhancement.ts"],"names":[],"mappings":"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"}

package/dist/core/enhancement/AdtEnhancement.js

@@ -43,11 +43,33 @@ class AdtEnhancement {
     connection;
     logger;
     systemContext;
+    lockRegistry;
     objectType = 'Enhancement';
-    constructor(connection, logger, systemContext) {
+    constructor(connection, logger, systemContext, lockRegistry) {
         this.connection = connection;
         this.logger = logger;
         this.systemContext = systemContext ?? {};
+        this.lockRegistry = lockRegistry;
+    }
+    /** Registry key for a held enhancement lock (e.g. `Enhancement/ZFOO`). */
+    lockKey(name) {
+        return `${this.objectType}/${name.toUpperCase()}`;
+    }
+    /**
+     * Record a held lock. Enhancement unlock needs the enhancement type, so the
+     * unlock thunk captures it alongside the name and handle.
+     */
+    trackLock(type, name, lockHandle) {
+        if (!type || !name)
+            return;
+        // Raw unlock — LockRegistry.unlockAll() manages the session for the batch.
+        this.lockRegistry?.track(this.lockKey(name), () => (0, unlock_1.unlockEnhancement)(this.connection, type, name, lockHandle));
+    }
+    /** Drop a lock from the registry after a clean unlock. */
+    untrackLock(name) {
+        if (!name)
+            return;
+        this.lockRegistry?.untrack(this.lockKey(name));
     }
     /**
      * Validate enhancement configuration before creation
@@ -327,6 +349,7 @@ class AdtEnhancement {
             this.connection.setSessionType('stateful');
             lockHandle = await (0, lock_1.lockEnhancement)(this.connection, config.enhancementType, config.enhancementName);
             state.lockHandle = lockHandle;
+            this.trackLock(config.enhancementType, config.enhancementName, lockHandle);
             this.logger?.info?.('Enhancement locked, handle:', lockHandle);
             // 2. Check inactive with code for update (from options or config)
             const codeToCheck = options?.sourceCode || config.sourceCode;
@@ -348,13 +371,14 @@ class AdtEnhancement {
                 }, this.logger);
                 state.updateResult = updateResponse;
                 this.logger?.info?.('Enhancement updated');
+                // Poll the inactive version: the write above produced it; the active version may not exist yet.
                 // 3.5. Read with long polling (wait for object to be ready after update)
                 this.logger?.info?.('read (wait for object ready after update)');
                 try {
                     await this.read({
                         enhancementName: config.enhancementName,
                         enhancementType: config.enhancementType,
-                    }, 'active', { withLongPolling: true });
+                    }, 'inactive', { withLongPolling: true });
                     this.logger?.info?.('object is ready after update');
                 }
                 catch (readError) {
@@ -368,6 +392,7 @@ class AdtEnhancement {
                 const unlockResponse = await (0, unlock_1.unlockEnhancement)(this.connection, config.enhancementType, config.enhancementName, lockHandle);
                 state.unlockResult = unlockResponse;
                 this.connection.setSessionType('stateless');
+                this.untrackLock(config.enhancementName);
                 lockHandle = undefined;
                 this.logger?.info?.('Enhancement unlocked');
             }
@@ -396,8 +421,11 @@ class AdtEnhancement {
                 }
                 return state;
             }
-            // Read and return result (no stateful needed)
-            const readResponse = await (0, read_1.getEnhancementSource)(this.connection, config.enhancementType, config.enhancementName);
+            // Read and return result (no stateful needed).
+            // No activation happened: return the version just written (inactive,
+            // i.e. workingArea in the enhancement URI dialect), not the stale active
+            // one. getEnhancementSource defaults to 'active', so pass it explicitly.
+            const readResponse = await (0, read_1.getEnhancementSource)(this.connection, config.enhancementType, config.enhancementName, 'inactive');
             state.readResult = readResponse;
             return state;
         }
@@ -409,6 +437,7 @@ class AdtEnhancement {
                     this.connection.setSessionType('stateful');
                     await (0, unlock_1.unlockEnhancement)(this.connection, config.enhancementType, config.enhancementName, lockHandle);
                     this.connection.setSessionType('stateless');
+                    this.untrackLock(config.enhancementName);
                 }
                 catch (unlockError) {
                     this.logger?.warn?.('Failed to unlock during cleanup:', (0, internalUtils_1.safeErrorMessage)(unlockError));
@@ -559,6 +588,7 @@ class AdtEnhancement {
         }
         this.connection.setSessionType('stateful');
         const lockHandle = await (0, lock_1.lockEnhancement)(this.connection, config.enhancementType, config.enhancementName);
+        this.trackLock(config.enhancementType, config.enhancementName, lockHandle);
         return lockHandle;
     }
     /**
@@ -571,6 +601,7 @@ class AdtEnhancement {
         this.connection.setSessionType('stateful');
         const result = await (0, unlock_1.unlockEnhancement)(this.connection, config.enhancementType, config.enhancementName, lockHandle);
         this.connection.setSessionType('stateless');
+        this.untrackLock(config.enhancementName);
         return {
             unlockResult: result,
             errors: [],

package/dist/core/featureToggle/AdtFeatureToggle.d.ts

@@ -20,14 +20,16 @@
  */
 import type { IAbapConnection, IAdtOperationOptions, ILogger, IObjectVersion } from '@mcp-abap-adt/interfaces';
 import type { IAdtSystemContext } from '../../clients/AdtClient';
+import { type LockRegistry } from '../shared/LockRegistry';
 import { type IReadOptions } from './read';
 import type { IFeatureToggleConfig, IFeatureToggleObject, IFeatureToggleState } from './types';
 export declare class AdtFeatureToggle implements IFeatureToggleObject {
     private readonly connection;
     private readonly logger?;
     private readonly systemContext;
+    private readonly lockTracker;
     readonly objectType: string;
-    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext);
+    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, lockRegistry?: LockRegistry);
     /**
      * Map camelCase config to the snake_case low-level params.
      * `source` is passed through unchanged (it is a structured JSON object,

package/dist/core/featureToggle/AdtFeatureToggle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdtFeatureToggle.d.ts","sourceRoot":"","sources":["../../../src/core/featureToggle/AdtFeatureToggle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AdtFeatureToggle.d.ts","sourceRoot":"","sources":["../../../src/core/featureToggle/AdtFeatureToggle.ts"],"names":[],"mappings":"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"}

package/dist/core/featureToggle/AdtFeatureToggle.js

@@ -22,6 +22,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdtFeatureToggle = void 0;
 const internalUtils_1 = require("../../utils/internalUtils");
+const LockRegistry_1 = require("../shared/LockRegistry");
 const versions_1 = require("../shared/versions");
 const activation_1 = require("./activation");
 const check_1 = require("./check");
@@ -41,11 +42,13 @@ class AdtFeatureToggle {
     connection;
     logger;
     systemContext;
+    lockTracker;
     objectType = 'FeatureToggle';
-    constructor(connection, logger, systemContext) {
+    constructor(connection, logger, systemContext, lockRegistry) {
         this.connection = connection;
         this.logger = logger;
         this.systemContext = systemContext ?? {};
+        this.lockTracker = (0, LockRegistry_1.createLockTracker)(lockRegistry, this.objectType, (featureToggleName, lockHandle) => (0, unlock_1.unlockFeatureToggle)(this.connection, featureToggleName, lockHandle));
     }
     /**
      * Map camelCase config to the snake_case low-level params.
@@ -112,6 +115,7 @@ class AdtFeatureToggle {
                 this.connection.setSessionType('stateful');
                 lockHandle = await (0, lock_1.lockFeatureToggle)(this.connection, config.featureToggleName, this.logger);
                 state.lockHandle = lockHandle;
+                this.lockTracker.track(config.featureToggleName, lockHandle);
                 config.onLock?.(lockHandle);
                 this.logger?.info?.('Feature toggle locked, handle:', lockHandle);
                 // 2. Upload source
@@ -121,6 +125,7 @@ class AdtFeatureToggle {
                 this.connection.setSessionType('stateful');
                 await (0, unlock_1.unlockFeatureToggle)(this.connection, config.featureToggleName, lockHandle);
                 this.connection.setSessionType('stateless');
+                this.lockTracker.untrack(config.featureToggleName);
                 lockHandle = undefined;
                 this.logger?.info?.('Feature toggle unlocked');
                 // 4. Activate
@@ -137,6 +142,7 @@ class AdtFeatureToggle {
                     this.logger?.warn?.('Unlocking feature toggle during create error cleanup');
                     this.connection.setSessionType('stateful');
                     await (0, unlock_1.unlockFeatureToggle)(this.connection, config.featureToggleName, lockHandle);
+                    this.lockTracker.untrack(config.featureToggleName);
                 }
                 catch (unlockError) {
                     this.logger?.warn?.('Failed to unlock during cleanup:', (0, internalUtils_1.safeErrorMessage)(unlockError));
@@ -259,6 +265,7 @@ class AdtFeatureToggle {
             this.connection.setSessionType('stateful');
             lockHandle = await (0, lock_1.lockFeatureToggle)(this.connection, fullConfig.featureToggleName, this.logger);
             state.lockHandle = lockHandle;
+            this.lockTracker.track(fullConfig.featureToggleName, lockHandle);
             fullConfig.onLock?.(lockHandle);
             this.logger?.info?.('Feature toggle locked, handle:', lockHandle);
             // 2. Check inactive with XML for update (if provided)
@@ -279,10 +286,11 @@ class AdtFeatureToggle {
                 await (0, updateSource_1.uploadFeatureToggleSource)(this.connection, fullConfig.featureToggleName, fullConfig.source, lockHandle, fullConfig.transportRequest);
                 this.logger?.info?.('Feature toggle source uploaded');
             }
+            // Poll the inactive version: the write above produced it; the active version may not exist yet.
             // 3.5. Read with long polling to ensure object is ready after update
             this.logger?.info?.('read (wait for object ready after update)');
             try {
-                const readState = await this.read({ featureToggleName: fullConfig.featureToggleName }, 'active', { withLongPolling: true });
+                const readState = await this.read({ featureToggleName: fullConfig.featureToggleName }, 'inactive', { withLongPolling: true });
                 if (readState) {
                     state.readResult = readState.readResult;
                 }
@@ -296,6 +304,7 @@ class AdtFeatureToggle {
             this.connection.setSessionType('stateful');
             await (0, unlock_1.unlockFeatureToggle)(this.connection, fullConfig.featureToggleName, lockHandle);
             this.connection.setSessionType('stateless');
+            this.lockTracker.untrack(fullConfig.featureToggleName);
             lockHandle = undefined;
             this.logger?.info?.('Feature toggle unlocked');
             // 5. Final check
@@ -331,6 +340,7 @@ class AdtFeatureToggle {
                     this.connection.setSessionType('stateful');
                     await (0, unlock_1.unlockFeatureToggle)(this.connection, fullConfig.featureToggleName, lockHandle);
                     this.connection.setSessionType('stateless');
+                    this.lockTracker.untrack(fullConfig.featureToggleName);
                 }
                 catch (unlockError) {
                     this.logger?.warn?.('Failed to unlock during cleanup:', (0, internalUtils_1.safeErrorMessage)(unlockError));
@@ -431,6 +441,7 @@ class AdtFeatureToggle {
         }
         this.connection.setSessionType('stateful');
         const lockHandle = await (0, lock_1.lockFeatureToggle)(this.connection, config.featureToggleName, this.logger);
+        this.lockTracker.track(config.featureToggleName, lockHandle);
         return lockHandle;
     }
     /**
@@ -443,6 +454,7 @@ class AdtFeatureToggle {
         this.connection.setSessionType('stateful');
         await (0, unlock_1.unlockFeatureToggle)(this.connection, config.featureToggleName, lockHandle);
         this.connection.setSessionType('stateless');
+        this.lockTracker.untrack(config.featureToggleName);
         return { errors: [] };
     }
     // ---------------------------------------------------------------------------

package/dist/core/functionGroup/AdtFunctionGroup.d.ts

@@ -23,6 +23,7 @@
 import type { IAbapConnection, IAdtObject, IAdtOperationOptions, ILogger, IObjectVersion } from '@mcp-abap-adt/interfaces';
 import type { IAdtSystemContext } from '../../clients/AdtClient';
 import type { IAdtContentTypes } from '../shared/contentTypes';
+import { type LockRegistry } from '../shared/LockRegistry';
 import type { IReadOptions } from '../shared/types';
 import type { IFunctionGroupConfig, IFunctionGroupState } from './types';
 export declare class AdtFunctionGroup implements IAdtObject<IFunctionGroupConfig, IFunctionGroupState> {
@@ -30,8 +31,9 @@ export declare class AdtFunctionGroup implements IAdtObject<IFunctionGroupConfig
     protected readonly logger?: ILogger;
     protected readonly systemContext: IAdtSystemContext;
     protected readonly contentTypes?: IAdtContentTypes;
+    private readonly lockTracker;
     readonly objectType: string;
-    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, contentTypes?: IAdtContentTypes);
+    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, contentTypes?: IAdtContentTypes, lockRegistry?: LockRegistry);
     /**
      * Validate function group configuration before creation
      */

package/dist/core/functionGroup/AdtFunctionGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdtFunctionGroup.d.ts","sourceRoot":"","sources":["../../../src/core/functionGroup/AdtFunctionGroup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AdtFunctionGroup.d.ts","sourceRoot":"","sources":["../../../src/core/functionGroup/AdtFunctionGroup.ts"],"names":[],"mappings":"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"}

package/dist/core/functionGroup/AdtFunctionGroup.js

@@ -24,6 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdtFunctionGroup = void 0;
 const internalUtils_1 = require("../../utils/internalUtils");
+const LockRegistry_1 = require("../shared/LockRegistry");
 const versions_1 = require("../shared/versions");
 const activation_1 = require("./activation");
 const check_1 = require("./check");
@@ -38,12 +39,14 @@ class AdtFunctionGroup {
     logger;
     systemContext;
     contentTypes;
+    lockTracker;
     objectType = 'FunctionGroup';
-    constructor(connection, logger, systemContext, contentTypes) {
+    constructor(connection, logger, systemContext, contentTypes, lockRegistry) {
         this.connection = connection;
         this.logger = logger;
         this.systemContext = systemContext ?? {};
         this.contentTypes = contentTypes;
+        this.lockTracker = (0, LockRegistry_1.createLockTracker)(lockRegistry, this.objectType, (functionGroupName, lockHandle) => (0, lock_1.unlockFunctionGroup)(this.connection, functionGroupName, lockHandle));
     }
     /**
      * Validate function group configuration before creation
@@ -345,6 +348,7 @@ class AdtFunctionGroup {
             this.logger?.info?.('Step 1: Locking function group');
             this.connection.setSessionType('stateful');
             lockHandle = await (0, lock_1.lockFunctionGroup)(this.connection, config.functionGroupName, sessionId);
+            this.lockTracker.track(config.functionGroupName, lockHandle);
             this.logger?.info?.('Function group locked, handle:', lockHandle);
             // 2. Update metadata (description)
             this.logger?.info?.('Step 2: Updating function group metadata');
@@ -371,6 +375,7 @@ class AdtFunctionGroup {
                 this.connection.setSessionType('stateful');
                 await (0, lock_1.unlockFunctionGroup)(this.connection, config.functionGroupName, lockHandle, sessionId);
                 this.connection.setSessionType('stateless');
+                this.lockTracker.untrack(config.functionGroupName);
                 lockHandle = undefined;
                 this.logger?.info?.('Function group unlocked');
             }
@@ -420,6 +425,7 @@ class AdtFunctionGroup {
                     this.connection.setSessionType('stateful');
                     await (0, lock_1.unlockFunctionGroup)(this.connection, config.functionGroupName, lockHandle, sessionId);
                     this.connection.setSessionType('stateless');
+                    this.lockTracker.untrack(config.functionGroupName);
                 }
                 catch (unlockError) {
                     this.logger?.warn?.('Failed to unlock during cleanup:', (0, internalUtils_1.safeErrorMessage)(unlockError));
@@ -515,6 +521,7 @@ class AdtFunctionGroup {
         }
         this.connection.setSessionType('stateful');
         const lockHandle = await (0, lock_1.lockFunctionGroup)(this.connection, config.functionGroupName);
+        this.lockTracker.track(config.functionGroupName, lockHandle);
         return lockHandle;
     }
     /**
@@ -527,6 +534,7 @@ class AdtFunctionGroup {
         this.connection.setSessionType('stateful');
         const result = await (0, lock_1.unlockFunctionGroup)(this.connection, config.functionGroupName, lockHandle);
         this.connection.setSessionType('stateless');
+        this.lockTracker.untrack(config.functionGroupName);
         return {
             unlockResult: result,
             errors: [],

package/dist/core/functionInclude/AdtFunctionInclude.d.ts

@@ -17,6 +17,7 @@
 import type { IAbapConnection, IAdtObject, IAdtOperationOptions, ILogger } from '@mcp-abap-adt/interfaces';
 import type { IAdtSystemContext } from '../../clients/AdtClient';
 import type { IAdtContentTypes } from '../shared/contentTypes';
+import type { LockRegistry } from '../shared/LockRegistry';
 import { type IReadOptions } from './read';
 import type { IFunctionIncludeConfig, IFunctionIncludeState } from './types';
 export declare class AdtFunctionInclude implements IAdtObject<IFunctionIncludeConfig, IFunctionIncludeState> {
@@ -24,8 +25,15 @@ export declare class AdtFunctionInclude implements IAdtObject<IFunctionIncludeCo
     protected readonly logger?: ILogger;
     protected readonly systemContext: IAdtSystemContext;
     protected readonly contentTypes?: IAdtContentTypes;
+    private readonly lockRegistry?;
     readonly objectType: string;
-    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, contentTypes?: IAdtContentTypes);
+    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, contentTypes?: IAdtContentTypes, lockRegistry?: LockRegistry);
+    /** Registry key for a held lock (nested: group + include). */
+    private lockKey;
+    /** Record a held lock; the unlock thunk needs the parent function group. */
+    private trackLock;
+    /** Drop a lock from the registry after a clean unlock. */
+    private untrackLock;
     /**
      * Map camelCase config to the snake_case low-level params.
      */

package/dist/core/functionInclude/AdtFunctionInclude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AdtFunctionInclude.d.ts","sourceRoot":"","sources":["../../../src/core/functionInclude/AdtFunctionInclude.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AdtFunctionInclude.d.ts","sourceRoot":"","sources":["../../../src/core/functionInclude/AdtFunctionInclude.ts"],"names":[],"mappings":"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"}

package/dist/core/functionInclude/AdtFunctionInclude.js

@@ -35,12 +35,31 @@ class AdtFunctionInclude {
     logger;
     systemContext;
     contentTypes;
+    lockRegistry;
     objectType = 'FunctionInclude';
-    constructor(connection, logger, systemContext, contentTypes) {
+    constructor(connection, logger, systemContext, contentTypes, lockRegistry) {
         this.connection = connection;
         this.logger = logger;
         this.systemContext = systemContext ?? {};
         this.contentTypes = contentTypes;
+        this.lockRegistry = lockRegistry;
+    }
+    /** Registry key for a held lock (nested: group + include). */
+    lockKey(group, includeName) {
+        return `${this.objectType}/${group.toUpperCase()}/${includeName.toUpperCase()}`;
+    }
+    /** Record a held lock; the unlock thunk needs the parent function group. */
+    trackLock(group, includeName, lockHandle) {
+        if (!group || !includeName)
+            return;
+        // Raw unlock — LockRegistry.unlockAll() manages the session for the batch.
+        this.lockRegistry?.track(this.lockKey(group, includeName), () => (0, unlock_1.unlockFunctionInclude)(this.connection, group, includeName, lockHandle));
+    }
+    /** Drop a lock from the registry after a clean unlock. */
+    untrackLock(group, includeName) {
+        if (!group || !includeName)
+            return;
+        this.lockRegistry?.untrack(this.lockKey(group, includeName));
     }
     /**
      * Map camelCase config to the snake_case low-level params.
@@ -121,6 +140,7 @@ class AdtFunctionInclude {
                 this.logger?.info?.('Step 2: Locking function include for source upload');
                 this.connection.setSessionType('stateful');
                 lockHandle = await (0, lock_1.lockFunctionInclude)(this.connection, config.functionGroupName, config.includeName, this.logger);
+                this.trackLock(config.functionGroupName, config.includeName, lockHandle);
                 state.lockHandle = lockHandle;
                 config.onLock?.(lockHandle);
                 this.logger?.info?.('Step 3: Uploading function include source');
@@ -129,6 +149,7 @@ class AdtFunctionInclude {
                 this.connection.setSessionType('stateful');
                 await (0, unlock_1.unlockFunctionInclude)(this.connection, config.functionGroupName, config.includeName, lockHandle);
                 this.connection.setSessionType('stateless');
+                this.untrackLock(config.functionGroupName, config.includeName);
                 lockHandle = undefined;
                 this.logger?.info?.('Step 5: Activating function include');
                 const activateResponse = await (0, activation_1.activateFunctionInclude)(this.connection, config.functionGroupName, config.includeName);
@@ -144,6 +165,7 @@ class AdtFunctionInclude {
                     this.connection.setSessionType('stateful');
                     await (0, unlock_1.unlockFunctionInclude)(this.connection, config.functionGroupName, config.includeName, lockHandle);
                     this.connection.setSessionType('stateless');
+                    this.untrackLock(config.functionGroupName, config.includeName);
                 }
                 catch (unlockError) {
                     this.logger?.warn?.('Failed to unlock during cleanup:', (0, internalUtils_1.safeErrorMessage)(unlockError));
@@ -310,6 +332,7 @@ class AdtFunctionInclude {
             this.connection.setSessionType('stateful');
             lockHandle = await (0, lock_1.lockFunctionInclude)(this.connection, fullConfig.functionGroupName, fullConfig.includeName, this.logger);
             state.lockHandle = lockHandle;
+            this.trackLock(fullConfig.functionGroupName, fullConfig.includeName, lockHandle);
             fullConfig.onLock?.(lockHandle);
             this.logger?.info?.('Function include locked, handle:', lockHandle);
             // 2. Check inactive with source code for update (if provided)
@@ -327,13 +350,14 @@ class AdtFunctionInclude {
             if (codeToCheck) {
                 this.logger?.info?.('Step 3b: Uploading function include source');
                 await (0, updateSource_1.uploadFunctionIncludeSource)(this.connection, fullConfig.functionGroupName, fullConfig.includeName, codeToCheck, lockHandle, this.isUnicode(), fullConfig.transportRequest);
+                // Poll the inactive version: the write above produced it; the active version may not exist yet.
                 // Wait for object to be ready after update
                 this.logger?.info?.('read (wait for object ready after update)');
                 try {
                     await this.readMetadataRaw({
                         functionGroupName: fullConfig.functionGroupName,
                         includeName: fullConfig.includeName,
-                    }, 'active', { withLongPolling: true });
+                    }, 'inactive', { withLongPolling: true });
                     this.logger?.info?.('object is ready after update');
                 }
                 catch (readError) {
@@ -345,6 +369,7 @@ class AdtFunctionInclude {
             this.connection.setSessionType('stateful');
             await (0, unlock_1.unlockFunctionInclude)(this.connection, fullConfig.functionGroupName, fullConfig.includeName, lockHandle);
             this.connection.setSessionType('stateless');
+            this.untrackLock(fullConfig.functionGroupName, fullConfig.includeName);
             lockHandle = undefined;
             // 5. Final check
             this.logger?.info?.('Step 5: Final check');
@@ -369,7 +394,9 @@ class AdtFunctionInclude {
                 }
             }
             else {
-                const readResponse = await (0, read_1.readFunctionInclude)(this.connection, fullConfig.functionGroupName, fullConfig.includeName, 'active');
+                // No activation happened: return the version just written (inactive),
+                // not the stale active one.
+                const readResponse = await (0, read_1.readFunctionInclude)(this.connection, fullConfig.functionGroupName, fullConfig.includeName, 'inactive');
                 state.readResult = readResponse;
             }
             return state;
@@ -381,6 +408,7 @@ class AdtFunctionInclude {
                     this.connection.setSessionType('stateful');
                     await (0, unlock_1.unlockFunctionInclude)(this.connection, fullConfig.functionGroupName, fullConfig.includeName, lockHandle);
                     this.connection.setSessionType('stateless');
+                    this.untrackLock(fullConfig.functionGroupName, fullConfig.includeName);
                 }
                 catch (unlockError) {
                     this.logger?.warn?.('Failed to unlock during cleanup:', (0, internalUtils_1.safeErrorMessage)(unlockError));
@@ -482,6 +510,7 @@ class AdtFunctionInclude {
         }
         this.connection.setSessionType('stateful');
         const lockHandle = await (0, lock_1.lockFunctionInclude)(this.connection, config.functionGroupName, config.includeName, this.logger);
+        this.trackLock(config.functionGroupName, config.includeName, lockHandle);
         return lockHandle;
     }
     /**
@@ -494,6 +523,7 @@ class AdtFunctionInclude {
         this.connection.setSessionType('stateful');
         await (0, unlock_1.unlockFunctionInclude)(this.connection, config.functionGroupName, config.includeName, lockHandle);
         this.connection.setSessionType('stateless');
+        this.untrackLock(config.functionGroupName, config.includeName);
         return { errors: [] };
     }
     getVersions(config) {

package/dist/core/functionModule/AdtFunctionModule.d.ts

@@ -20,6 +20,7 @@
 import type { IAbapConnection, IAdtObject, IAdtOperationOptions, ILogger } from '@mcp-abap-adt/interfaces';
 import type { IAdtSystemContext } from '../../clients/AdtClient';
 import type { IAdtContentTypes } from '../shared/contentTypes';
+import type { LockRegistry } from '../shared/LockRegistry';
 import type { IReadOptions } from '../shared/types';
 import type { IFunctionModuleConfig, IFunctionModuleState } from './types';
 export declare class AdtFunctionModule implements IAdtObject<IFunctionModuleConfig, IFunctionModuleState> {
@@ -27,8 +28,15 @@ export declare class AdtFunctionModule implements IAdtObject<IFunctionModuleConf
     protected readonly logger?: ILogger;
     protected readonly systemContext: IAdtSystemContext;
     protected readonly contentTypes?: IAdtContentTypes;
+    private readonly lockRegistry?;
     readonly objectType: string;
-    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, contentTypes?: IAdtContentTypes);
+    constructor(connection: IAbapConnection, logger?: ILogger, systemContext?: IAdtSystemContext, contentTypes?: IAdtContentTypes, lockRegistry?: LockRegistry);
+    /** Registry key for a held lock (nested: group + module). */
+    private lockKey;
+    /** Record a held lock; the unlock thunk needs the parent function group. */
+    private trackLock;
+    /** Drop a lock from the registry after a clean unlock. */
+    private untrackLock;
     /**
      * Validate function module configuration before creation
      */