@mcp-abap-adt/core 2.1.0 → 2.1.2

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## [Unreleased]
 
+## [2.1.2] - 2026-01-02
+### Changed
+- **Lock registry types**: `LockState.objectType` now uses `AdtObjectType` with normalization for legacy entries.
+- **adt-lock-object**: No longer registers lock handles in `.locks/active-locks.json`; session save only.
+
+### Removed
+- **CLI commands**: `adt-unlock-object`, `adt-manage-locks`, `adt-manage-sessions`, and `adt-unlock-objects` removed from package bins.
+
+## [2.1.1] - 2025-12-31
+### Changed
+- **@mcp-abap-adt/auth-broker**: bumped to `^0.3.0` - auto-detect service key format, credentials wrapper support, debug logging
+- **@mcp-abap-adt/auth-stores**: bumped to `^0.3.0`
+
 ## [2.1.0] - 2025-12-31
 ### Fixed
 - Updated `@mcp-abap-adt/auth-broker` so installs now pull `0.2.17` instead of the stale `0.2.14` release that was hiding upstream fixes.

package/bin/README.md

@@ -1,32 +1,17 @@
 # CLI Utilities
 
-This directory contains command-line utilities for managing ADT client sessions and locks.
+This directory contains command-line utilities for managing ADT client sessions.
 
 ## Overview of All Scripts
 
 | Command | Purpose | Use Case |
 |---------|---------|----------|
 | `adt-lock-object` | Lock an object and save session | Start work on object, persist session for later |
-| `adt-unlock-object` | Unlock object using saved session | Resume work and unlock after crash/restart |
-| `adt-manage-locks` | View/clean lock registry | Debug locks, cleanup stale locks |
-| `adt-manage-sessions` | View/clean session files | Debug sessions, cleanup old sessions |
-| `adt-unlock-objects` | Unlock predefined test objects | Cleanup after failed integration tests |
 
 ### Key Differences
 
-**Lock/Unlock Pair (for production use):**
-- `adt-lock-object` + `adt-unlock-object` - Full workflow: lock → save session → restore session → unlock
-- Works with ANY object specified via CLI args
-- Designed for manual/scripted workflows
-
-**Management Tools (for debugging/maintenance):**
-- `adt-manage-locks` - View and manage lock registry only
-- `adt-manage-sessions` - View and manage session files only
-- Read-only inspection + cleanup operations
-
-**Test Cleanup (for testing):**
-- `adt-unlock-objects` - Hardcoded list of test objects from test-config.yaml
-- Used specifically for cleanup after integration test failures
+**Locking (for production use):**
+- `adt-lock-object` - Lock object and persist session; designed for manual/scripted workflows
 
 ## Installation
 
@@ -42,9 +27,6 @@ After global installation, all commands are available in your PATH:
 
 ```bash
 adt-lock-object --help
-adt-unlock-object --help
-adt-manage-locks --help
-adt-manage-sessions --help
 ```
 
 ### Local Installation
@@ -59,7 +41,6 @@ Run commands using npx:
 
 ```bash
 npx adt-lock-object class ZCL_MY_CLASS
-npx adt-manage-locks list
 ```
 
 ### Development Installation
@@ -97,178 +78,25 @@ adt-lock-object program Z_MY_PROGRAM
 
 **What it does:**
 1. Connects to SAP and locks the object
-2. Saves session (cookies, CSRF token) to `.sessions/<session-id>.json`
-3. Registers lock handle in `.locks/active-locks.json`
-4. Prints unlock command for later use
+2. Saves session (cookies, CSRF token) to `.sessions/<session-id>.env`
+3. Prints the lock handle for later use
 
 **Supported types:** class, program, interface, fm, domain, dataelement
 
-### adt-unlock-object
-
-Unlock an SAP object using previously saved session state.
-
-```bash
-# Unlock using saved session
-adt-unlock-object class ZCL_MY_CLASS --session-id my_work
-
-# Unlock function module
-adt-unlock-object fm MY_FUNCTION --function-group Z_MY_FUGR --session-id my_work
-```
-
-**What it does:**
-1. Loads session from `.sessions/<session-id>.json`
-2. Restores session state to new connection
-3. Retrieves lock handle from `.locks/active-locks.json`
-4. Unlocks the object on SAP server
-5. Removes lock from registry
-
-**Note:** Requires `--session-id` used with `adt-lock-object`
-
-### adt-manage-locks
-
-Manage persistent lock registry - view, cleanup, and force unlock.
-
-```bash
-# List all active locks
-adt-manage-locks list
-
-# Clean up stale locks (>30 min or dead processes)
-adt-manage-locks cleanup
-
-# Force unlock specific object on SAP server
-adt-manage-locks unlock class ZCL_TEST
-adt-manage-locks unlock fm MY_FUNCTION Z_MY_FUGR
-
-# Clear all locks from registry
-adt-manage-locks clear
-```
-
-**What it does:**
-- `list` - Shows all locks with session ID, handle, object, timestamp, PID
-- `cleanup` - Removes stale locks (>30min old or dead processes)
-- `unlock` - Connects to SAP and force unlocks object, removes from registry
-- `clear` - Removes ALL locks from registry (doesn't unlock on SAP!)
-
-**Use case:** Debugging lock issues, cleanup after crashes
-
-### adt-manage-sessions
-
-Manage saved session files - view, inspect, and cleanup.
-
-```bash
-# List all sessions
-adt-manage-sessions list
-
-# View session details
-adt-manage-sessions info my_session_id
-
-# Clean up old sessions (>24 hours)
-adt-manage-sessions cleanup
-
-# Clear all sessions
-adt-manage-sessions clear
-```
-
-**What it does:**
-- `list` - Shows all session files with ID, timestamp, age, PID
-- `info` - Displays session details (cookies, CSRF token, metadata)
-- `cleanup` - Removes stale sessions (>24h old or dead processes)
-- `clear` - Deletes ALL session files
-
-**Use case:** Debugging session issues, inspect saved state, cleanup old files
-
-### adt-unlock-objects
-
-Unlock predefined test objects from test-config.yaml.
-
-```bash
-# Unlock all test objects defined in test-config.yaml
-adt-unlock-objects
-
-# Use custom config file
-adt-unlock-objects --config custom-test-config.yaml
-
-# Use custom locks directory
-adt-unlock-objects --locks-dir /custom/path/.locks
-```
-
-**What it does:**
-1. Reads test object list from `test-config.yaml`
-2. For each object: retrieves lock handle from registry
-3. Connects to SAP and unlocks object
-4. Removes lock from registry
-
-**Use case:** Cleanup after integration test failures when objects remain locked
-
-**Note:** Hardcoded to work with test objects only, not for general use
-
 ## Common Options
 
-Most commands support:
-
 | Option | Description | Default |
 |--------|-------------|---------|
-| `--locks-dir <path>` | Lock registry directory | `.locks` |
 | `--sessions-dir <path>` | Sessions directory | `.sessions` |
 | `--env <path>` | Path to .env file | `.env` |
 | `--help, -h` | Show help message | - |
 
-## Workflow Examples
-
-### Daily Work on a Class
-
-```bash
-# Morning - lock class and start work
-adt-lock-object class ZCL_MY_WORK --session-id daily_work
-# Session ID: daily_work
-
-# ... work all day, make changes via other tools ...
-
-# Evening - unlock when done
-adt-unlock-object class ZCL_MY_WORK --session-id daily_work
-```
-
-### Recovery After Crash
-
-```bash
-# Process crashed while object was locked
-# Check what was locked
-adt-manage-locks list
-
-# Resume and unlock using saved session
-adt-unlock-object class ZCL_MY_CLASS --session-id <session-from-list>
-```
-
-### Integration Test Cleanup
-
-```bash
-# Tests failed and left objects locked
-# Quick cleanup of all test objects
-adt-unlock-objects
-```
-
-### Debug Session Issues
-
-```bash
-# See what sessions are saved
-adt-manage-sessions list
-
-# Inspect specific session
-adt-manage-sessions info my_session_id
-
-# Clean up old sessions
-adt-manage-sessions cleanup
-```
-
 ## File Structure
 
 ```
 .sessions/
-  ├── my_work_session.json       # Session state (cookies, CSRF)
-  └── lock_class_ZCL_TEST_*.json # Auto-generated session
-
-.locks/
-  └── active-locks.json           # Lock registry
+  ├── my_work_session.env       # Session state (cookies, CSRF)
+  └── lock_class_ZCL_TEST_*.env # Auto-generated session
 ```
 
 ## Environment Setup
@@ -295,74 +123,3 @@ Ensure these directories are in `.gitignore`:
 - [Stateful Session Guide](../docs/architecture/STATEFUL_SESSION_GUIDE.md)
 - [Tools Architecture](../docs/architecture/TOOLS_ARCHITECTURE.md)
 - [Integration Tests Overview](../src/__tests__/integration/README.md)
-
-
-# Clear all locks from registry
-adt-manage-locks clear
-```
-
-### adt-manage-sessions
-
-Manage HTTP session state (cookies, CSRF tokens).
-
-```bash
-# List all active sessions
-adt-manage-sessions list
-
-# Show session details
-adt-manage-sessions info <sessionId>
-
-# Clean up stale sessions (>30 min or dead processes)
-adt-manage-sessions cleanup
-
-# Clear all sessions
-adt-manage-sessions clear
-```
-
-### adt-unlock-objects
-
-Unlock predefined test objects (used after failed tests).
-
-```bash
-adt-unlock-objects
-```
-
-## With npx
-
-You can also run these commands without installing:
-
-```bash
-npx @mcp-abap-adt/adt-clients adt-manage-locks list
-npx @mcp-abap-adt/adt-clients adt-manage-sessions list
-```
-
-## Configuration
-
-Commands require `.env` file in the project root with SAP connection details:
-
-```env
-SAP_URL=https://your-sap-system.com:443
-SAP_CLIENT=100
-SAP_USERNAME=your-username
-SAP_PASSWORD=your-password
-SAP_AUTH_TYPE=basic
-```
-
-For JWT authentication:
-```env
-SAP_AUTH_TYPE=jwt
-SAP_JWT_TOKEN=your-jwt-token
-```
-
-## Data Storage
-
-- **Locks**: `.locks/active-locks.json`
-- **Sessions**: `.sessions/<sessionId>.json`
-
-Both directories are in `.gitignore` and should not be committed.
-
-## Documentation
-
-For detailed information, see:
-- [Stateful Session Guide](../docs/architecture/STATEFUL_SESSION_GUIDE.md#lock-mechanism)
-- [Tools Architecture](../docs/architecture/TOOLS_ARCHITECTURE.md)

package/bin/lock-object.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Lock Object CLI - Lock an SAP object and save session/lock handle
+ * Lock Object CLI - Lock an SAP object and save session state
  *
  * Usage:
  *   adt-lock-object <type> <name> [options]
@@ -13,7 +13,6 @@
  */
 
 const path = require('path');
-const fs = require('fs');
 
 // Color codes for terminal output
 const colors = {
@@ -28,7 +27,7 @@ const colors = {
 
 function showHelp() {
   console.log(`
-${colors.bright}Lock Object CLI${colors.reset} - Lock an SAP object and save session/lock handle
+${colors.bright}Lock Object CLI${colors.reset} - Lock an SAP object and save session state
 
 ${colors.bright}USAGE:${colors.reset}
   adt-lock-object <type> <name> [options]
@@ -41,7 +40,6 @@ ${colors.bright}OPTIONS:${colors.reset}
   --function-group <name>    Function group name (required for fm type)
   --session-id <id>          Custom session ID (default: auto-generated)
   --sessions-dir <path>      Sessions directory (default: .sessions)
-  --locks-dir <path>         Locks directory (default: .locks)
   --env <path>               Path to .env file (default: .env)
   --help, -h                 Show this help message
 
@@ -55,13 +53,11 @@ ${colors.bright}EXAMPLES:${colors.reset}
   # Lock a function module
   adt-lock-object fm MY_FUNCTION_MODULE --function-group Z_MY_FUGR
 
-  # Lock with custom directories
-  adt-lock-object class ZCL_TEST --sessions-dir /tmp/sessions --locks-dir /tmp/locks
+  # Lock with custom session directory
+  adt-lock-object class ZCL_TEST --sessions-dir /tmp/sessions
 
 ${colors.bright}NOTES:${colors.reset}
   - Session state (cookies, CSRF token) saved to <sessions-dir>/<session-id>.json
-  - Lock handle saved to <locks-dir>/active-locks.json
-  - Use 'adt-unlock-object' with same session-id to unlock later
   - Requires SAP_URL, SAP_USERNAME, SAP_PASSWORD in .env file
 `);
 }
@@ -89,7 +85,6 @@ async function main() {
   let functionGroup;
   let sessionId;
   let sessionsDir = '.sessions';
-  let locksDir = '.locks';
   let envPath = '.env';
 
   for (let i = 2; i < args.length; i++) {
@@ -99,15 +94,13 @@ async function main() {
       sessionId = args[++i];
     } else if (args[i] === '--sessions-dir' && args[i + 1]) {
       sessionsDir = args[++i];
-    } else if (args[i] === '--locks-dir' && args[i + 1]) {
-      locksDir = args[++i];
     } else if (args[i] === '--env' && args[i + 1]) {
       envPath = args[++i];
     }
   }
 
   // Validate function group for FM
-  if (objectType === 'fm' && !functionGroup) {
+  if (['fm', 'functionmodule'].includes(objectType.toLowerCase()) && !functionGroup) {
     console.error(`${colors.red}Error: --function-group is required for function modules${colors.reset}`);
     process.exit(1);
   }
@@ -143,41 +136,33 @@ async function main() {
 
   try {
     // Dynamic imports
-    const { createAbapConnection, FileSessionStorage } = require('@mcp-abap-adt/connection');
-    const { LockStateManager } = require('../src/utils/lockStateManager');
+    const { createAbapConnection } = require('@mcp-abap-adt/connection');
+    const { AbapSessionStore } = require('@mcp-abap-adt/auth-stores');
 
     // Map object type to lock function
     let lockFunction;
-    let adtObjectType;
 
     switch (objectType.toLowerCase()) {
       case 'class':
         lockFunction = require('@mcp-abap-adt/adt-clients/core/class/lock.js').lockClass;
-        adtObjectType = 'class';
         break;
       case 'program':
         lockFunction = require('@mcp-abap-adt/adt-clients/core/program/lock.js').lockProgram;
-        adtObjectType = 'program';
         break;
       case 'interface':
         lockFunction = require('@mcp-abap-adt/adt-clients/core/interface/lock.js').lockInterface;
-        adtObjectType = 'interface';
         break;
       case 'fugr':
         lockFunction = require('@mcp-abap-adt/adt-clients/core/functionGroup/lock.js').lockFunctionGroup;
-        adtObjectType = 'fugr';
         break;
       case 'fm':
         lockFunction = require('@mcp-abap-adt/adt-clients/core/functionModule/lock.js').lockFunctionModule;
-        adtObjectType = 'fm';
         break;
       case 'domain':
         lockFunction = require('@mcp-abap-adt/adt-clients/core/domain/lock.js').lockDomain;
-        adtObjectType = 'domain';
         break;
       case 'dataelement':
         lockFunction = require('@mcp-abap-adt/adt-clients/core/dataElement/lock.js').lockDataElement;
-        adtObjectType = 'dataElement';
         break;
       default:
         console.error(`${colors.red}Error: Unsupported object type: ${objectType}${colors.reset}`);
@@ -214,10 +199,7 @@ async function main() {
     const connection = createAbapConnection(config, logger);
 
     // Setup session storage
-    const sessionStorage = new FileSessionStorage({
-      sessionDir: sessionsDir,
-      prettyPrint: true
-    });
+    const sessionStorage = new AbapSessionStore(sessionsDir);
 
     // Enable stateful session on connection
     await connection.enableStatefulSession(sessionId, sessionStorage);
@@ -242,25 +224,9 @@ async function main() {
     // after each request in stateful mode
     console.log(`${colors.green}✓ Session saved${colors.reset}`);
     console.log(`  Session ID: ${colors.bright}${sessionId}${colors.reset}`);
-    console.log(`  Session File: ${path.join(sessionsDir, sessionId + '.json')}`);
-
-    // Register lock in lock manager
-    const lockManager = new LockStateManager(locksDir);
-    lockManager.registerLock({
-      sessionId,
-      lockHandle,
-      objectType: adtObjectType,
-      objectName,
-      functionGroupName: functionGroup,
-      testFile: 'CLI',
-    });
-
-    console.log(`${colors.green}✓ Lock registered${colors.reset}`);
-    console.log(`  Lock File: ${path.join(locksDir, 'active-locks.json')}`);
+    console.log(`  Session File: ${path.join(sessionsDir, sessionId + '.env')}`);
 
     console.log(`\n${colors.bright}${colors.green}SUCCESS!${colors.reset} Object locked and session saved.`);
-    console.log(`\nTo unlock later, run:`);
-    console.log(`  ${colors.cyan}adt-unlock-object ${objectType} ${objectName} --session-id ${sessionId}${functionGroup ? ` --function-group ${functionGroup}` : ''}${colors.reset}`);
 
   } catch (error) {
     console.error(`\n${colors.red}Error: ${error.message}${colors.reset}`);

package/dist/utils/lockStateManager.d.ts

@@ -2,16 +2,21 @@
  * Lock State Manager - persists lock handles and session IDs to filesystem
  * Allows recovery and cleanup of locks after crashes or interruptions
  */
+import type { AdtObjectType } from '@mcp-abap-adt/adt-clients';
+export declare function normalizeLockObjectType(objectType: string): AdtObjectType;
 export interface LockState {
     sessionId: string;
     lockHandle: string;
-    objectType: 'class' | 'interface' | 'program' | 'fm' | 'domain' | 'dataElement' | 'view' | 'table' | 'structure' | 'package';
+    objectType: AdtObjectType;
     objectName: string;
     functionGroupName?: string;
     timestamp: number;
     pid: number;
     testFile?: string;
 }
+type RawLockState = Omit<LockState, 'objectType'> & {
+    objectType: string;
+};
 export interface LockRegistry {
     locks: LockState[];
 }
@@ -30,7 +35,7 @@ export declare class LockStateManager {
     /**
      * Register a new lock
      */
-    registerLock(lock: Omit<LockState, 'timestamp' | 'pid'>): void;
+    registerLock(lock: Omit<RawLockState, 'timestamp' | 'pid'>): void;
     /**
      * Remove lock from registry
      */
@@ -59,6 +64,11 @@ export declare class LockStateManager {
      * Clear all locks
      */
     clearAll(): void;
+    /**
+     * Normalize a lock loaded from disk to canonical ADT object type
+     */
+    private normalizeLock;
 }
 export declare function getLockStateManager(lockDir?: string): LockStateManager;
+export {};
 //# sourceMappingURL=lockStateManager.d.ts.map

package/dist/utils/lockStateManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lockStateManager.d.ts","sourceRoot":"","sources":["../../src/utils/lockStateManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EACN,OAAO,GACP,WAAW,GACX,SAAS,GACT,IAAI,GACJ,QAAQ,GACR,aAAa,GACb,MAAM,GACN,OAAO,GACP,WAAW,GACX,SAAS,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAe;gBAEnB,OAAO,GAAE,MAAiB;IAWtC;;OAEG;IACH,OAAO,CAAC,YAAY;IAapB;;OAEG;IACH,OAAO,CAAC,YAAY;IAYpB;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,GAAG,KAAK,CAAC,GAAG,IAAI;IAqB9D;;OAEG;IACH,UAAU,CACR,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,GACzB,IAAI;IAYP;;OAEG;IACH,OAAO,CACL,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,GACzB,SAAS,GAAG,SAAS;IASxB;;OAEG;IACH,WAAW,IAAI,SAAS,EAAE;IAI1B;;OAEG;IACH,aAAa,CAAC,QAAQ,GAAE,MAAuB,GAAG,SAAS,EAAE;IAK7D;;OAEG;IACH,mBAAmB,IAAI,SAAS,EAAE;IAYlC;;OAEG;IACH,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE;IAYjD;;OAEG;IACH,QAAQ,IAAI,IAAI;CAIjB;AAKD,wBAAgB,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAKtE"}
+{"version":3,"file":"lockStateManager.d.ts","sourceRoot":"","sources":["../../src/utils/lockStateManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AA8B/D,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAMzE;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,aAAa,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,KAAK,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAe;gBAEnB,OAAO,GAAE,MAAiB;IAWtC;;OAEG;IACH,OAAO,CAAC,YAAY;IAmBpB;;OAEG;IACH,OAAO,CAAC,YAAY;IAYpB;;OAEG;IACH,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,GAAG,KAAK,CAAC,GAAG,IAAI;IAuBjE;;OAEG;IACH,UAAU,CACR,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,GACzB,IAAI;IAaP;;OAEG;IACH,OAAO,CACL,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,GACzB,SAAS,GAAG,SAAS;IAUxB;;OAEG;IACH,WAAW,IAAI,SAAS,EAAE;IAI1B;;OAEG;IACH,aAAa,CAAC,QAAQ,GAAE,MAAuB,GAAG,SAAS,EAAE;IAK7D;;OAEG;IACH,mBAAmB,IAAI,SAAS,EAAE;IAYlC;;OAEG;IACH,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE;IAYjD;;OAEG;IACH,QAAQ,IAAI,IAAI;IAKhB;;OAEG;IACH,OAAO,CAAC,aAAa;CAatB;AAKD,wBAAgB,mBAAmB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAKtE"}

package/dist/utils/lockStateManager.js

@@ -38,9 +38,44 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LockStateManager = void 0;
+exports.normalizeLockObjectType = normalizeLockObjectType;
 exports.getLockStateManager = getLockStateManager;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
+const OBJECT_TYPE_NORMALIZATION_MAP = {
+    class: 'class',
+    'clas/oc': 'clas/oc',
+    program: 'program',
+    'prog/p': 'prog/p',
+    interface: 'interface',
+    'intf/if': 'intf/if',
+    fm: 'functionmodule',
+    functionmodule: 'functionmodule',
+    fugr: 'functiongroup',
+    'fugr/ff': 'fugr/ff',
+    functiongroup: 'functiongroup',
+    view: 'view',
+    'ddls/df': 'ddls/df',
+    structure: 'structure',
+    'stru/dt': 'stru/dt',
+    table: 'table',
+    'tabl/dt': 'tabl/dt',
+    tabletype: 'tabletype',
+    'ttyp/df': 'ttyp/df',
+    domain: 'domain',
+    'doma/dd': 'doma/dd',
+    dataelement: 'dataelement',
+    dtel: 'dtel',
+    package: 'package',
+    'devc/k': 'devc/k',
+};
+function normalizeLockObjectType(objectType) {
+    const normalized = OBJECT_TYPE_NORMALIZATION_MAP[objectType.toLowerCase()];
+    if (!normalized) {
+        throw new Error(`Unsupported object type for lock registry: ${objectType}`);
+    }
+    return normalized;
+}
 class LockStateManager {
     lockFilePath;
     registry;
@@ -60,7 +95,12 @@ class LockStateManager {
         if (fs.existsSync(this.lockFilePath)) {
             try {
                 const data = fs.readFileSync(this.lockFilePath, 'utf-8');
-                return JSON.parse(data);
+                const parsed = JSON.parse(data);
+                const locks = Array.isArray(parsed?.locks) ? parsed.locks : [];
+                const normalizedLocks = locks
+                    .map((lock) => this.normalizeLock(lock))
+                    .filter(Boolean);
+                return { locks: normalizedLocks };
             }
             catch (error) {
                 console.warn(`Failed to load lock registry: ${error}`);
@@ -84,13 +124,15 @@ class LockStateManager {
      * Register a new lock
      */
     registerLock(lock) {
+        const normalizedType = normalizeLockObjectType(lock.objectType);
         const lockState = {
             ...lock,
+            objectType: normalizedType,
             timestamp: Date.now(),
             pid: process.pid,
         };
         // Remove old lock for same object if exists
-        this.registry.locks = this.registry.locks.filter((l) => !(l.objectType === lock.objectType &&
+        this.registry.locks = this.registry.locks.filter((l) => !(l.objectType === normalizedType &&
             l.objectName === lock.objectName &&
             l.functionGroupName === lock.functionGroupName));
         this.registry.locks.push(lockState);
@@ -100,7 +142,8 @@ class LockStateManager {
      * Remove lock from registry
      */
     removeLock(objectType, objectName, functionGroupName) {
-        this.registry.locks = this.registry.locks.filter((l) => !(l.objectType === objectType &&
+        const normalizedType = normalizeLockObjectType(objectType);
+        this.registry.locks = this.registry.locks.filter((l) => !(l.objectType === normalizedType &&
             l.objectName === objectName &&
             l.functionGroupName === functionGroupName));
         this.saveRegistry();
@@ -109,7 +152,8 @@ class LockStateManager {
      * Get lock for specific object
      */
     getLock(objectType, objectName, functionGroupName) {
-        return this.registry.locks.find((l) => l.objectType === objectType &&
+        const normalizedType = normalizeLockObjectType(objectType);
+        return this.registry.locks.find((l) => l.objectType === normalizedType &&
             l.objectName === objectName &&
             l.functionGroupName === functionGroupName);
     }
@@ -160,6 +204,21 @@ class LockStateManager {
         this.registry = { locks: [] };
         this.saveRegistry();
     }
+    /**
+     * Normalize a lock loaded from disk to canonical ADT object type
+     */
+    normalizeLock(lock) {
+        try {
+            return {
+                ...lock,
+                objectType: normalizeLockObjectType(lock.objectType),
+            };
+        }
+        catch (error) {
+            console.warn(`Skipping lock with unknown object type "${lock.objectType}": ${error}`);
+            return null;
+        }
+    }
 }
 exports.LockStateManager = LockStateManager;
 // Global instance

package/dist/utils/lockStateManager.js.map

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