@abapify/adk 0.4.34 → 0.4.36

package/dist/index.d.mts

@@ -1,6 +1,22 @@
 import { LockEntry, LockHandle, LockHandle as LockHandle$1, LockService, LockService as LockService$1, LockStore, LockStore as LockRegistry, LockStore as LockStore$1, createLockService } from "@abapify/adt-locks";
 import { AdtClient, AdtClient as AdtClient$1, ClassResponse as ClassResponse$1, DataElementResponse, DomainResponse, FunctionGroupResponse as FunctionGroupResponse$1, FunctionModuleResponse as FunctionModuleResponse$1, IncludeResponse as IncludeResponse$1, InterfaceResponse as InterfaceResponse$1, PackageResponse as PackageResponse$1, ProgramResponse as ProgramResponse$1, SourceVersionRef, TableResponse, TableTypeResponse, TransportGetResponse } from "@abapify/adt-client";
 import { BasicObjectPropertiesResponse } from "@abapify/adt-contracts";
+/**
+ * ADK v2 - Base Types
+ */
+/**
+ * Base interface for all ABAP objects
+ */
+interface AbapObject {
+  readonly kind: string;
+  readonly name: string;
+  readonly package: string;
+  readonly description: string;
+  /**
+   * ADT object type (e.g., 'DEVC/K', 'CLAS/OC')
+   */
+  readonly type: string;
+}
 /**
  * Extract the abapClass variant from ClassResponse union
  * ClassResponse = { abapClass: ... } | { abapClassInclude: ... }
@@ -120,652 +136,544 @@ interface AdkContext {
   readonly lockService?: LockService$1;
 }
 /**
- * Save mode for create/update operations
- * - 'update': PUT to existing object (default, fails if doesn't exist)
- * - 'create': POST to create new object (skips POST if already exists, then updates)
- * - 'upsert': Try PUT first, fall back to POST if 404
- */
-type SaveMode = 'update' | 'create' | 'upsert';
-/**
- * Options for save operations
- */
-interface SaveOptions {
-  /** Transport request for the change */
-  transport?: string;
-  /** Save as inactive (default: false) */
-  inactive?: boolean;
-  /** Save mode: 'update' (default), 'create', or 'upsert' */
-  mode?: SaveMode;
-  /**
-   * Retry only the immediate post-create LOCK when a backend keeps its
-   * generated CTS/editor lock briefly after accepting the skeleton POST.
-   */
-  postCreateLockRetry?: {
-    /** Total LOCK attempts, including the first one. */
-    attempts: number;
-    /** Delay between conflicting LOCK attempts in milliseconds. */
-    delayMs: number;
-  };
-}
-type InternalSaveOptions = SaveOptions & {
-  postCreate?: boolean;
-};
-/**
- * SAP accepted the skeleton POST, but rejected the immediate follow-up lock.
- *
- * The object therefore exists in SAP, while the source or metadata supplied
- * to the original save call has not yet been persisted. Callers must retry
- * the same object with `mode: 'update'` after the CTS/editor lock is cleared;
- * repeating `mode: 'create'` risks an "already exists" response.
- */
-declare class AdkPostCreateLockError extends Error {
-  readonly objectUri: string;
-  readonly transport: string | undefined;
-  readonly code: "ADT_POST_CREATE_LOCKED";
-  readonly name = "AdkPostCreateLockError";
-  constructor(objectUri: string, transport: string | undefined, cause: unknown);
-}
-/**
- * Result of bulk activation
- */
-interface ActivationResult {
-  /** Number of successfully activated objects */
-  success: number;
-  /** Number of objects that failed activation */
-  failed: number;
-  /** Activation messages (errors, warnings) */
-  messages: string[];
-  /** Raw response from SAP (for debugging) */
-  response?: string;
-}
-/**
- * Atom link (from atom:link element)
- * Used for HATEOAS-style navigation in ADT responses
+ * Class category (class:category attribute)
  */
-interface AtomLink {
-  href: string;
-  rel?: string;
-  type?: string;
-  title?: string;
-  etag?: string;
-}
+type ClassCategory = 'generalObjectType' | 'exceptionClass' | 'testClass' | 'exitClass' | 'areaClass' | 'factoryClass' | 'persistentClass' | 'bspClass' | 'staticTypedLcpClass' | 'behaviorPool' | 'rfcProxyClass' | 'entityEventHandler' | 'communicationConnectionClass' | 'others';
 /**
- * ADT object reference (adtcore:objectReference)
+ * Class include type (class:includeType attribute)
  */
-interface AdtObjectReference {
-  uri?: string;
-  name?: string;
-  type?: string;
-  description?: string;
-  packageName?: string;
-}
+type ClassIncludeType = 'main' | 'definitions' | 'implementations' | 'macros' | 'testclasses' | 'localtypes';
 /**
- * Base data contract for all ADK objects
- * Matches XSD AdtObject type attributes and elements
+ * Class visibility (class:visibility attribute)
  */
-interface AdkObjectData {
-  name: string;
-  type: string;
-  description?: string;
-  changedBy?: string;
-  changedAt?: string | Date;
-  createdBy?: string;
-  createdAt?: string | Date;
-  version?: string;
-  language?: string;
-  descriptionTextLimit?: number;
-  links?: AtomLink[];
-  containerRef?: AdtObjectReference;
-}
+type ClassVisibility = 'public' | 'protected' | 'private';
 /**
- * Main object data contract (extends AdtObject)
- * Matches XSD AdtMainObject type
+ * Class include section
  */
-interface AdkMainObjectData extends AdkObjectData {
-  packageRef?: AdtObjectReference;
-  masterSystem?: string;
-  masterLanguage?: string;
-  responsible?: string;
-  abapLanguageVersion?: string;
+interface ClassInclude {
+  readonly includeType: ClassIncludeType;
+  readonly sourceUri: string;
+  readonly name: string;
+  readonly type: string;
+  readonly version: string;
+  readonly changedAt: Date;
+  readonly createdAt: Date;
+  readonly changedBy: string;
+  readonly createdBy: string;
 }
 /**
- * Base class for all ADK objects
- *
- * All ADK objects (AdkPackage, AdkTransportRequest, etc.) extend this.
- * Supports deferred loading - create with just a name, then call load().
- *
- * Note: Uses loose type constraint for D to allow schema-inferred types
- * from contracts which may have different shapes. The getters safely
- * handle missing properties with defaults.
+ * ABAP Class interface
  *
- * @typeParam K - The object kind (from AdkKind)
- * @typeParam D - The internal data type (typically schema-inferred from contract)
+ * Plugins work with this interface - implementation is internal.
+ * Mirrors ADT class:abapClass structure.
  */
-declare abstract class AdkObject<K extends AdkKind = AdkKind, D = any> {
-  /** Object kind identifier */
-  abstract readonly kind: K;
+interface AbapClass extends AbapObject {
+  readonly kind: 'Class';
+  readonly responsible: string;
+  readonly masterLanguage: string;
+  readonly language: string;
+  readonly version: string;
+  readonly createdAt: Date;
+  readonly createdBy: string;
+  readonly changedAt: Date;
+  readonly changedBy: string;
+  readonly category: ClassCategory;
+  readonly final: boolean;
+  readonly abstract: boolean;
+  readonly visibility: ClassVisibility;
+  readonly sharedMemoryEnabled: boolean;
+  readonly modeled: boolean;
+  readonly fixPointArithmetic: boolean;
+  readonly activeUnicodeCheck: boolean;
+  readonly superClassRef?: AdtObjectReference;
+  readonly messageClassRef?: AdtObjectReference;
+  readonly packageRef?: AdtObjectReference;
+  readonly includes: ClassInclude[];
   /**
-   * ADT object URI - base path for all operations.
-   * Example: `/sap/bc/adt/oo/classes/zcl_my_class`
+   * Get main source code (global definitions + implementations)
    */
-  abstract get objectUri(): string;
+  getMainSource(): Promise<string>;
   /**
-   * ADT collection URI - base path for creating new objects.
-   * Example: `/sap/bc/adt/oo/classes`
-   * Default: derived from objectUri by removing the object name
+   * Get source code for a specific include
    */
-  get collectionUri(): string;
-  protected ctx: AdkContext;
-  /** Public access to the ADT client for plugins and external code */
-  get client(): AdtClient;
-  protected _data?: D;
-  protected _name: string;
-  protected cache: Map<string, unknown>;
-  protected dirty: Set<string>;
-  protected _lockHandle?: LockHandle$1;
-  /** Set by save() when all pending changes are identical to SAP state */
-  _unchanged: boolean;
+  getIncludeSource(includeType: ClassIncludeType): Promise<string>;
   /**
-   * Create ADK object
-   * @param ctx - ADK context
-   * @param dataOrName - Full data object OR just the object name for deferred loading
+   * Get definitions include source
    */
-  constructor(ctx: AdkContext, dataOrName: D | string | Record<string, unknown>);
+  getDefinitions(): Promise<string>;
   /**
-   * Adopt a richer context (merge services into existing context).
-   *
-   * Used by AdkObjectSet to propagate lockService / lockStore
-   * to objects created by plugins that only have { client }.
-   * Keeps the original client reference intact.
+   * Get implementations include source
    */
-  adoptContext(ctx: AdkContext): void;
+  getImplementations(): Promise<string>;
   /**
-   * Load object data from SAP
-   *
-   * Default implementation uses crudContract.get() and unwraps with wrapperKey.
-   * Objects without crudContract must override this.
-   *
-   * @returns this (for chaining)
+   * Get test classes source
    */
-  load(): Promise<this>;
-  /** Whether data has been loaded */
-  get isLoaded(): boolean;
+  getTestClasses(): Promise<string>;
+}
+/**
+ * Class data type - imported from contract
+ *
+ * The schema wraps everything in an 'abapClass' element, so we unwrap it here
+ * to provide a flat structure for ADK consumers.
+ */
+type ClassXml = ClassResponse['abapClass'];
+declare class AdkClass extends AdkMainObject<typeof Class, ClassXml> {
+  static readonly kind: "Class";
+  readonly kind: "Class";
+  get objectUri(): string;
+  getMainSource(): Promise<string>;
+  getIncludeSource(includeType: ClassIncludeType): Promise<string>;
+  getDefinitions(): Promise<string>;
+  getImplementations(): Promise<string>;
+  getTestClasses(): Promise<string>;
   /**
-   * Get data - auto-loads if not already loaded
-   * @returns Promise that resolves to the data
+   * Save main source code
+   * Requires object to be locked first
    */
-  data(): Promise<D>;
+  saveMainSource(source: string, options?: {
+    lockHandle?: string;
+    transport?: string;
+  }): Promise<void>;
   /**
-   * Get data synchronously - throws if not loaded
-   * Use when you know data is already loaded
+   * Save include source code
+   * Requires object to be locked first
    */
-  get dataSync(): D;
-  /** Set data (for subclasses to use after loading) */
-  protected setData(data: D): void;
-  /** Helper to access data with AdkObjectData properties */
-  private get coreData();
-  /** ADT object name (adtcore:name) - available even before load() */
-  get name(): string;
-  /** ADT object type (adtcore:type, e.g. 'RQRQ', 'DEVC/K') - requires load() */
-  get type(): string;
-  /** Description text (adtcore:description) */
-  get description(): string;
-  /** Version state (adtcore:version) - active, inactive, etc. */
-  get version(): string;
-  /** Current language (adtcore:language) */
-  get language(): string;
-  /** User who last modified (adtcore:changedBy) */
-  get changedBy(): string;
-  /** Last modification timestamp (adtcore:changedAt) */
-  get changedAt(): Date;
-  /** User who created (adtcore:createdBy) */
-  get createdBy(): string;
-  /** Creation timestamp (adtcore:createdAt) */
-  get createdAt(): Date;
-  /** All atom:link elements */
-  get links(): AtomLink[];
-  /** Find link by rel attribute */
-  getLink(rel: string): AtomLink | undefined;
-  /** Get link href by rel, or undefined */
-  getLinkHref(rel: string): string | undefined;
-  /** Container reference (adtcore:containerRef) */
-  get containerRef(): AdtObjectReference | undefined;
-  /** Check if object is currently locked */
-  get isLocked(): boolean;
-  /** Get current lock handle */
-  get lockHandle(): LockHandle$1 | undefined;
+  saveIncludeSource(includeType: ClassIncludeType, source: string, options?: {
+    lockHandle?: string;
+    transport?: string;
+  }): Promise<void>;
+  /** Save one pending source entry (main source or an include). */
+  private savePendingEntry;
   /**
-   * Lock the object for modification
-   *
-   * Delegates to the lock service (single lock mechanism).
-   *
-   * The lock response contains:
-   * - LOCK_HANDLE: Required for subsequent PUT/unlock operations
-   * - CORRNR: Transport request assigned to this object (use for PUT if no explicit transport)
-   * - CORRUSER: User who owns the transport
+   * Save all pending sources (set via _pendingSources)
+   * Used by export workflow after deserialization from abapGit
+   * Overrides base class method
    *
-   * @param transport - Optional transport request to use for locking.
-   *                    Required when object is already in a transport.
+   * Note: unchanged detection is handled by checkPendingSourcesUnchanged()
+   * which runs BEFORE lock acquisition. By the time we reach here,
+   * at least one source differs — save them all.
    */
-  lock(transport?: string): Promise<LockHandle$1>;
+  protected savePendingSources(options?: {
+    lockHandle?: string;
+    transport?: string;
+  }): Promise<void>;
   /**
-   * Unlock the object
-   *
-   * Delegates to the lock service (single lock mechanism).
+   * Pre-lock comparison: check if all pending sources match SAP
+   * If identical, sets _unchanged = true so save() skips locking and PUT
    */
-  unlock(): Promise<void>;
+  protected checkPendingSourcesUnchanged(): Promise<void>;
   /**
-   * Set lock handle (for subclasses that need custom lock logic)
+   * Check if object has pending sources to save
+   * Overrides base class method
    */
-  protected setLockHandle(handle: LockHandle$1 | undefined): void;
+  protected hasPendingSources(): boolean;
   /**
-   * Save the object to SAP
-   *
-   * Generic implementation that handles:
-   * - Lock/unlock lifecycle
-   * - Mode switching (create/update/upsert)
-   * - Error handling
-   *
-   * Subclasses implement `saveViaContract()` to provide the typed contract call.
-   *
-   * Modes:
-   * - 'update' (default): PUT to existing object
-   * - 'create': POST skeleton, then lock → PUT/source → unlock (Eclipse ADT pattern)
-   * - 'upsert': Check existence, create if needed, then update
-   *
-   * @param options - Save options
-   * @returns this (for chaining)
+   * Refresh cached ETags for all pending source endpoints after locking.
+   * Classes have multiple source URLs (main + includes) that all need fresh ETags.
    */
-  save(options?: InternalSaveOptions): Promise<this>;
+  protected refreshETagsAfterLock(): Promise<void>;
+  protected get wrapperKey(): string;
+  protected get crudContract(): any;
+  static get(name: string, ctx?: AdkContext): Promise<AdkClass>;
   /**
-   * Wrapper key for the data in contract requests/responses
-   *
-   * Contracts wrap data like { abapClass: ... } or { abapInterface: ... }.
-   * Subclasses that support save override this.
+   * Check if a class exists on SAP
    */
-  protected get wrapperKey(): string | undefined;
+  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
   /**
-   * CRUD contract for this object type
+   * Create a new ABAP class on SAP
    *
-   * Subclasses that support save override this to return their contract.
+   * @param name - Class name (e.g., 'ZCL_MY_CLASS')
+   * @param description - Short description
+   * @param packageName - Package to assign the class to
+   * @param options - Save options (transport)
+   * @param ctx - Optional ADK context
    */
-  protected get crudContract(): any;
+  static create(name: string, description: string, packageName: string, options?: {
+    transport?: string;
+  }, ctx?: AdkContext): Promise<AdkClass>;
   /**
-   * Execute the typed contract call for save
-   *
-   * Generic implementation using wrapperKey and crudContract.
-   * Objects that don't support save leave wrapperKey/crudContract undefined.
-   *
-   * For 'create' mode: POSTs skeleton data (minimal fields).
-   * For 'update' mode: PUTs full data (all fields except abapLanguageVersion).
+   * Delete an ABAP class from SAP
    *
-   * @param mode - 'create' (POST skeleton) or 'update' (PUT full)
-   * @param options - Contract options (transport, lockHandle)
+   * @param name - Class name
+   * @param options - Delete options (transport)
+   * @param ctx - Optional ADK context
    */
-  protected saveViaContract(mode: 'create' | 'update', options: {
+  static delete(name: string, options?: {
     transport?: string;
     lockHandle?: string;
-  }): Promise<void>;
+  }, ctx?: AdkContext): Promise<void>;
+}
+/**
+ * Interface data type - imported from contract
+ *
+ * The schema wraps everything in an 'abapInterface' element, so we unwrap it here
+ * to provide a flat structure for ADK consumers.
+ */
+type InterfaceXml = InterfaceResponse['abapInterface'];
+/**
+ * ADK Interface object
+ *
+ * Inherits from AdkMainObject which provides:
+ * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
+ * - AdkMainObject: package, packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
+ *
+ * Access interface-specific properties via `data`:
+ * - data.modeled, data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck
+ */
+declare class AdkInterface extends AdkMainObject<typeof Interface, InterfaceXml> {
+  static readonly kind: "Interface";
+  readonly kind: "Interface";
+  get objectUri(): string;
+  getSource(): Promise<string>;
+  protected get wrapperKey(): string;
+  protected get crudContract(): any;
+  static get(name: string, ctx?: AdkContext): Promise<AdkInterface>;
   /**
-   * Get skeleton data for object creation (POST).
-   *
-   * Returns only the minimal fields needed to create the object on SAP.
-   * SAP creates the object structure (includes, etc.) from these fields.
-   * Full metadata and source code are sent via PUT in the update step.
-   *
-   * Override in subclasses that need different skeleton fields.
+   * Check if an interface exists on SAP
    */
-  protected getSkeletonData(): Promise<Record<string, unknown>>;
+  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
   /**
-   * Check if the object exists on the SAP system.
+   * Create a new ABAP interface on SAP
    *
-   * Used by upsert mode to decide between update and create paths upfront.
-   * On BTP, locking a non-existent DDIC object creates a draft that persists
-   * even after unlock, blocking subsequent POST (create) attempts. Checking
-   * existence first with GET avoids this problem entirely.
+   * @param name - Interface name (e.g., 'ZIF_MY_INTERFACE')
+   * @param description - Short description
+   * @param packageName - Package to assign the interface to
+   * @param options - Save options (transport)
+   * @param ctx - Optional ADK context
    */
-  protected checkObjectExists(): Promise<boolean>;
+  static create(name: string, description: string, packageName: string, options?: {
+    transport?: string;
+  }, ctx?: AdkContext): Promise<AdkInterface>;
   /**
-   * Check if error is a 404 Not Found
+   * Delete an ABAP interface from SAP
+   *
+   * @param name - Interface name
+   * @param options - Delete options (transport)
+   * @param ctx - Optional ADK context
    */
-  protected isNotFoundError(e: unknown): boolean;
+  static delete(name: string, options?: {
+    transport?: string;
+    lockHandle?: string;
+  }, ctx?: AdkContext): Promise<void>;
+}
+/**
+ * Package type (pak:packageType attribute)
+ */
+type PackageType = 'development' | 'structure' | 'main';
+/**
+ * Reference to another object (used for superPackage, etc.)
+ * Re-exported for backward compatibility
+ */
+type ObjectReference = AdtObjectReference;
+/**
+ * Package attributes (pak:attributes element)
+ */
+interface PackageAttributes {
+  readonly packageType: PackageType;
+  readonly isEncapsulated: boolean;
+  readonly isAddingObjectsAllowed: boolean;
+  readonly recordChanges: boolean;
+  readonly languageVersion: string;
+}
+/**
+ * Application component info
+ */
+interface ApplicationComponent {
+  readonly name: string;
+  readonly description: string;
+}
+/**
+ * Software component info
+ */
+interface SoftwareComponent {
+  readonly name: string;
+  readonly description: string;
+}
+/**
+ * Transport layer info
+ */
+interface TransportLayer {
+  readonly name: string;
+  readonly description: string;
+}
+/**
+ * Transport configuration
+ */
+interface TransportConfig {
+  readonly softwareComponent?: SoftwareComponent;
+  readonly transportLayer?: TransportLayer;
+}
+/**
+ * ABAP Package interface
+ *
+ * Plugins work with this interface - implementation is internal.
+ * Mirrors ADT pak:package structure.
+ */
+interface AbapPackage extends AbapObject {
+  readonly kind: 'Package';
+  readonly responsible: string;
+  readonly masterLanguage: string;
+  readonly language: string;
+  readonly version: string;
+  readonly createdAt: Date;
+  readonly createdBy: string;
+  readonly changedAt: Date;
+  readonly changedBy: string;
+  readonly attributes: PackageAttributes;
+  readonly superPackage?: AdtObjectReference;
+  readonly applicationComponent?: ApplicationComponent;
+  readonly transport?: TransportConfig;
   /**
-   * Some CTS backends can retain the lock created by a successful object POST
-   * long enough for the immediate follow-up LOCK to fail. This is distinct
-   * from an arbitrary edit conflict because this save invocation already
-   * created the skeleton successfully.
+   * Get direct subpackages
    */
-  private isPostCreateLockConflict;
+  getSubpackages(): Promise<AbapPackage[]>;
   /**
-   * Some backends retain the lock implicitly created by a successful POST for
-   * a short time. Retry only this known follow-up LOCK; no arbitrary update or
-   * source write is repeated, and each successful lock still uses the normal
-   * handle-backed save/unlock lifecycle.
+   * Get objects contained in this package (direct, not recursive)
    */
-  private lockAfterCreate;
+  getObjects(): Promise<AbapObject[]>;
   /**
-   * Upsert fallback: try POST (create), treat 422 "already exists" as unchanged.
-   * Extracted to avoid duplication in lock-catch and saveViaContract-catch paths.
+   * Get all objects recursively (includes subpackages)
    */
-  private fallbackToCreate;
+  getAllObjects(): Promise<AbapObject[]>;
+}
+/**
+ * Package data type - inferred from packagesContract response
+ *
+ * The schema wraps everything in a 'package' element, so we unwrap it here
+ * to provide a flat structure for ADK consumers.
+ */
+type PackageXml = NonNullable<PackageResponse['package']>;
+/**
+ * ADK Package object
+ *
+ * Inherits from AdkMainObject which provides:
+ * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
+ * - AdkMainObject: packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
+ *
+ * Note: For packages, the parent package is stored in `superPackage` not `packageRef`.
+ * The `package` getter is overridden to return the super package name.
+ */
+declare class AdkPackage extends AdkMainObject<typeof Package, PackageXml> implements AbapPackage {
+  static readonly kind: "Package";
+  readonly kind: "Package";
+  get objectUri(): string;
+  get package(): string;
+  get attributes(): PackageAttributes;
+  get superPackage(): ObjectReference | undefined;
+  get applicationComponent(): ApplicationComponent | undefined;
+  get transport(): TransportConfig | undefined;
+  getSubpackages(): Promise<AbapPackage[]>;
+  getObjects(): Promise<AbapObject[]>;
+  getAllObjects(): Promise<AbapObject[]>;
+  load(): Promise<this>;
+  protected get wrapperKey(): "package";
+  protected get crudContract(): any;
   /**
-   * Check if error suggests the object doesn't exist or the operation
-   * is not supported for the current state.
+   * Get skeleton data for package creation (POST).
    *
-   * Some SAP DDIC endpoints (TABL, TTYP) return 405 Method Not Allowed
-   * instead of 404 when attempting to lock or PUT a non-existent object.
-   * In upsert mode, both should trigger a fallback to POST (create).
-   */
-  protected shouldFallbackToCreate(e: unknown): boolean;
-  /**
-   * Check if error is a 422 "already exists" from a POST create attempt
-   */
-  protected isAlreadyExistsError(e: unknown): boolean;
-  /**
-   * Check if object has pending sources to save
-   * Subclasses with source code (classes, interfaces) override this
-   */
-  protected hasPendingSources(): boolean;
-  /**
-   * Normalize source code for comparison.
-   * Trims trailing whitespace/newlines so minor formatting differences
-   * don't trigger unnecessary saves.
+   * SAP requires ALL elements in the Package xs:sequence, even if empty.
+   * The sequence order is: attributes, superPackage, extensionAlias, switch,
+   * applicationComponent, transport, translation, useAccesses,
+   * packageInterfaces, subPackages.
+   * Missing elements cause "System expected the element ..." 400 errors.
    */
-  protected normalizeSource(source: string): string;
+  protected getSkeletonData(): Promise<Record<string, unknown>>;
   /**
-   * Check if pending sources are unchanged vs SAP (pre-lock comparison).
-   * Sets _unchanged = true if nothing needs saving.
+   * Get a package by name
    *
-   * Default handles single-source objects (_pendingSource) by fetching
-   * GET {objectUri}/source/main and comparing.
-   * AdkClass overrides this for multi-include logic.
+   * @param name - Package name (e.g., '$TMP', 'ZPACKAGE')
+   * @param ctx - Optional ADK context (uses global context if not provided)
    */
-  protected checkPendingSourcesUnchanged(): Promise<void>;
+  static get(name: string, ctx?: AdkContext): Promise<AdkPackage>;
   /**
-   * Check if metadata-only objects are unchanged on SAP.
+   * Check if a package exists on SAP
    *
-   * For objects without source code (DDIC types like DOMA, DTEL, TABL, TTYP),
-   * fetches the current SAP state and compares only the fields present in
-   * the local data. SAP returns extra volatile fields (timestamps, links,
-   * version, etc.) that are ignored — only semantic fields matter.
+   * @param name - Package name
+   * @param ctx - Optional ADK context (uses global context if not provided)
+   * @returns true if package exists, false otherwise
    */
-  protected checkMetadataUnchanged(): Promise<void>;
+  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
   /**
-   * Refresh cached ETags after acquiring a lock.
-   *
-   * SAP changes the object's internal version when a lock is acquired,
-   * which invalidates any cached ETags. Without refreshing, the next
-   * PUT sends a stale If-Match header and SAP returns HTTP 412.
+   * Create a new package on SAP
    *
-   * For objects with pending sources: re-GET {objectUri}/source/main
-   * For metadata-only objects: re-GET via crudContract.get()
+   * Builds an AdkPackage with the given data and saves it in 'create' mode.
    *
-   * Subclasses with multiple source endpoints (e.g., AdkClass with includes)
-   * should override this to refresh all relevant endpoints.
+   * @param name - Package name (e.g., 'ZABAPGIT_EXAMPLES_CLAS')
+   * @param data - Package data (superPackage, attributes, transport, etc.)
+   * @param options - Save options (transport request)
+   * @param ctx - Optional ADK context (uses global context if not provided)
    */
-  protected refreshETagsAfterLock(): Promise<void>;
+  static create(name: string, data: Partial<PackageXml>, options?: {
+    transport?: string;
+  }, ctx?: AdkContext): Promise<AdkPackage>;
   /**
-   * Save pending sources to SAP.
+   * Delete an ABAP package from SAP
    *
-   * Default handles single-source objects (_pendingSource) by PUTting
-   * to {objectUri}/source/main.
-   * AdkClass overrides this for multi-include logic.
+   * @param name - Package name
+   * @param options - Delete options (transport, lockHandle)
+   * @param ctx - Optional ADK context (uses global context if not provided)
    */
-  protected savePendingSources(options?: {
-    lockHandle?: string;
+  static delete(name: string, options?: {
     transport?: string;
-  }): Promise<void>;
+    lockHandle?: string;
+  }, ctx?: AdkContext): Promise<void>;
+}
+/**
+ * Program data type - unwrap from root element
+ *
+ * The schema wraps everything in an 'abapProgram' element, so we unwrap it here
+ * to provide a flat structure for ADK consumers.
+ */
+type ProgramXml = ProgramResponse['abapProgram'];
+/**
+ * ADK Program object
+ *
+ * Inherits from AdkMainObject which provides:
+ * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
+ * - AdkMainObject: package, packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
+ *
+ * Access program-specific properties via `data`:
+ * - data.programType, data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck
+ */
+declare class AdkProgram extends AdkMainObject<typeof Program, ProgramXml> {
+  static readonly kind: "Program";
+  readonly kind: "Program";
+  get objectUri(): string;
+  getSource(): Promise<string>;
+  protected get wrapperKey(): string;
+  protected get crudContract(): any;
+  static get(name: string, ctx?: AdkContext): Promise<AdkProgram>;
   /**
-   * Set source content for a source-based object
-   *
-   * Generic implementation for objects with source code (classes, includes, etc.)
-   * Subclasses should override if they need custom source handling.
-   *
-   * @param sourcePath - Relative path to source (e.g., '/source/main')
-   * @param content - Source code content
-   * @param options - Save options
+   * Check if a program exists on SAP
    */
-  setSource(sourcePath: string, content: string, options?: SaveOptions): Promise<void>;
+  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
   /**
-   * Activate this object
-   *
-   * Activates a single object. For bulk activation of multiple objects,
-   * use `AdkObjectSet.activateAll()`.
+   * Create a new ABAP program on SAP
    *
-   * @returns this (for chaining)
+   * @param name - Program name (e.g., 'ZMYPROGRAM')
+   * @param description - Short description
+   * @param packageName - Package to assign the program to
+   * @param options - Save options (transport)
+   * @param ctx - Optional ADK context
    */
-  activate(): Promise<this>;
-  /** Lazy load a segment (async) - fetches only once, then cached */
-  protected lazy<T>(key: string, loader: () => Promise<T>): Promise<T>;
-  /** Lazy compute a segment (sync) - computes only once, then cached */
-  protected cached<T>(key: string, compute: () => T): T;
-  /** Set a cached value directly (for local/generated data) */
-  protected set<T>(key: string, value: T): void;
-  /** Mark a segment as dirty (modified locally) */
-  protected markDirty(key: string): void;
-  /** Check if any segment (or specific segment) is dirty */
-  isDirty(segment?: string): boolean;
-  /** Clear cache for a segment (force reload on next access) */
-  protected invalidate(key: string): void;
+  static create(name: string, description: string, packageName: string, options?: {
+    transport?: string;
+  }, ctx?: AdkContext): Promise<AdkProgram>;
   /**
-   * Fetch a text resource from an ADT endpoint.
-   * Delegates to the underlying ADT client's fetch.
+   * Delete an ABAP program from SAP
    *
-   * @param url - ADT endpoint path (e.g., '/sap/bc/adt/ddic/dataelements/spras')
-   * @param headers - Optional HTTP headers (defaults to no Accept header, letting server choose)
-   * @returns Response content as text, or undefined if 404
+   * @param name - Program name
+   * @param options - Delete options (transport)
+   * @param ctx - Optional ADK context
    */
-  fetchText(url: string, headers?: Record<string, string>): Promise<string | undefined>;
+  static delete(name: string, options?: {
+    transport?: string;
+    lockHandle?: string;
+  }, ctx?: AdkContext): Promise<void>;
 }
 /**
- * Base class for main development objects (AdtMainObject)
+ * Include data type - unwrap from root element.
  *
- * Extends AdkObject with package reference, responsible user, and master language.
- * Used for repository objects like classes, interfaces, packages, etc.
+ * The schema wraps everything in an 'abapInclude' element, so we unwrap
+ * it here to provide a flat structure for ADK consumers.
+ */
+type IncludeXml = IncludeResponse['abapInclude'];
+/**
+ * ADK Include object
  *
- * Note: Uses type assertions internally because schema-inferred types from
- * contracts may have different shapes than AdkMainObjectData. The getters
- * safely handle missing properties with defaults.
+ * Inherits from AdkMainObject which provides:
+ * - AdkObject: name, type, description, version, language, changedBy/At,
+ *   createdBy/At, links
+ * - AdkMainObject: package, packageRef, responsible, masterLanguage,
+ *   masterSystem, abapLanguageVersion
  *
- * @typeParam K - The object kind (from AdkKind)
- * @typeParam D - The internal data type (typically schema-inferred from contract)
+ * Access include-specific properties via `data`:
+ * - data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck,
+ *   data.contextRef (pointer to the main program)
  */
-declare abstract class AdkMainObject<K extends AdkKind = AdkKind, D = any> extends AdkObject<K, D> {
-  private get mainData();
-  /** Package reference (adtcore:packageRef) */
-  get packageRef(): AdtObjectReference | undefined;
-  /** Package name (convenience getter) */
-  get package(): string;
-  /** Master system (adtcore:masterSystem) */
-  get masterSystem(): string;
-  /** Master language (adtcore:masterLanguage) */
-  get masterLanguage(): string;
-  /** Responsible user (adtcore:responsible) */
-  get responsible(): string;
-  /** ABAP language version (adtcore:abapLanguageVersion) */
-  get abapLanguageVersion(): string;
+declare class AdkInclude extends AdkMainObject<typeof Include, IncludeXml> {
+  static readonly kind: "Include";
+  readonly kind: "Include";
+  get objectUri(): string;
+  getSource(): Promise<string>;
+  protected get wrapperKey(): string;
+  protected get crudContract(): any;
   /**
-   * Save main source code to SAP.
-   * Requires the object to be locked before calling.
-   * Subclasses may override to add additional behavior (e.g. cache invalidation).
-   */
-  saveMainSource(source: string, options?: {
-    lockHandle?: string;
-    transport?: string;
-  }): Promise<void>;
-}
-/**
- * Class category (class:category attribute)
- */
-type ClassCategory = 'generalObjectType' | 'exceptionClass' | 'testClass' | 'exitClass' | 'areaClass' | 'factoryClass' | 'persistentClass' | 'bspClass' | 'staticTypedLcpClass' | 'behaviorPool' | 'rfcProxyClass' | 'entityEventHandler' | 'communicationConnectionClass' | 'others';
-/**
- * Class include type (class:includeType attribute)
- */
-type ClassIncludeType = 'main' | 'definitions' | 'implementations' | 'macros' | 'testclasses' | 'localtypes';
-/**
- * Class visibility (class:visibility attribute)
- */
-type ClassVisibility = 'public' | 'protected' | 'private';
-/**
- * Class include section
- */
-interface ClassInclude {
-  readonly includeType: ClassIncludeType;
-  readonly sourceUri: string;
-  readonly name: string;
-  readonly type: string;
-  readonly version: string;
-  readonly changedAt: Date;
-  readonly createdAt: Date;
-  readonly changedBy: string;
-  readonly createdBy: string;
-}
-/**
- * ABAP Class interface
- *
- * Plugins work with this interface - implementation is internal.
- * Mirrors ADT class:abapClass structure.
- */
-interface AbapClass extends AbapObject {
-  readonly kind: 'Class';
-  readonly responsible: string;
-  readonly masterLanguage: string;
-  readonly language: string;
-  readonly version: string;
-  readonly createdAt: Date;
-  readonly createdBy: string;
-  readonly changedAt: Date;
-  readonly changedBy: string;
-  readonly category: ClassCategory;
-  readonly final: boolean;
-  readonly abstract: boolean;
-  readonly visibility: ClassVisibility;
-  readonly sharedMemoryEnabled: boolean;
-  readonly modeled: boolean;
-  readonly fixPointArithmetic: boolean;
-  readonly activeUnicodeCheck: boolean;
-  readonly superClassRef?: AdtObjectReference;
-  readonly messageClassRef?: AdtObjectReference;
-  readonly packageRef?: AdtObjectReference;
-  readonly includes: ClassInclude[];
-  /**
-   * Get main source code (global definitions + implementations)
-   */
-  getMainSource(): Promise<string>;
-  /**
-   * Get source code for a specific include
+   * Skeleton POST data for includes.
+   *
+   * Extends the base skeleton (name/type/description/packageRef) with
+   * `contextRef`, which sapcli's `sap.adt.Include(..., master=...)` serializes
+   * at creation time. Without this the include would be created detached
+   * from its main program.
    */
-  getIncludeSource(includeType: ClassIncludeType): Promise<string>;
+  protected getSkeletonData(): Promise<Record<string, unknown>>;
+  static get(name: string, ctx?: AdkContext): Promise<AdkInclude>;
   /**
-   * Get definitions include source
+   * Check if an include exists on SAP
    */
-  getDefinitions(): Promise<string>;
+  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
   /**
-   * Get implementations include source
+   * Create a new ABAP include on SAP
+   *
+   * @param name - Include name (e.g., 'ZMY_INCLUDE')
+   * @param description - Short description
+   * @param packageName - Package to assign the include to
+   * @param options - Save options (transport, master program)
+   * @param ctx - Optional ADK context
    */
-  getImplementations(): Promise<string>;
+  static create(name: string, description: string, packageName: string, options?: {
+    transport?: string;
+    master?: string;
+  }, ctx?: AdkContext): Promise<AdkInclude>;
   /**
-   * Get test classes source
+   * Delete an ABAP include from SAP
+   *
+   * @param name - Include name
+   * @param options - Delete options (transport, lockHandle)
+   * @param ctx - Optional ADK context
    */
-  getTestClasses(): Promise<string>;
+  static delete(name: string, options?: {
+    transport?: string;
+    lockHandle?: string;
+  }, ctx?: AdkContext): Promise<void>;
 }
 /**
- * Class data type - imported from contract
+ * Function group data type - unwrap from root element
  *
- * The schema wraps everything in an 'abapClass' element, so we unwrap it here
+ * The schema wraps everything in an 'abapFunctionGroup' element, so we unwrap it here
  * to provide a flat structure for ADK consumers.
  */
-type ClassXml = ClassResponse['abapClass'];
+type FunctionGroupXml = FunctionGroupResponse['abapFunctionGroup'];
 /**
- * ADK Class object
+ * ADK Function Group object
  *
  * Inherits from AdkMainObject which provides:
  * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
  * - AdkMainObject: package, packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
  *
- * Access class-specific properties via `data`:
- * - data.category, data.final, data.abstract, data.visibility
- * - data.sharedMemoryEnabled, data.modeled, data.fixPointArithmetic
- * - data.superClassRef, data.messageClassRef, data.include
+ * Access function group-specific properties via `data`:
+ * - data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck
  */
-declare class AdkClass extends AdkMainObject<typeof Class, ClassXml> {
-  static readonly kind: "Class";
-  readonly kind: "Class";
+declare class AdkFunctionGroup extends AdkMainObject<typeof FunctionGroup, FunctionGroupXml> {
+  static readonly kind: "FunctionGroup";
+  readonly kind: "FunctionGroup";
   get objectUri(): string;
-  getMainSource(): Promise<string>;
-  getIncludeSource(includeType: ClassIncludeType): Promise<string>;
-  getDefinitions(): Promise<string>;
-  getImplementations(): Promise<string>;
-  getTestClasses(): Promise<string>;
-  /**
-   * Save main source code
-   * Requires object to be locked first
-   */
-  saveMainSource(source: string, options?: {
-    lockHandle?: string;
-    transport?: string;
-  }): Promise<void>;
-  /**
-   * Save include source code
-   * Requires object to be locked first
-   */
-  saveIncludeSource(includeType: ClassIncludeType, source: string, options?: {
-    lockHandle?: string;
-    transport?: string;
-  }): Promise<void>;
-  /**
-   * Save all pending sources (set via _pendingSources)
-   * Used by export workflow after deserialization from abapGit
-   * Overrides base class method
-   *
-   * Note: unchanged detection is handled by checkPendingSourcesUnchanged()
-   * which runs BEFORE lock acquisition. By the time we reach here,
-   * at least one source differs — save them all.
-   */
-  protected savePendingSources(options?: {
-    lockHandle?: string;
-    transport?: string;
-  }): Promise<void>;
-  /**
-   * Pre-lock comparison: check if all pending sources match SAP
-   * If identical, sets _unchanged = true so save() skips locking and PUT
-   */
-  protected checkPendingSourcesUnchanged(): Promise<void>;
-  /**
-   * Check if object has pending sources to save
-   * Overrides base class method
-   */
-  protected hasPendingSources(): boolean;
-  /**
-   * Refresh cached ETags for all pending source endpoints after locking.
-   * Classes have multiple source URLs (main + includes) that all need fresh ETags.
-   */
-  protected refreshETagsAfterLock(): Promise<void>;
+  getSource(): Promise<string>;
   protected get wrapperKey(): string;
   protected get crudContract(): any;
-  static get(name: string, ctx?: AdkContext): Promise<AdkClass>;
+  static get(name: string, ctx?: AdkContext): Promise<AdkFunctionGroup>;
   /**
-   * Check if a class exists on SAP
+   * Check if a function group exists on SAP
    */
   static exists(name: string, ctx?: AdkContext): Promise<boolean>;
   /**
-   * Create a new ABAP class on SAP
-   *
-   * @param name - Class name (e.g., 'ZCL_MY_CLASS')
-   * @param description - Short description
-   * @param packageName - Package to assign the class to
-   * @param options - Save options (transport)
-   * @param ctx - Optional ADK context
+   * Create a new ABAP function group on SAP
    */
   static create(name: string, description: string, packageName: string, options?: {
     transport?: string;
-  }, ctx?: AdkContext): Promise<AdkClass>;
+  }, ctx?: AdkContext): Promise<AdkFunctionGroup>;
   /**
-   * Delete an ABAP class from SAP
-   *
-   * @param name - Class name
-   * @param options - Delete options (transport)
-   * @param ctx - Optional ADK context
+   * Delete an ABAP function group from SAP
    */
   static delete(name: string, options?: {
     transport?: string;
@@ -773,543 +681,154 @@ declare class AdkClass extends AdkMainObject<typeof Class, ClassXml> {
   }, ctx?: AdkContext): Promise<void>;
 }
 /**
- * Interface data type - imported from contract
+ * Function module data type - unwrap from root element
  *
- * The schema wraps everything in an 'abapInterface' element, so we unwrap it here
+ * The schema wraps everything in an 'abapFunctionModule' element, so we unwrap it here
  * to provide a flat structure for ADK consumers.
  */
-type InterfaceXml = InterfaceResponse['abapInterface'];
-/**
- * ADK Interface object
- *
- * Inherits from AdkMainObject which provides:
- * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
- * - AdkMainObject: package, packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
- *
- * Access interface-specific properties via `data`:
- * - data.modeled, data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck
- */
-declare class AdkInterface extends AdkMainObject<typeof Interface, InterfaceXml> {
-  static readonly kind: "Interface";
-  readonly kind: "Interface";
+type FunctionModuleXml = FunctionModuleResponse['abapFunctionModule'];
+declare class AdkFunctionModule extends AdkObject<typeof FunctionModule, FunctionModuleXml> {
+  static readonly kind: "FunctionModule";
+  readonly kind: "FunctionModule";
+  /** Parent function group name */
+  groupName: string;
+  /**
+   * Constructor supports two calling patterns:
+   *
+   * 1. Direct (3-arg): `new AdkFunctionModule(ctx, groupName, nameOrData)`
+   *    Used by static factory method and when group name is known upfront.
+   *
+   * 2. Factory (2-arg): `new AdkFunctionModule(ctx, data)`
+   *    Used by ADK factory's `getWithData()`. The groupName is extracted from
+   *    `data._groupName` or `data.containerRef.name`.
+   */
+  constructor(ctx: AdkContext, groupNameOrData: string | FunctionModuleXml, dataOrName?: FunctionModuleXml | string);
   get objectUri(): string;
-  getSource(): Promise<string>;
+  get collectionUri(): string;
   protected get wrapperKey(): string;
   protected get crudContract(): any;
-  static get(name: string, ctx?: AdkContext): Promise<AdkInterface>;
   /**
-   * Check if an interface exists on SAP
+   * Load function module data from SAP
+   *
+   * Overrides base to pass groupName as first arg to contract.get()
    */
-  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
+  load(): Promise<this>;
   /**
-   * Create a new ABAP interface on SAP
+   * Get skeleton data for FM creation (POST).
    *
-   * @param name - Interface name (e.g., 'ZIF_MY_INTERFACE')
-   * @param description - Short description
-   * @param packageName - Package to assign the interface to
-   * @param options - Save options (transport)
-   * @param ctx - Optional ADK context
+   * FMs only need name, type, description, and processing attributes.
+   * No packageRef — FMs inherit the package from their parent FUGR.
    */
-  static create(name: string, description: string, packageName: string, options?: {
-    transport?: string;
-  }, ctx?: AdkContext): Promise<AdkInterface>;
+  protected getSkeletonData(): Promise<Record<string, unknown>>;
   /**
-   * Delete an ABAP interface from SAP
+   * Execute the typed contract call for save
    *
-   * @param name - Interface name
-   * @param options - Delete options (transport)
-   * @param ctx - Optional ADK context
+   * Overrides base to pass groupName to contract.put()/post()
    */
-  static delete(name: string, options?: {
+  protected saveViaContract(mode: 'create' | 'update', options: {
     transport?: string;
     lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-}
-/**
- * Package type (pak:packageType attribute)
- */
-type PackageType = 'development' | 'structure' | 'main';
-/**
- * Reference to another object (used for superPackage, etc.)
- * Re-exported for backward compatibility
- */
-type ObjectReference = AdtObjectReference;
-/**
- * Package attributes (pak:attributes element)
- */
-interface PackageAttributes {
-  readonly packageType: PackageType;
-  readonly isEncapsulated: boolean;
-  readonly isAddingObjectsAllowed: boolean;
-  readonly recordChanges: boolean;
-  readonly languageVersion: string;
-}
-/**
- * Application component info
- */
-interface ApplicationComponent {
-  readonly name: string;
-  readonly description: string;
-}
-/**
- * Software component info
- */
-interface SoftwareComponent {
-  readonly name: string;
-  readonly description: string;
-}
-/**
- * Transport layer info
- */
-interface TransportLayer {
-  readonly name: string;
-  readonly description: string;
-}
-/**
- * Transport configuration
- */
-interface TransportConfig {
-  readonly softwareComponent?: SoftwareComponent;
-  readonly transportLayer?: TransportLayer;
-}
-/**
- * ABAP Package interface
- *
- * Plugins work with this interface - implementation is internal.
- * Mirrors ADT pak:package structure.
- */
-interface AbapPackage extends AbapObject {
-  readonly kind: 'Package';
-  readonly responsible: string;
-  readonly masterLanguage: string;
-  readonly language: string;
-  readonly version: string;
-  readonly createdAt: Date;
-  readonly createdBy: string;
-  readonly changedAt: Date;
-  readonly changedBy: string;
-  readonly attributes: PackageAttributes;
-  readonly superPackage?: AdtObjectReference;
-  readonly applicationComponent?: ApplicationComponent;
-  readonly transport?: TransportConfig;
-  /**
-   * Get direct subpackages
-   */
-  getSubpackages(): Promise<AbapPackage[]>;
-  /**
-   * Get objects contained in this package (direct, not recursive)
-   */
-  getObjects(): Promise<AbapObject[]>;
+  }): Promise<void>;
   /**
-   * Get all objects recursively (includes subpackages)
+   * Check if the function module exists on the SAP system.
+   *
+   * Overrides base to pass groupName to contract.get()
    */
-  getAllObjects(): Promise<AbapObject[]>;
-}
-/**
- * Package data type - inferred from packagesContract response
- *
- * The schema wraps everything in a 'package' element, so we unwrap it here
- * to provide a flat structure for ADK consumers.
- */
-type PackageXml = NonNullable<PackageResponse['package']>;
-/**
- * ADK Package object
- *
- * Inherits from AdkMainObject which provides:
- * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
- * - AdkMainObject: packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
- *
- * Note: For packages, the parent package is stored in `superPackage` not `packageRef`.
- * The `package` getter is overridden to return the super package name.
- */
-declare class AdkPackage extends AdkMainObject<typeof Package, PackageXml> implements AbapPackage {
-  static readonly kind: "Package";
-  readonly kind: "Package";
-  get objectUri(): string;
-  get package(): string;
-  get attributes(): PackageAttributes;
-  get superPackage(): ObjectReference | undefined;
-  get applicationComponent(): ApplicationComponent | undefined;
-  get transport(): TransportConfig | undefined;
-  getSubpackages(): Promise<AbapPackage[]>;
-  getObjects(): Promise<AbapObject[]>;
-  getAllObjects(): Promise<AbapObject[]>;
-  load(): Promise<this>;
-  protected get wrapperKey(): "package";
-  protected get crudContract(): any;
+  protected checkObjectExists(): Promise<boolean>;
   /**
-   * Get skeleton data for package creation (POST).
+   * Refresh cached ETags after acquiring a lock.
    *
-   * SAP requires ALL elements in the Package xs:sequence, even if empty.
-   * The sequence order is: attributes, superPackage, extensionAlias, switch,
-   * applicationComponent, transport, translation, useAccesses,
-   * packageInterfaces, subPackages.
-   * Missing elements cause "System expected the element ..." 400 errors.
+   * FM's savePendingSources() does a metadata PUT first (to apply processingType),
+   * then a source PUT. Both need fresh ETags after locking.
+   * The contract uses groupName + name (potentially UPPERCASE), so we must
+   * refresh via the contract to match the same cache key.
    */
-  protected getSkeletonData(): Promise<Record<string, unknown>>;
+  protected refreshETagsAfterLock(): Promise<void>;
   /**
-   * Get a package by name
+   * Strip the parameter comment block from FM source code.
    *
-   * @param name - Package name (e.g., '$TMP', 'ZPACKAGE')
-   * @param ctx - Optional ADK context (uses global context if not provided)
+   * abapGit serializes FM source with a "Local Interface" comment block
+   * that describes IMPORTING/EXPORTING/CHANGING/TABLES/EXCEPTIONS.
+   * SAP ADT rejects this block when saving source — it manages the
+   * interface metadata separately. Strip it before sending.
+   *
+   * Pattern:
+   * ```
+   * *"----------------------------------------------------------------------
+   * *"*"Local Interface:
+   * *"  IMPORTING ...
+   * *"----------------------------------------------------------------------
+   * ```
    */
-  static get(name: string, ctx?: AdkContext): Promise<AdkPackage>;
+  private stripParameterCommentBlock;
   /**
-   * Check if a package exists on SAP
+   * Save pending source for function module.
    *
-   * @param name - Package name
-   * @param ctx - Optional ADK context (uses global context if not provided)
-   * @returns true if package exists, false otherwise
+   * Overrides base to:
+   * 1. PUT metadata first (SAP ignores processingType and other attributes during POST)
+   * 2. Refresh source ETag (metadata PUT changes the object version)
+   * 3. Strip the parameter comment block that abapGit includes
+   * 4. Use the FM-specific source endpoint via groupName
    */
-  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
+  protected savePendingSources(options?: {
+    lockHandle?: string;
+    transport?: string;
+  }): Promise<void>;
   /**
-   * Create a new package on SAP
+   * Extract the body of a FUNCTION...ENDFUNCTION block.
    *
-   * Builds an AdkPackage with the given data and saves it in 'create' mode.
+   * SAP reconstructs the FUNCTION header when returning source code:
+   *   Local:  `FUNCTION zage_fm.`                         (lowercase, period inline)
+   *   SAP:    `FUNCTION ZAGE_FM\n " template comment"\n.` (uppercase, period on own line)
    *
-   * @param name - Package name (e.g., 'ZABAPGIT_EXAMPLES_CLAS')
-   * @param data - Package data (superPackage, attributes, transport, etc.)
-   * @param options - Save options (transport request)
-   * @param ctx - Optional ADK context (uses global context if not provided)
+   * The body between the header and ENDFUNCTION is identical, so we compare
+   * only that part. The header ends at the first period that terminates the
+   * FUNCTION statement (either inline `FUNCTION name.` or on a separate line `.`).
    */
-  static create(name: string, data: Partial<PackageXml>, options?: {
-    transport?: string;
-  }, ctx?: AdkContext): Promise<AdkPackage>;
+  private extractFunctionBody;
   /**
-   * Delete an ABAP package from SAP
+   * Pre-lock comparison for FM source.
    *
-   * @param name - Package name
-   * @param options - Delete options (transport, lockHandle)
-   * @param ctx - Optional ADK context (uses global context if not provided)
+   * Overrides base to:
+   * 1. Strip parameter comment block from local source
+   * 2. Extract only the function body (between FUNCTION header and ENDFUNCTION)
+   *    from both local and SAP source, because SAP reconstructs the FUNCTION
+   *    header with uppercase name and template comments.
    */
-  static delete(name: string, options?: {
-    transport?: string;
-    lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-}
-/**
- * Program data type - unwrap from root element
- *
- * The schema wraps everything in an 'abapProgram' element, so we unwrap it here
- * to provide a flat structure for ADK consumers.
- */
-type ProgramXml = ProgramResponse['abapProgram'];
-/**
- * ADK Program object
- *
- * Inherits from AdkMainObject which provides:
- * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
- * - AdkMainObject: package, packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
- *
- * Access program-specific properties via `data`:
- * - data.programType, data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck
- */
-declare class AdkProgram extends AdkMainObject<typeof Program, ProgramXml> {
-  static readonly kind: "Program";
-  readonly kind: "Program";
-  get objectUri(): string;
+  protected checkPendingSourcesUnchanged(): Promise<void>;
   getSource(): Promise<string>;
-  protected get wrapperKey(): string;
-  protected get crudContract(): any;
-  static get(name: string, ctx?: AdkContext): Promise<AdkProgram>;
   /**
-   * Check if a program exists on SAP
+   * Get a function module by name
+   *
+   * @param groupName - Parent function group name
+   * @param name - Function module name
+   * @param ctx - Optional ADK context (uses global if not provided)
    */
-  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
+  static get(groupName: string, name: string, ctx?: AdkContext): Promise<AdkFunctionModule>;
   /**
-   * Create a new ABAP program on SAP
-   *
-   * @param name - Program name (e.g., 'ZMYPROGRAM')
-   * @param description - Short description
-   * @param packageName - Package to assign the program to
-   * @param options - Save options (transport)
-   * @param ctx - Optional ADK context
+   * Check if a function module exists on SAP
    */
-  static create(name: string, description: string, packageName: string, options?: {
+  static exists(groupName: string, name: string, ctx?: AdkContext): Promise<boolean>;
+  /**
+   * Create a new ABAP function module on SAP
+   */
+  static create(groupName: string, name: string, description: string, options?: {
     transport?: string;
-  }, ctx?: AdkContext): Promise<AdkProgram>;
+    processingType?: string;
+  }, ctx?: AdkContext): Promise<AdkFunctionModule>;
   /**
-   * Delete an ABAP program from SAP
-   *
-   * @param name - Program name
-   * @param options - Delete options (transport)
-   * @param ctx - Optional ADK context
+   * Delete a function module from SAP
    */
-  static delete(name: string, options?: {
+  static delete(groupName: string, name: string, options?: {
     transport?: string;
     lockHandle?: string;
   }, ctx?: AdkContext): Promise<void>;
 }
 /**
- * Include data type - unwrap from root element.
+ * Full response type from TransportService.get()
  *
- * The schema wraps everything in an 'abapInclude' element, so we unwrap
- * it here to provide a flat structure for ADK consumers.
- */
-type IncludeXml = IncludeResponse['abapInclude'];
-/**
- * ADK Include object
- *
- * Inherits from AdkMainObject which provides:
- * - AdkObject: name, type, description, version, language, changedBy/At,
- *   createdBy/At, links
- * - AdkMainObject: package, packageRef, responsible, masterLanguage,
- *   masterSystem, abapLanguageVersion
- *
- * Access include-specific properties via `data`:
- * - data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck,
- *   data.contextRef (pointer to the main program)
- */
-declare class AdkInclude extends AdkMainObject<typeof Include, IncludeXml> {
-  static readonly kind: "Include";
-  readonly kind: "Include";
-  get objectUri(): string;
-  getSource(): Promise<string>;
-  protected get wrapperKey(): string;
-  protected get crudContract(): any;
-  /**
-   * Skeleton POST data for includes.
-   *
-   * Extends the base skeleton (name/type/description/packageRef) with
-   * `contextRef`, which sapcli's `sap.adt.Include(..., master=...)` serializes
-   * at creation time. Without this the include would be created detached
-   * from its main program.
-   */
-  protected getSkeletonData(): Promise<Record<string, unknown>>;
-  static get(name: string, ctx?: AdkContext): Promise<AdkInclude>;
-  /**
-   * Check if an include exists on SAP
-   */
-  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
-  /**
-   * Create a new ABAP include on SAP
-   *
-   * @param name - Include name (e.g., 'ZMY_INCLUDE')
-   * @param description - Short description
-   * @param packageName - Package to assign the include to
-   * @param options - Save options (transport, master program)
-   * @param ctx - Optional ADK context
-   */
-  static create(name: string, description: string, packageName: string, options?: {
-    transport?: string;
-    master?: string;
-  }, ctx?: AdkContext): Promise<AdkInclude>;
-  /**
-   * Delete an ABAP include from SAP
-   *
-   * @param name - Include name
-   * @param options - Delete options (transport, lockHandle)
-   * @param ctx - Optional ADK context
-   */
-  static delete(name: string, options?: {
-    transport?: string;
-    lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-}
-/**
- * Function group data type - unwrap from root element
- *
- * The schema wraps everything in an 'abapFunctionGroup' element, so we unwrap it here
- * to provide a flat structure for ADK consumers.
- */
-type FunctionGroupXml = FunctionGroupResponse['abapFunctionGroup'];
-/**
- * ADK Function Group object
- *
- * Inherits from AdkMainObject which provides:
- * - AdkObject: name, type, description, version, language, changedBy/At, createdBy/At, links
- * - AdkMainObject: package, packageRef, responsible, masterLanguage, masterSystem, abapLanguageVersion
- *
- * Access function group-specific properties via `data`:
- * - data.sourceUri, data.fixPointArithmetic, data.activeUnicodeCheck
- */
-declare class AdkFunctionGroup extends AdkMainObject<typeof FunctionGroup, FunctionGroupXml> {
-  static readonly kind: "FunctionGroup";
-  readonly kind: "FunctionGroup";
-  get objectUri(): string;
-  getSource(): Promise<string>;
-  protected get wrapperKey(): string;
-  protected get crudContract(): any;
-  static get(name: string, ctx?: AdkContext): Promise<AdkFunctionGroup>;
-  /**
-   * Check if a function group exists on SAP
-   */
-  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
-  /**
-   * Create a new ABAP function group on SAP
-   */
-  static create(name: string, description: string, packageName: string, options?: {
-    transport?: string;
-  }, ctx?: AdkContext): Promise<AdkFunctionGroup>;
-  /**
-   * Delete an ABAP function group from SAP
-   */
-  static delete(name: string, options?: {
-    transport?: string;
-    lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-}
-/**
- * Function module data type - unwrap from root element
- *
- * The schema wraps everything in an 'abapFunctionModule' element, so we unwrap it here
- * to provide a flat structure for ADK consumers.
- */
-type FunctionModuleXml = FunctionModuleResponse['abapFunctionModule'];
-/**
- * ADK Function Module object
- *
- * Function modules are child objects of function groups. Unlike main objects
- * (classes, interfaces, etc.), they don't have their own package reference.
- * All API operations require the parent group name in the URL path.
- *
- * Key differences from AdkMainObject:
- * - Requires `groupName` for URI construction and all CRUD operations
- * - Overrides lock/unlock/load/save to pass groupName to contract calls
- * - No packageRef (lives within parent function group's package)
- */
-declare class AdkFunctionModule extends AdkObject<typeof FunctionModule, FunctionModuleXml> {
-  static readonly kind: "FunctionModule";
-  readonly kind: "FunctionModule";
-  /** Parent function group name */
-  groupName: string;
-  /**
-   * Constructor supports two calling patterns:
-   *
-   * 1. Direct (3-arg): `new AdkFunctionModule(ctx, groupName, nameOrData)`
-   *    Used by static factory method and when group name is known upfront.
-   *
-   * 2. Factory (2-arg): `new AdkFunctionModule(ctx, data)`
-   *    Used by ADK factory's `getWithData()`. The groupName is extracted from
-   *    `data._groupName` or `data.containerRef.name`.
-   */
-  constructor(ctx: AdkContext, groupNameOrData: string | FunctionModuleXml, dataOrName?: FunctionModuleXml | string);
-  get objectUri(): string;
-  get collectionUri(): string;
-  protected get wrapperKey(): string;
-  protected get crudContract(): any;
-  /**
-   * Load function module data from SAP
-   *
-   * Overrides base to pass groupName as first arg to contract.get()
-   */
-  load(): Promise<this>;
-  /**
-   * Get skeleton data for FM creation (POST).
-   *
-   * FMs only need name, type, description, and processing attributes.
-   * No packageRef — FMs inherit the package from their parent FUGR.
-   */
-  protected getSkeletonData(): Promise<Record<string, unknown>>;
-  /**
-   * Execute the typed contract call for save
-   *
-   * Overrides base to pass groupName to contract.put()/post()
-   */
-  protected saveViaContract(mode: 'create' | 'update', options: {
-    transport?: string;
-    lockHandle?: string;
-  }): Promise<void>;
-  /**
-   * Check if the function module exists on the SAP system.
-   *
-   * Overrides base to pass groupName to contract.get()
-   */
-  protected checkObjectExists(): Promise<boolean>;
-  /**
-   * Refresh cached ETags after acquiring a lock.
-   *
-   * FM's savePendingSources() does a metadata PUT first (to apply processingType),
-   * then a source PUT. Both need fresh ETags after locking.
-   * The contract uses groupName + name (potentially UPPERCASE), so we must
-   * refresh via the contract to match the same cache key.
-   */
-  protected refreshETagsAfterLock(): Promise<void>;
-  /**
-   * Strip the parameter comment block from FM source code.
-   *
-   * abapGit serializes FM source with a "Local Interface" comment block
-   * that describes IMPORTING/EXPORTING/CHANGING/TABLES/EXCEPTIONS.
-   * SAP ADT rejects this block when saving source — it manages the
-   * interface metadata separately. Strip it before sending.
-   *
-   * Pattern:
-   * ```
-   * *"----------------------------------------------------------------------
-   * *"*"Local Interface:
-   * *"  IMPORTING ...
-   * *"----------------------------------------------------------------------
-   * ```
-   */
-  private stripParameterCommentBlock;
-  /**
-   * Save pending source for function module.
-   *
-   * Overrides base to:
-   * 1. PUT metadata first (SAP ignores processingType and other attributes during POST)
-   * 2. Refresh source ETag (metadata PUT changes the object version)
-   * 3. Strip the parameter comment block that abapGit includes
-   * 4. Use the FM-specific source endpoint via groupName
-   */
-  protected savePendingSources(options?: {
-    lockHandle?: string;
-    transport?: string;
-  }): Promise<void>;
-  /**
-   * Extract the body of a FUNCTION...ENDFUNCTION block.
-   *
-   * SAP reconstructs the FUNCTION header when returning source code:
-   *   Local:  `FUNCTION zage_fm.`                         (lowercase, period inline)
-   *   SAP:    `FUNCTION ZAGE_FM\n " template comment"\n.` (uppercase, period on own line)
-   *
-   * The body between the header and ENDFUNCTION is identical, so we compare
-   * only that part. The header ends at the first period that terminates the
-   * FUNCTION statement (either inline `FUNCTION name.` or on a separate line `.`).
-   */
-  private extractFunctionBody;
-  /**
-   * Pre-lock comparison for FM source.
-   *
-   * Overrides base to:
-   * 1. Strip parameter comment block from local source
-   * 2. Extract only the function body (between FUNCTION header and ENDFUNCTION)
-   *    from both local and SAP source, because SAP reconstructs the FUNCTION
-   *    header with uppercase name and template comments.
-   */
-  protected checkPendingSourcesUnchanged(): Promise<void>;
-  getSource(): Promise<string>;
-  /**
-   * Get a function module by name
-   *
-   * @param groupName - Parent function group name
-   * @param name - Function module name
-   * @param ctx - Optional ADK context (uses global if not provided)
-   */
-  static get(groupName: string, name: string, ctx?: AdkContext): Promise<AdkFunctionModule>;
-  /**
-   * Check if a function module exists on SAP
-   */
-  static exists(groupName: string, name: string, ctx?: AdkContext): Promise<boolean>;
-  /**
-   * Create a new ABAP function module on SAP
-   */
-  static create(groupName: string, name: string, description: string, options?: {
-    transport?: string;
-    processingType?: string;
-  }, ctx?: AdkContext): Promise<AdkFunctionModule>;
-  /**
-   * Delete a function module from SAP
-   */
-  static delete(groupName: string, name: string, options?: {
-    transport?: string;
-    lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-}
-/**
- * Full response type from TransportService.get()
- *
- * The schema wraps everything in a 'root' element, so we unwrap it here
- * to provide a flat structure for ADK consumers.
+ * The schema wraps everything in a 'root' element, so we unwrap it here
+ * to provide a flat structure for ADK consumers.
  */
 type TransportData = TransportGetResponse['root'];
 /** Request data from schema */
@@ -1322,8 +841,6 @@ type TransportObjectData = NonNullable<TransportTaskData['abap_object']> extends
 type TransportStatus = 'D' | 'R' | 'N';
 /** Transport type */
 type TransportType = 'K' | 'W' | 'T' | 'C';
-type TransportTask = TransportTaskData;
-type TransportObject = TransportObjectData;
 /**
  * Options for creating a transport
  */
@@ -1933,181 +1450,643 @@ declare class AdkBehaviorDefinition extends AdkCrudSourceObject<BdefMetadata> {
   static get(name: string, ctx?: AdkContext): Promise<AdkBehaviorDefinition>;
   static exists(name: string, ctx?: AdkContext): Promise<boolean>;
   /**
-   * Create a new BDEF on SAP.
-   *
-   * POST /sap/bc/adt/bo/behaviordefinitions?corrNr=...
-   * Body matches the `blue:blueSource` envelope (extends
-   * abapsource:AbapSourceMainObject).
+   * Create a new BDEF on SAP.
+   *
+   * POST /sap/bc/adt/bo/behaviordefinitions?corrNr=...
+   * Body matches the `blue:blueSource` envelope (extends
+   * abapsource:AbapSourceMainObject).
+   */
+  static create(name: string, description: string, packageName: string, options?: {
+    transport?: string;
+  }, ctx?: AdkContext): Promise<AdkBehaviorDefinition>;
+  static delete(name: string, options?: {
+    transport?: string;
+    lockHandle?: string;
+  }, ctx?: AdkContext): Promise<void>;
+}
+interface SrvdMetadata {
+  srvdSource?: {
+    description?: string;
+    masterLanguage?: string;
+    abapLanguageVersion?: string;
+    packageRef?: {
+      name?: string;
+    };
+    sourceOrigin?: string;
+    srvdSourceType?: string;
+  };
+}
+declare class AdkServiceDefinition extends AdkCrudSourceObject<SrvdMetadata> {
+  /** Static ADK kind marker — used by abapGit handler registry if needed. */
+  static readonly kind: "ServiceDefinition";
+  readonly kind: "ServiceDefinition";
+  protected readonly objectType = "SRVD";
+  protected readonly endpoint = "ddic/srvd/sources";
+  protected get contract(): AdkCrudSourceContract;
+  protected getMetadataKey(): 'srvdSource';
+  get sourceOrigin(): string | undefined;
+  get sourceType(): string | undefined;
+  /**
+   * Get a SRVD (validates it exists by fetching source).
+   */
+  static get(name: string, ctx?: AdkContext): Promise<AdkServiceDefinition>;
+  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
+  /**
+   * Create a new SRVD on SAP.
+   *
+   * POST /sap/bc/adt/ddic/srvd/sources?corrNr=...
+   * Body matches the `srvd:source` envelope (extends
+   * abapsource:AbapSourceMainObject).
+   */
+  static create(name: string, description: string, packageName: string, options?: {
+    transport?: string;
+  }, ctx?: AdkContext): Promise<AdkServiceDefinition>;
+  static delete(name: string, options?: {
+    transport?: string;
+    lockHandle?: string;
+  }, ctx?: AdkContext): Promise<void>;
+}
+declare class AdkServiceBinding {
+  /** Static ADK kind marker — used by abapGit handler registry if needed. */
+  static readonly kind: "ServiceBinding";
+  readonly kind: "ServiceBinding";
+  readonly name: string;
+  protected readonly ctx: AdkContext;
+  constructor(ctx: AdkContext, nameOrData: string | Record<string, unknown>);
+  get objectUri(): string;
+  /** Placeholder description — full metadata requires additional SAP fetch */
+  get description(): string;
+  private get contract();
+  /**
+   * Fetch the binding metadata document. SRVB has no source text;
+   * `getSource()` returns an empty string for uniform CLI parity.
+   */
+  getMetadata(): Promise<unknown>;
+  getSource(): Promise<string>;
+  load(): Promise<this>;
+  lock(transport?: string): Promise<{
+    handle: string;
+  }>;
+  unlock(lockHandle: string): Promise<void>;
+  activate(): Promise<this>;
+  /**
+   * Publish (activate) the binding in the SAP Gateway.
+   * POST {basePath}/{name}/publishedstates
+   */
+  publish(): Promise<void>;
+  /**
+   * Unpublish (deactivate) the binding.
+   * DELETE {basePath}/{name}/publishedstates
+   */
+  unpublish(): Promise<void>;
+  /**
+   * Get a SRVB (validates it exists by fetching metadata).
+   */
+  static get(name: string, ctx?: AdkContext): Promise<AdkServiceBinding>;
+  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
+  /**
+   * Create a new SRVB on SAP.
+   *
+   * POST /sap/bc/adt/businessservices/bindings?corrNr=...
+   * Body matches the `srvb:serviceBinding` envelope.
+   */
+  static create(name: string, description: string, packageName: string, options?: {
+    transport?: string;
+  }, ctx?: AdkContext): Promise<AdkServiceBinding>;
+  static delete(name: string, options?: {
+    transport?: string;
+    lockHandle?: string;
+  }, ctx?: AdkContext): Promise<void>;
+  static publish(name: string, ctx?: AdkContext): Promise<void>;
+  static unpublish(name: string, ctx?: AdkContext): Promise<void>;
+}
+/**
+ * ADK Object Kinds
+ *
+ * Central registry of all ADK object types.
+ * Import specific kinds for type-safe usage:
+ *
+ * @example
+ * import { TransportRequest } from '../base/kinds';
+ * class AdkTransportRequest extends AdkObject<typeof TransportRequest> { ... }
+ */
+declare const TransportRequest: "TransportRequest";
+declare const TransportTask: "TransportTask";
+declare const Package: "Package";
+declare const Class: "Class";
+declare const Interface: "Interface";
+declare const FunctionGroup: "FunctionGroup";
+declare const FunctionModule: "FunctionModule";
+declare const Program: "Program";
+declare const Include: "Include";
+declare const Table: "Table";
+declare const Structure: "Structure";
+declare const DataElement: "DataElement";
+declare const Domain: "Domain";
+declare const TableType: "TableType";
+declare const DdlSource: "DdlSource";
+declare const DclSource: "DclSource";
+declare const DdlExtension: "DdlExtension";
+declare const CdsAspect: "CdsAspect";
+declare const CdsType: "CdsType";
+declare const ScalarFunctionDefinition: "ScalarFunctionDefinition";
+declare const ScalarFunctionImplementation: "ScalarFunctionImplementation";
+declare const EntityBuffer: "EntityBuffer";
+declare const DynamicCache: "DynamicCache";
+declare const TuningIndex: "TuningIndex";
+declare const StaticCache: "StaticCache";
+declare const ExternalSchema: "ExternalSchema";
+declare const BehaviorDefinition: "BehaviorDefinition";
+declare const ServiceDefinition: "ServiceDefinition";
+declare const ServiceBinding: "ServiceBinding";
+declare const MessageClass: "MessageClass";
+declare const EnhancementSpot: "EnhancementSpot";
+/** Union type of all ADK kinds */
+type AdkKind = typeof TransportRequest | typeof TransportTask | typeof Package | typeof Class | typeof Interface | typeof FunctionGroup | typeof FunctionModule | typeof Program | typeof Include | typeof Table | typeof Structure | typeof DataElement | typeof Domain | typeof TableType | typeof DdlSource | typeof DclSource | typeof DdlExtension | typeof CdsAspect | typeof CdsType | typeof ScalarFunctionDefinition | typeof ScalarFunctionImplementation | typeof EntityBuffer | typeof DynamicCache | typeof TuningIndex | typeof StaticCache | typeof ExternalSchema | typeof BehaviorDefinition | typeof ServiceDefinition | typeof ServiceBinding | typeof MessageClass | typeof EnhancementSpot;
+/**
+ * Maps ADK kind to concrete object type
+ *
+ * Enables type-safe factory methods:
+ * ```ts
+ * const cls = factory.byKind(Class, 'ZCL_TEST');  // → AdkClass
+ * const intf = factory.byKind(Interface, 'ZIF'); // → AdkInterface
+ * ```
+ */
+type AdkObjectForKind<K extends AdkKind> = K extends typeof Class ? AdkClass : K extends typeof Interface ? AdkInterface : K extends typeof Package ? AdkPackage : K extends typeof Program ? AdkProgram : K extends typeof Include ? AdkInclude : K extends typeof FunctionGroup ? AdkFunctionGroup : K extends typeof FunctionModule ? AdkFunctionModule : K extends typeof TransportRequest ? AdkTransportRequest : K extends typeof TransportTask ? AdkTransportTask : K extends typeof Domain ? AdkDomain : K extends typeof DataElement ? AdkDataElement : K extends typeof Table ? AdkTable : K extends typeof Structure ? AdkStructure : K extends typeof TableType ? AdkTableType : K extends typeof DdlSource ? AdkDdlSource : K extends typeof DclSource ? AdkDclSource : K extends typeof DdlExtension ? AdkDdlExtension : K extends typeof CdsAspect ? AdkCdsAspect : K extends typeof CdsType ? AdkCdsType : K extends typeof ScalarFunctionDefinition ? AdkScalarFunctionDefinition : K extends typeof ScalarFunctionImplementation ? AdkScalarFunctionImplementation : K extends typeof EntityBuffer ? AdkEntityBuffer : K extends typeof DynamicCache ? AdkDynamicCache : K extends typeof TuningIndex ? AdkTuningIndex : K extends typeof StaticCache ? AdkStaticCache : K extends typeof ExternalSchema ? AdkExternalSchema : K extends typeof BehaviorDefinition ? AdkBehaviorDefinition : K extends typeof ServiceDefinition ? AdkServiceDefinition : K extends typeof ServiceBinding ? AdkServiceBinding : AdkObject;
+/**
+ * Save mode for create/update operations
+ * - 'update': PUT to existing object (default, fails if doesn't exist)
+ * - 'create': POST to create new object (skips POST if already exists, then updates)
+ * - 'upsert': Try PUT first, fall back to POST if 404
+ */
+type SaveMode = 'update' | 'create' | 'upsert';
+/**
+ * Options for save operations
+ */
+interface SaveOptions {
+  /** Transport request for the change */
+  transport?: string;
+  /** Save as inactive (default: false) */
+  inactive?: boolean;
+  /** Save mode: 'update' (default), 'create', or 'upsert' */
+  mode?: SaveMode;
+  /**
+   * Retry only the immediate post-create LOCK when a backend keeps its
+   * generated CTS/editor lock briefly after accepting the skeleton POST.
+   */
+  postCreateLockRetry?: {
+    /** Total LOCK attempts, including the first one. */
+    attempts: number;
+    /** Delay between conflicting LOCK attempts in milliseconds. */
+    delayMs: number;
+  };
+}
+type InternalSaveOptions = SaveOptions & {
+  postCreate?: boolean;
+};
+/**
+ * SAP accepted the skeleton POST, but rejected the immediate follow-up lock.
+ *
+ * The object therefore exists in SAP, while the source or metadata supplied
+ * to the original save call has not yet been persisted. Callers must retry
+ * the same object with `mode: 'update'` after the CTS/editor lock is cleared;
+ * repeating `mode: 'create'` risks an "already exists" response.
+ */
+declare class AdkPostCreateLockError extends Error {
+  readonly objectUri: string;
+  readonly transport: string | undefined;
+  readonly code: "ADT_POST_CREATE_LOCKED";
+  readonly name = "AdkPostCreateLockError";
+  constructor(objectUri: string, transport: string | undefined, cause: unknown);
+}
+/**
+ * Result of bulk activation
+ */
+interface ActivationResult {
+  /** Number of successfully activated objects */
+  success: number;
+  /** Number of objects that failed activation */
+  failed: number;
+  /** Activation messages (errors, warnings) */
+  messages: string[];
+  /** Raw response from SAP (for debugging) */
+  response?: string;
+}
+/**
+ * Atom link (from atom:link element)
+ * Used for HATEOAS-style navigation in ADT responses
+ */
+interface AtomLink {
+  href: string;
+  rel?: string;
+  type?: string;
+  title?: string;
+  etag?: string;
+}
+/**
+ * ADT object reference (adtcore:objectReference)
+ */
+interface AdtObjectReference {
+  uri?: string;
+  name?: string;
+  type?: string;
+  description?: string;
+  packageName?: string;
+}
+/**
+ * Base data contract for all ADK objects
+ * Matches XSD AdtObject type attributes and elements
+ */
+interface AdkObjectData {
+  name: string;
+  type: string;
+  description?: string;
+  changedBy?: string;
+  changedAt?: string | Date;
+  createdBy?: string;
+  createdAt?: string | Date;
+  version?: string;
+  language?: string;
+  descriptionTextLimit?: number;
+  links?: AtomLink[];
+  containerRef?: AdtObjectReference;
+}
+/**
+ * Main object data contract (extends AdtObject)
+ * Matches XSD AdtMainObject type
+ */
+interface AdkMainObjectData extends AdkObjectData {
+  packageRef?: AdtObjectReference;
+  masterSystem?: string;
+  masterLanguage?: string;
+  responsible?: string;
+  abapLanguageVersion?: string;
+}
+/**
+ * Base class for all ADK objects
+ *
+ * All ADK objects (AdkPackage, AdkTransportRequest, etc.) extend this.
+ * Supports deferred loading - create with just a name, then call load().
+ *
+ * Note: Uses loose type constraint for D to allow schema-inferred types
+ * from contracts which may have different shapes. The getters safely
+ * handle missing properties with defaults.
+ *
+ * @typeParam K - The object kind (from AdkKind)
+ * @typeParam D - The internal data type (typically schema-inferred from contract)
+ */
+declare abstract class AdkObject<K extends AdkKind = AdkKind, D = any> {
+  /** Object kind identifier */
+  abstract readonly kind: K;
+  /**
+   * ADT object URI - base path for all operations.
+   * Example: `/sap/bc/adt/oo/classes/zcl_my_class`
+   */
+  abstract get objectUri(): string;
+  /**
+   * ADT collection URI - base path for creating new objects.
+   * Example: `/sap/bc/adt/oo/classes`
+   * Default: derived from objectUri by removing the object name
+   */
+  get collectionUri(): string;
+  protected ctx: AdkContext;
+  /** Public access to the ADT client for plugins and external code */
+  get client(): AdtClient;
+  protected _data?: D;
+  protected _name: string;
+  protected cache: Map<string, unknown>;
+  protected dirty: Set<string>;
+  protected _lockHandle?: LockHandle$1;
+  /** Set by save() when all pending changes are identical to SAP state */
+  _unchanged: boolean;
+  /**
+   * Create ADK object
+   * @param ctx - ADK context
+   * @param dataOrName - Full data object OR just the object name for deferred loading
+   */
+  constructor(ctx: AdkContext, dataOrName: D | string | Record<string, unknown>);
+  /**
+   * Adopt a richer context (merge services into existing context).
+   *
+   * Used by AdkObjectSet to propagate lockService / lockStore
+   * to objects created by plugins that only have { client }.
+   * Keeps the original client reference intact.
+   */
+  adoptContext(ctx: AdkContext): void;
+  /**
+   * Load object data from SAP
+   *
+   * Default implementation uses crudContract.get() and unwraps with wrapperKey.
+   * Objects without crudContract must override this.
+   *
+   * @returns this (for chaining)
+   */
+  load(): Promise<this>;
+  /** Whether data has been loaded */
+  get isLoaded(): boolean;
+  /**
+   * Get data - auto-loads if not already loaded
+   * @returns Promise that resolves to the data
+   */
+  data(): Promise<D>;
+  /**
+   * Get data synchronously - throws if not loaded
+   * Use when you know data is already loaded
+   */
+  get dataSync(): D;
+  /** Set data (for subclasses to use after loading) */
+  protected setData(data: D): void;
+  /** Helper to access data with AdkObjectData properties */
+  private get coreData();
+  /** ADT object name (adtcore:name) - available even before load() */
+  get name(): string;
+  /** ADT object type (adtcore:type, e.g. 'RQRQ', 'DEVC/K') - requires load() */
+  get type(): string;
+  /** Description text (adtcore:description) */
+  get description(): string;
+  /** Version state (adtcore:version) - active, inactive, etc. */
+  get version(): string;
+  /** Current language (adtcore:language) */
+  get language(): string;
+  /** User who last modified (adtcore:changedBy) */
+  get changedBy(): string;
+  /** Last modification timestamp (adtcore:changedAt) */
+  get changedAt(): Date;
+  /** User who created (adtcore:createdBy) */
+  get createdBy(): string;
+  /** Creation timestamp (adtcore:createdAt) */
+  get createdAt(): Date;
+  /** All atom:link elements */
+  get links(): AtomLink[];
+  /** Find link by rel attribute */
+  getLink(rel: string): AtomLink | undefined;
+  /** Get link href by rel, or undefined */
+  getLinkHref(rel: string): string | undefined;
+  /** Container reference (adtcore:containerRef) */
+  get containerRef(): AdtObjectReference | undefined;
+  /** Check if object is currently locked */
+  get isLocked(): boolean;
+  /** Get current lock handle */
+  get lockHandle(): LockHandle$1 | undefined;
+  /**
+   * Lock the object for modification
+   *
+   * Delegates to the lock service (single lock mechanism).
+   *
+   * The lock response contains:
+   * - LOCK_HANDLE: Required for subsequent PUT/unlock operations
+   * - CORRNR: Transport request assigned to this object (use for PUT if no explicit transport)
+   * - CORRUSER: User who owns the transport
+   *
+   * @param transport - Optional transport request to use for locking.
+   *                    Required when object is already in a transport.
+   */
+  lock(transport?: string): Promise<LockHandle$1>;
+  /**
+   * Unlock the object
+   *
+   * Delegates to the lock service (single lock mechanism).
+   */
+  unlock(): Promise<void>;
+  /**
+   * Set lock handle (for subclasses that need custom lock logic)
+   */
+  protected setLockHandle(handle: LockHandle$1 | undefined): void;
+  /**
+   * Save the object to SAP
+   *
+   * Generic implementation that handles:
+   * - Lock/unlock lifecycle
+   * - Mode switching (create/update/upsert)
+   * - Error handling
+   *
+   * Subclasses implement `saveViaContract()` to provide the typed contract call.
+   *
+   * Modes:
+   * - 'update' (default): PUT to existing object
+   * - 'create': POST skeleton, then lock → PUT/source → unlock (Eclipse ADT pattern)
+   * - 'upsert': Check existence, create if needed, then update
+   *
+   * @param options - Save options
+   * @returns this (for chaining)
+   */
+  save(options?: InternalSaveOptions): Promise<this>;
+  /**
+   * Wrapper key for the data in contract requests/responses
+   *
+   * Contracts wrap data like { abapClass: ... } or { abapInterface: ... }.
+   * Subclasses that support save override this.
+   */
+  protected get wrapperKey(): string | undefined;
+  /**
+   * CRUD contract for this object type
+   *
+   * Subclasses that support save override this to return their contract.
+   */
+  protected get crudContract(): any;
+  /**
+   * Execute the typed contract call for save
+   *
+   * Generic implementation using wrapperKey and crudContract.
+   * Objects that don't support save leave wrapperKey/crudContract undefined.
+   *
+   * For 'create' mode: POSTs skeleton data (minimal fields).
+   * For 'update' mode: PUTs full data (all fields except abapLanguageVersion).
+   *
+   * @param mode - 'create' (POST skeleton) or 'update' (PUT full)
+   * @param options - Contract options (transport, lockHandle)
+   */
+  protected saveViaContract(mode: 'create' | 'update', options: {
+    transport?: string;
+    lockHandle?: string;
+  }): Promise<void>;
+  /**
+   * Get skeleton data for object creation (POST).
+   *
+   * Returns only the minimal fields needed to create the object on SAP.
+   * SAP creates the object structure (includes, etc.) from these fields.
+   * Full metadata and source code are sent via PUT in the update step.
+   *
+   * Override in subclasses that need different skeleton fields.
+   */
+  protected getSkeletonData(): Promise<Record<string, unknown>>;
+  /**
+   * Check if the object exists on the SAP system.
+   *
+   * Used by upsert mode to decide between update and create paths upfront.
+   * On BTP, locking a non-existent DDIC object creates a draft that persists
+   * even after unlock, blocking subsequent POST (create) attempts. Checking
+   * existence first with GET avoids this problem entirely.
+   */
+  protected checkObjectExists(): Promise<boolean>;
+  /**
+   * Check if error is a 404 Not Found
+   */
+  protected isNotFoundError(e: unknown): boolean;
+  /**
+   * Some CTS backends can retain the lock created by a successful object POST
+   * long enough for the immediate follow-up LOCK to fail. This is distinct
+   * from an arbitrary edit conflict because this save invocation already
+   * created the skeleton successfully.
+   */
+  private isPostCreateLockConflict;
+  /**
+   * Some backends retain the lock implicitly created by a successful POST for
+   * a short time. Retry only this known follow-up LOCK; no arbitrary update or
+   * source write is repeated, and each successful lock still uses the normal
+   * handle-backed save/unlock lifecycle.
+   */
+  private lockAfterCreate;
+  /**
+   * Upsert fallback: try POST (create), treat 422 "already exists" as unchanged.
+   * Extracted to avoid duplication in lock-catch and saveViaContract-catch paths.
+   */
+  private fallbackToCreate;
+  /**
+   * Check if error suggests the object doesn't exist or the operation
+   * is not supported for the current state.
+   *
+   * Some SAP DDIC endpoints (TABL, TTYP) return 405 Method Not Allowed
+   * instead of 404 when attempting to lock or PUT a non-existent object.
+   * In upsert mode, both should trigger a fallback to POST (create).
+   */
+  protected shouldFallbackToCreate(e: unknown): boolean;
+  /**
+   * Check if error is a 422 "already exists" from a POST create attempt
+   */
+  protected isAlreadyExistsError(e: unknown): boolean;
+  /**
+   * Check if object has pending sources to save
+   * Subclasses with source code (classes, interfaces) override this
+   */
+  protected hasPendingSources(): boolean;
+  /**
+   * Normalize source code for comparison.
+   * Trims trailing whitespace/newlines so minor formatting differences
+   * don't trigger unnecessary saves.
    */
-  static create(name: string, description: string, packageName: string, options?: {
-    transport?: string;
-  }, ctx?: AdkContext): Promise<AdkBehaviorDefinition>;
-  static delete(name: string, options?: {
-    transport?: string;
-    lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-}
-interface SrvdMetadata {
-  srvdSource?: {
-    description?: string;
-    masterLanguage?: string;
-    abapLanguageVersion?: string;
-    packageRef?: {
-      name?: string;
-    };
-    sourceOrigin?: string;
-    srvdSourceType?: string;
-  };
-}
-declare class AdkServiceDefinition extends AdkCrudSourceObject<SrvdMetadata> {
-  /** Static ADK kind marker — used by abapGit handler registry if needed. */
-  static readonly kind: "ServiceDefinition";
-  readonly kind: "ServiceDefinition";
-  protected readonly objectType = "SRVD";
-  protected readonly endpoint = "ddic/srvd/sources";
-  protected get contract(): AdkCrudSourceContract;
-  protected getMetadataKey(): 'srvdSource';
-  get sourceOrigin(): string | undefined;
-  get sourceType(): string | undefined;
+  protected normalizeSource(source: string): string;
   /**
-   * Get a SRVD (validates it exists by fetching source).
+   * Check if pending sources are unchanged vs SAP (pre-lock comparison).
+   * Sets _unchanged = true if nothing needs saving.
+   *
+   * Default handles single-source objects (_pendingSource) by fetching
+   * GET {objectUri}/source/main and comparing.
+   * AdkClass overrides this for multi-include logic.
    */
-  static get(name: string, ctx?: AdkContext): Promise<AdkServiceDefinition>;
-  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
+  protected checkPendingSourcesUnchanged(): Promise<void>;
   /**
-   * Create a new SRVD on SAP.
+   * Check if metadata-only objects are unchanged on SAP.
    *
-   * POST /sap/bc/adt/ddic/srvd/sources?corrNr=...
-   * Body matches the `srvd:source` envelope (extends
-   * abapsource:AbapSourceMainObject).
+   * For objects without source code (DDIC types like DOMA, DTEL, TABL, TTYP),
+   * fetches the current SAP state and compares only the fields present in
+   * the local data. SAP returns extra volatile fields (timestamps, links,
+   * version, etc.) that are ignored — only semantic fields matter.
    */
-  static create(name: string, description: string, packageName: string, options?: {
-    transport?: string;
-  }, ctx?: AdkContext): Promise<AdkServiceDefinition>;
-  static delete(name: string, options?: {
-    transport?: string;
-    lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-}
-declare class AdkServiceBinding {
-  /** Static ADK kind marker — used by abapGit handler registry if needed. */
-  static readonly kind: "ServiceBinding";
-  readonly kind: "ServiceBinding";
-  readonly name: string;
-  protected readonly ctx: AdkContext;
-  constructor(ctx: AdkContext, nameOrData: string | Record<string, unknown>);
-  get objectUri(): string;
-  /** Placeholder description — full metadata requires additional SAP fetch */
-  get description(): string;
-  private get contract();
+  protected checkMetadataUnchanged(): Promise<void>;
   /**
-   * Fetch the binding metadata document. SRVB has no source text;
-   * `getSource()` returns an empty string for uniform CLI parity.
+   * Refresh cached ETags after acquiring a lock.
+   *
+   * SAP changes the object's internal version when a lock is acquired,
+   * which invalidates any cached ETags. Without refreshing, the next
+   * PUT sends a stale If-Match header and SAP returns HTTP 412.
+   *
+   * For objects with pending sources: re-GET {objectUri}/source/main
+   * For metadata-only objects: re-GET via crudContract.get()
+   *
+   * Subclasses with multiple source endpoints (e.g., AdkClass with includes)
+   * should override this to refresh all relevant endpoints.
    */
-  getMetadata(): Promise<unknown>;
-  getSource(): Promise<string>;
-  load(): Promise<this>;
-  lock(transport?: string): Promise<{
-    handle: string;
-  }>;
-  unlock(lockHandle: string): Promise<void>;
-  activate(): Promise<this>;
+  protected refreshETagsAfterLock(): Promise<void>;
   /**
-   * Publish (activate) the binding in the SAP Gateway.
-   * POST {basePath}/{name}/publishedstates
+   * Save pending sources to SAP.
+   *
+   * Default handles single-source objects (_pendingSource) by PUTting
+   * to {objectUri}/source/main.
+   * AdkClass overrides this for multi-include logic.
    */
-  publish(): Promise<void>;
+  protected savePendingSources(options?: {
+    lockHandle?: string;
+    transport?: string;
+  }): Promise<void>;
   /**
-   * Unpublish (deactivate) the binding.
-   * DELETE {basePath}/{name}/publishedstates
+   * Set source content for a source-based object
+   *
+   * Generic implementation for objects with source code (classes, includes, etc.)
+   * Subclasses should override if they need custom source handling.
+   *
+   * @param sourcePath - Relative path to source (e.g., '/source/main')
+   * @param content - Source code content
+   * @param options - Save options
    */
-  unpublish(): Promise<void>;
+  setSource(sourcePath: string, content: string, options?: SaveOptions): Promise<void>;
   /**
-   * Get a SRVB (validates it exists by fetching metadata).
+   * Activate this object
+   *
+   * Activates a single object. For bulk activation of multiple objects,
+   * use `AdkObjectSet.activateAll()`.
+   *
+   * @returns this (for chaining)
    */
-  static get(name: string, ctx?: AdkContext): Promise<AdkServiceBinding>;
-  static exists(name: string, ctx?: AdkContext): Promise<boolean>;
+  activate(): Promise<this>;
+  /** Lazy load a segment (async) - fetches only once, then cached */
+  protected lazy<T>(key: string, loader: () => Promise<T>): Promise<T>;
+  /** Lazy compute a segment (sync) - computes only once, then cached */
+  protected cached<T>(key: string, compute: () => T): T;
+  /** Set a cached value directly (for local/generated data) */
+  protected set<T>(key: string, value: T): void;
+  /** Mark a segment as dirty (modified locally) */
+  protected markDirty(key: string): void;
+  /** Check if any segment (or specific segment) is dirty */
+  isDirty(segment?: string): boolean;
+  /** Clear cache for a segment (force reload on next access) */
+  protected invalidate(key: string): void;
   /**
-   * Create a new SRVB on SAP.
+   * Fetch a text resource from an ADT endpoint.
+   * Delegates to the underlying ADT client's fetch.
    *
-   * POST /sap/bc/adt/businessservices/bindings?corrNr=...
-   * Body matches the `srvb:serviceBinding` envelope.
+   * @param url - ADT endpoint path (e.g., '/sap/bc/adt/ddic/dataelements/spras')
+   * @param headers - Optional HTTP headers (defaults to no Accept header, letting server choose)
+   * @returns Response content as text, or undefined if 404
    */
-  static create(name: string, description: string, packageName: string, options?: {
-    transport?: string;
-  }, ctx?: AdkContext): Promise<AdkServiceBinding>;
-  static delete(name: string, options?: {
-    transport?: string;
-    lockHandle?: string;
-  }, ctx?: AdkContext): Promise<void>;
-  static publish(name: string, ctx?: AdkContext): Promise<void>;
-  static unpublish(name: string, ctx?: AdkContext): Promise<void>;
+  fetchText(url: string, headers?: Record<string, string>): Promise<string | undefined>;
 }
 /**
- * ADK Object Kinds
+ * Base class for main development objects (AdtMainObject)
  *
- * Central registry of all ADK object types.
- * Import specific kinds for type-safe usage:
+ * Extends AdkObject with package reference, responsible user, and master language.
+ * Used for repository objects like classes, interfaces, packages, etc.
  *
- * @example
- * import { TransportRequest } from '../base/kinds';
- * class AdkTransportRequest extends AdkObject<typeof TransportRequest> { ... }
- */
-declare const TransportRequest: "TransportRequest";
-declare const TransportTask$1: "TransportTask";
-declare const Package: "Package";
-declare const Class: "Class";
-declare const Interface: "Interface";
-declare const FunctionGroup: "FunctionGroup";
-declare const FunctionModule: "FunctionModule";
-declare const Program: "Program";
-declare const Include: "Include";
-declare const Table: "Table";
-declare const Structure: "Structure";
-declare const DataElement: "DataElement";
-declare const Domain: "Domain";
-declare const TableType: "TableType";
-declare const DdlSource: "DdlSource";
-declare const DclSource: "DclSource";
-declare const DdlExtension: "DdlExtension";
-declare const CdsAspect: "CdsAspect";
-declare const CdsType: "CdsType";
-declare const ScalarFunctionDefinition: "ScalarFunctionDefinition";
-declare const ScalarFunctionImplementation: "ScalarFunctionImplementation";
-declare const EntityBuffer: "EntityBuffer";
-declare const DynamicCache: "DynamicCache";
-declare const TuningIndex: "TuningIndex";
-declare const StaticCache: "StaticCache";
-declare const ExternalSchema: "ExternalSchema";
-declare const BehaviorDefinition: "BehaviorDefinition";
-declare const ServiceDefinition: "ServiceDefinition";
-declare const ServiceBinding: "ServiceBinding";
-declare const MessageClass: "MessageClass";
-declare const EnhancementSpot: "EnhancementSpot";
-/** Union type of all ADK kinds */
-type AdkKind = typeof TransportRequest | typeof TransportTask$1 | typeof Package | typeof Class | typeof Interface | typeof FunctionGroup | typeof FunctionModule | typeof Program | typeof Include | typeof Table | typeof Structure | typeof DataElement | typeof Domain | typeof TableType | typeof DdlSource | typeof DclSource | typeof DdlExtension | typeof CdsAspect | typeof CdsType | typeof ScalarFunctionDefinition | typeof ScalarFunctionImplementation | typeof EntityBuffer | typeof DynamicCache | typeof TuningIndex | typeof StaticCache | typeof ExternalSchema | typeof BehaviorDefinition | typeof ServiceDefinition | typeof ServiceBinding | typeof MessageClass | typeof EnhancementSpot;
-/**
- * Maps ADK kind to concrete object type
+ * Note: Uses type assertions internally because schema-inferred types from
+ * contracts may have different shapes than AdkMainObjectData. The getters
+ * safely handle missing properties with defaults.
  *
- * Enables type-safe factory methods:
- * ```ts
- * const cls = factory.byKind(Class, 'ZCL_TEST');  // → AdkClass
- * const intf = factory.byKind(Interface, 'ZIF'); // → AdkInterface
- * ```
- */
-type AdkObjectForKind<K extends AdkKind> = K extends typeof Class ? AdkClass : K extends typeof Interface ? AdkInterface : K extends typeof Package ? AdkPackage : K extends typeof Program ? AdkProgram : K extends typeof Include ? AdkInclude : K extends typeof FunctionGroup ? AdkFunctionGroup : K extends typeof FunctionModule ? AdkFunctionModule : K extends typeof TransportRequest ? AdkTransportRequest : K extends typeof TransportTask$1 ? AdkTransportTask : K extends typeof Domain ? AdkDomain : K extends typeof DataElement ? AdkDataElement : K extends typeof Table ? AdkTable : K extends typeof Structure ? AdkStructure : K extends typeof TableType ? AdkTableType : K extends typeof DdlSource ? AdkDdlSource : K extends typeof DclSource ? AdkDclSource : K extends typeof DdlExtension ? AdkDdlExtension : K extends typeof CdsAspect ? AdkCdsAspect : K extends typeof CdsType ? AdkCdsType : K extends typeof ScalarFunctionDefinition ? AdkScalarFunctionDefinition : K extends typeof ScalarFunctionImplementation ? AdkScalarFunctionImplementation : K extends typeof EntityBuffer ? AdkEntityBuffer : K extends typeof DynamicCache ? AdkDynamicCache : K extends typeof TuningIndex ? AdkTuningIndex : K extends typeof StaticCache ? AdkStaticCache : K extends typeof ExternalSchema ? AdkExternalSchema : K extends typeof BehaviorDefinition ? AdkBehaviorDefinition : K extends typeof ServiceDefinition ? AdkServiceDefinition : K extends typeof ServiceBinding ? AdkServiceBinding : AdkObject;
-/**
- * Base interface for all ABAP objects
+ * @typeParam K - The object kind (from AdkKind)
+ * @typeParam D - The internal data type (typically schema-inferred from contract)
  */
-interface AbapObject {
-  readonly kind: AdkKind | string;
-  readonly name: string;
-  readonly package: string;
-  readonly description: string;
+declare abstract class AdkMainObject<K extends AdkKind = AdkKind, D = any> extends AdkObject<K, D> {
+  private get mainData();
+  /** Package reference (adtcore:packageRef) */
+  get packageRef(): AdtObjectReference | undefined;
+  /** Package name (convenience getter) */
+  get package(): string;
+  /** Master system (adtcore:masterSystem) */
+  get masterSystem(): string;
+  /** Master language (adtcore:masterLanguage) */
+  get masterLanguage(): string;
+  /** Responsible user (adtcore:responsible) */
+  get responsible(): string;
+  /** ABAP language version (adtcore:abapLanguageVersion) */
+  get abapLanguageVersion(): string;
   /**
-   * ADT object type (e.g., 'DEVC/K', 'CLAS/OC')
+   * Save main source code to SAP.
+   * Requires the object to be locked before calling.
+   * Subclasses may override to add additional behavior (e.g. cache invalidation).
    */
-  readonly type: string;
+  saveMainSource(source: string, options?: {
+    lockHandle?: string;
+    transport?: string;
+  }): Promise<void>;
 }
 /**
  * Result of bulk save operation
@@ -2218,6 +2197,13 @@ declare class AdkObjectSet {
    * @returns Activation result with success/failure counts
    */
   activateAll(options?: BulkActivateOptions): Promise<ActivationResult>;
+  /**
+   * Step 2b: Retry deferred sources after activation.
+   *
+   * Some includes (e.g., testclasses) may not exist until activation creates
+   * them. Failures are folded back into `saveResult` counts.
+   */
+  private retryDeferredSources;
   /**
    * Save all objects as inactive, then bulk activate, then unlock
    *
@@ -2535,18 +2521,14 @@ declare abstract class AdkClassicBadiBase {
   abstract get kind(): string;
   abstract get objectUri(): string;
   abstract getMetadata(): Promise<BasicObjectPropertiesResponse>;
-  static get<T extends AdkClassicBadiBase>(this: {
-    new (input: {
-      ctx: AdkContext;
-      name: string;
-    }): T;
-  }, input: ClassicBadiInput): Promise<T>;
-  static exists<T extends AdkClassicBadiBase>(this: {
-    new (input: {
-      ctx: AdkContext;
-      name: string;
-    }): T;
-  }, input: ClassicBadiInput): Promise<boolean>;
+  static get<T extends AdkClassicBadiBase>(this: new (input: {
+    ctx: AdkContext;
+    name: string;
+  }) => T, input: ClassicBadiInput): Promise<T>;
+  static exists<T extends AdkClassicBadiBase>(this: new (input: {
+    ctx: AdkContext;
+    name: string;
+  }) => T, input: ClassicBadiInput): Promise<boolean>;
 }
 declare class AdkClassicBadiDefinition extends AdkClassicBadiBase {
   readonly kind: "ClassicBadiDefinition";
@@ -3172,6 +3154,8 @@ declare class AdkGenericObject {
   /** Set data (for manual population) */
   setData(data: unknown): void;
 }
+/** Any object produced by the factory */
+type AnyAdkObject = AdkObject | AdkGenericObject | AdkRegistrable;
 /**
  * ADK Factory - Generic object creation
  */
@@ -3191,7 +3175,7 @@ interface AdkFactory {
    * const cls = factory.get('ZCL_TEST', 'CLAS');
    * await cls.load();
    */
-  get(name: string, adtType: string): AdkObject | AdkGenericObject | AdkRegistrable;
+  get(name: string, adtType: string): AnyAdkObject;
   /**
    * Get object with initial data (for deserialization)
    *
@@ -3202,7 +3186,7 @@ interface AdkFactory {
    * const cls = factory.getWithData({ name: 'ZCL_TEST', description: 'Test' }, 'CLAS');
    * // cls.isLoaded is true, no need to call load()
    */
-  getWithData(data: Record<string, unknown>, adtType: string): AdkObject | AdkGenericObject | AdkRegistrable;
+  getWithData(data: Record<string, unknown>, adtType: string): AnyAdkObject;
   /**
    * Get object by ADK kind (type-safe)
    *
@@ -3225,14 +3209,14 @@ interface AdkFactory {
    * const xml = await client.fetch('/sap/bc/adt/oo/classes/ZCL_TEST');
    * const cls = factory.fromXml(xml);
    */
-  fromXml(xml: string): AdkObject | AdkGenericObject | AdkRegistrable | undefined;
+  fromXml(xml: string): AnyAdkObject | undefined;
   /**
    * Create new object (for creation workflows)
    *
    * Returns deferred object without name - used when
    * creating new objects in SAP.
    */
-  create(adtType: string): AdkObject | AdkGenericObject | AdkRegistrable;
+  create(adtType: string): AnyAdkObject;
 }
 /**
  * Create ADK factory
@@ -3258,5 +3242,5 @@ declare function createAdkFactory(ctx: AdkContext): AdkFactory;
  * await cls.load();
  */
 declare function createAdk(client: AdtClient$1): AdkFactory;
-export { ADT_TYPE_MAPPINGS, type AbapClass, type AbapFunctionGroup, type AbapFunctionModule, type AbapInclude, type AbapInterface, type AbapObject, type AbapPackage, type AbapProgram, type ActivationResult, AdkBadi, AdkBehaviorDefinition, AdkCdsAspect, AdkCdsType, AdkClass, AdkClassicBadiDefinition, AdkClassicBadiImplementation, type AdkContext, type AdkContract, AdkDataElement, AdkDclSource, AdkDdlExtension, AdkDdlSource, AdkDomain, AdkDynamicCache, AdkEntityBuffer, AdkExternalSchema, type AdkFactory, AdkFunctionGroup, AdkFunctionModule, AdkGenericObject, AdkInclude, AdkInterface, AdkKind, AdkMainObject, type AdkMainObjectData, AdkObject, type AdkObjectData, AdkObjectForKind, AdkObjectSet, AdkPackage, AdkPostCreateLockError, AdkProgram, AdkScalarFunctionDefinition, AdkScalarFunctionImplementation, AdkServiceBinding, AdkServiceDefinition, AdkStaticCache, AdkStructure, AdkTable, AdkTableType, AdkTransport, AdkTransportRequest as AdkTransportItem, AdkTransportRequest, AdkTransportObject, AdkTransportObjectRef, AdkTransportTask, AdkTransportTaskRef, AdkTuningIndex, type AdtClient, type AdtContracts, type AdtObjectReference, type ApplicationComponent, type AtomLink, BehaviorDefinition, type BuildTransportSourceManifestOptions, type BulkActivateOptions, type BulkSaveOptions, type BulkSaveResult, CdsAspect, CdsType, Class, type ClassCategory, type ClassInclude, type ClassIncludeType, type ClassResponse, type ClassVisibility, type ClassXml, DataElement, type DataElementResponse, type DataElementXml, DclSource, DdlExtension, DdlSource, Domain, type DomainResponse, type DomainXml, DynamicCache, EnhancementSpot, EntityBuffer, ExternalSchema, FunctionGroup, type FunctionGroupResponse, type FunctionGroupXml, FunctionModule, type FunctionModuleResponse, type FunctionModuleXml, Include, type IncludeResponse, type IncludeXml, Interface, type InterfaceResponse, type InterfaceXml, type ListObjectSourceVersionsOptions, type LockEntry, type LockHandle, type LockRegistry, type LockService, type LockStore, MergedTransportView, MessageClass, type NameTransform, type ObjectReference, ObjectSourceHistoryError, type ObjectSourceHistoryErrorCode, type ObjectSourceHistoryIdentity, type ObjectSourceVersionsComponent, type ObjectSourceVersionsResult, Package, type PackageAttributes, type PackageResponse, type PackageType, type PackageXml, Program, type ProgramResponse, type ProgramXml, type RegisterObjectTypeOptions, type ReleaseResult, type ResolvedTransportObjects, type SaveOptions, ScalarFunctionDefinition, ScalarFunctionImplementation, ServiceBinding, ServiceDefinition, type SoftwareComponent, type SourceHistoryDiagnostic, type SourceHistoryDiagnosticCode, StaticCache, Structure, Table, TableType, type TableTypeResponse, type TableTypeXml, type TableXml, type TransportConfig, type TransportCreateOptions, type TransportData, type TransportGetResponse, type TransportGetResponse as TransportResponse, type TransportInventoryResolution, type TransportLayer, type TransportObject, type TransportObjectData, type TransportObjectOwnerReference, type TransportObjectSelector, TransportRequest, type TransportRequestData, type TransportSourceChangeKind, type TransportSourceDiagnostic, type TransportSourceManifest, type TransportSourceManifestComponent, type TransportSourceManifestEntry, type TransportSourceManifestObject, type TransportSourceVersionSelection, type TransportStatus, TransportTask, type TransportTaskData, type TransportType, type TransportUpdateOptions, TuningIndex, buildTransportSourceManifest, clearConfigCache, createAdk, createAdkContract, createAdkFactory, createLockService, getEndpointForType, getGlobalContext, getKindForType, getMainType, getObjectRootUri, getObjectUri, getRegisteredKinds, getRegisteredTypes, getTypeForKind, initializeAdk, isAdkInitialized, isTypeRegistered, listObjectSourceVersions, matchesSelector, normalizeObjectName, parseAdtType, parseXmlIdentity, registerObjectType, resetAdk, resolveClassComponentOwnerName, resolveKind, resolveTransportObjects, resolveType, selectTransportSourceVersions, tryGetGlobalContext };
+export { ADT_TYPE_MAPPINGS, type AbapClass, type AbapFunctionGroup, type AbapFunctionModule, type AbapInclude, type AbapInterface, type AbapObject, type AbapPackage, type AbapProgram, type ActivationResult, AdkBadi, AdkBehaviorDefinition, AdkCdsAspect, AdkCdsType, AdkClass, AdkClassicBadiDefinition, AdkClassicBadiImplementation, type AdkContext, type AdkContract, AdkDataElement, AdkDclSource, AdkDdlExtension, AdkDdlSource, AdkDomain, AdkDynamicCache, AdkEntityBuffer, AdkExternalSchema, type AdkFactory, AdkFunctionGroup, AdkFunctionModule, AdkGenericObject, AdkInclude, AdkInterface, AdkKind, AdkMainObject, type AdkMainObjectData, AdkObject, type AdkObjectData, AdkObjectForKind, AdkObjectSet, AdkPackage, AdkPostCreateLockError, AdkProgram, AdkScalarFunctionDefinition, AdkScalarFunctionImplementation, AdkServiceBinding, AdkServiceDefinition, AdkStaticCache, AdkStructure, AdkTable, AdkTableType, AdkTransport, AdkTransportRequest as AdkTransportItem, AdkTransportRequest, AdkTransportObject, AdkTransportObjectRef, AdkTransportTask, AdkTransportTaskRef, AdkTuningIndex, type AdtClient, type AdtContracts, type AdtObjectReference, type ApplicationComponent, type AtomLink, BehaviorDefinition, type BuildTransportSourceManifestOptions, type BulkActivateOptions, type BulkSaveOptions, type BulkSaveResult, CdsAspect, CdsType, Class, type ClassCategory, type ClassInclude, type ClassIncludeType, type ClassResponse, type ClassVisibility, type ClassXml, DataElement, type DataElementResponse, type DataElementXml, DclSource, DdlExtension, DdlSource, Domain, type DomainResponse, type DomainXml, DynamicCache, EnhancementSpot, EntityBuffer, ExternalSchema, FunctionGroup, type FunctionGroupResponse, type FunctionGroupXml, FunctionModule, type FunctionModuleResponse, type FunctionModuleXml, Include, type IncludeResponse, type IncludeXml, Interface, type InterfaceResponse, type InterfaceXml, type ListObjectSourceVersionsOptions, type LockEntry, type LockHandle, type LockRegistry, type LockService, type LockStore, MergedTransportView, MessageClass, type NameTransform, type ObjectReference, ObjectSourceHistoryError, type ObjectSourceHistoryErrorCode, type ObjectSourceHistoryIdentity, type ObjectSourceVersionsComponent, type ObjectSourceVersionsResult, Package, type PackageAttributes, type PackageResponse, type PackageType, type PackageXml, Program, type ProgramResponse, type ProgramXml, type RegisterObjectTypeOptions, type ReleaseResult, type ResolvedTransportObjects, type SaveOptions, ScalarFunctionDefinition, ScalarFunctionImplementation, ServiceBinding, ServiceDefinition, type SoftwareComponent, type SourceHistoryDiagnostic, type SourceHistoryDiagnosticCode, StaticCache, Structure, Table, TableType, type TableTypeResponse, type TableTypeXml, type TableXml, type TransportConfig, type TransportCreateOptions, type TransportData, type TransportGetResponse, type TransportGetResponse as TransportResponse, type TransportInventoryResolution, type TransportLayer, type TransportObjectData, type TransportObjectOwnerReference, type TransportObjectSelector, TransportRequest, type TransportRequestData, type TransportSourceChangeKind, type TransportSourceDiagnostic, type TransportSourceManifest, type TransportSourceManifestComponent, type TransportSourceManifestEntry, type TransportSourceManifestObject, type TransportSourceVersionSelection, type TransportStatus, TransportTask, type TransportTaskData, type TransportType, type TransportUpdateOptions, TuningIndex, buildTransportSourceManifest, clearConfigCache, createAdk, createAdkContract, createAdkFactory, createLockService, getEndpointForType, getGlobalContext, getKindForType, getMainType, getObjectRootUri, getObjectUri, getRegisteredKinds, getRegisteredTypes, getTypeForKind, initializeAdk, isAdkInitialized, isTypeRegistered, listObjectSourceVersions, matchesSelector, normalizeObjectName, parseAdtType, parseXmlIdentity, registerObjectType, resetAdk, resolveClassComponentOwnerName, resolveKind, resolveTransportObjects, resolveType, selectTransportSourceVersions, tryGetGlobalContext };
 //# sourceMappingURL=index.d.mts.map