@devrev/airsync-sdk 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/state/extraction-state.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExtractionState = void 0;
+exports.createExtractionState = createExtractionState;
+const node_worker_threads_1 = require("node:worker_threads");
+const constants_1 = require("../common/constants");
+const time_value_resolver_1 = require("../common/time-value-resolver");
+const logger_1 = require("../logger/logger");
+const extraction_1 = require("../types/extraction");
+const workers_1 = require("../types/workers");
+const base_state_1 = require("./base-state");
+const state_interfaces_1 = require("./state.interfaces");
+/**
+ * ExtractionState is the per-mode state for extraction workers. It narrows
+ * `sdkState` to `ExtractionSdkState` (extraction boundaries + attachments
+ * bookkeeping) on top of the shared lifecycle provided by `BaseState`.
+ */
+class ExtractionState extends base_state_1.BaseState {
+    constructor(params) {
+        super(params, state_interfaces_1.initialExtractionSdkState);
+    }
+    /**
+     * Resolves the extraction window onto the event context.
+     *
+     * On StartExtractingMetadata: resolve fresh from the TimeValue objects in the
+     * event context and cache them as pending boundaries (always overwrite).
+     * On all other events: reuse the pending boundaries cached during
+     * StartExtractingMetadata. Finally, validate that extract_from < extract_to.
+     */
+    resolveExtractionWindow() {
+        const eventContext = this.event.payload.event_context;
+        const sdkState = this.sdkState;
+        if (this.event.payload.event_type === extraction_1.EventType.StartExtractingMetadata) {
+            const timeFields = [
+                {
+                    source: 'extraction_start_time',
+                    target: 'extract_from',
+                    pending: 'pendingWorkersOldest',
+                },
+                {
+                    source: 'extraction_end_time',
+                    target: 'extract_to',
+                    pending: 'pendingWorkersNewest',
+                },
+            ];
+            for (const { source, target, pending } of timeFields) {
+                const timeValue = eventContext[source];
+                if (timeValue && timeValue.type) {
+                    try {
+                        const resolved = (0, time_value_resolver_1.resolveTimeValue)(timeValue, sdkState);
+                        eventContext[target] = resolved;
+                        sdkState[pending] = resolved;
+                        console.log(`Resolved ${target} to ${resolved}. Stored in ${pending}.`);
+                    }
+                    catch (error) {
+                        const errorMessage = `Failed to resolve ${source}: ${(0, logger_1.serializeError)(error)}`;
+                        console.error(errorMessage);
+                        node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage({
+                            subject: workers_1.WorkerMessageSubject.WorkerMessageFailed,
+                            payload: { message: errorMessage },
+                        });
+                        process.exit(1);
+                    }
+                }
+            }
+        }
+        else {
+            // Non-StartExtractingMetadata events: reuse pending values from state
+            if (sdkState.pendingWorkersOldest) {
+                eventContext.extract_from = sdkState.pendingWorkersOldest;
+                console.log(`Reusing pendingWorkersOldest as extract_from: ${sdkState.pendingWorkersOldest}.`);
+            }
+            else {
+                console.log('pendingWorkersOldest is not set in state. extract_from will not be populated for this invocation.');
+            }
+            if (sdkState.pendingWorkersNewest) {
+                eventContext.extract_to = sdkState.pendingWorkersNewest;
+                console.log(`Reusing pendingWorkersNewest as extract_to: ${sdkState.pendingWorkersNewest}.`);
+            }
+            else {
+                console.log('pendingWorkersNewest is not set in state. extract_to will not be populated for this invocation.');
+            }
+        }
+        // Validate that extract_from is before extract_to
+        if (eventContext.extract_from && eventContext.extract_to) {
+            if (eventContext.extract_from >= eventContext.extract_to) {
+                const errorMessage = `Invalid extraction window: extract_from (${eventContext.extract_from}) must be older than extract_to (${eventContext.extract_to}). This indicates an error in the platform.`;
+                console.error(errorMessage);
+                node_worker_threads_1.parentPort === null || node_worker_threads_1.parentPort === void 0 ? void 0 : node_worker_threads_1.parentPort.postMessage({
+                    subject: workers_1.WorkerMessageSubject.WorkerMessageFailed,
+                    payload: { message: errorMessage },
+                });
+                process.exit(1);
+            }
+        }
+    }
+}
+exports.ExtractionState = ExtractionState;
+/**
+ * Creates and initializes an `ExtractionState` for an extraction worker.
+ *
+ * For non-stateless events this fetches/migrates persisted state, installs the
+ * initial domain mapping if the snap-in version changed, then resolves the
+ * extraction window (time-value resolution + pending boundary reuse) and
+ * validates it.
+ */
+async function createExtractionState({ event, initialState, initialDomainMapping, options, }) {
+    // Deep clone the initial state to avoid mutating the original state
+    const deepCloneInitialState = structuredClone(initialState);
+    const state = new ExtractionState({
+        event,
+        initialState: deepCloneInitialState,
+        initialDomainMapping,
+        options,
+    });
+    if (!constants_1.STATELESS_EVENT_TYPES.includes(event.payload.event_type)) {
+        await state.init(deepCloneInitialState);
+        await state.installInitialDomainMappingIfNeeded(initialDomainMapping);
+        state.resolveExtractionWindow();
+    }
+    return state;
+}

package/dist/state/loading-state.d.ts

@@ -0,0 +1,19 @@
+import { BaseState } from './base-state';
+import { LoadingSdkState, StateInterface } from './state.interfaces';
+/**
+ * LoadingState is the per-mode state for loading workers. It narrows `sdkState`
+ * to `LoadingSdkState` (files-to-load bookkeeping) on top of the shared
+ * lifecycle provided by `BaseState`.
+ */
+export declare class LoadingState<ConnectorState> extends BaseState<ConnectorState, LoadingSdkState> {
+    constructor(params: StateInterface<ConnectorState>);
+}
+/**
+ * Creates and initializes a `LoadingState` for a loading worker.
+ *
+ * For non-stateless events this fetches/migrates persisted state and installs
+ * the initial domain mapping if the snap-in version changed. Loading has no
+ * extraction-window resolution, so the factory is otherwise minimal.
+ */
+export declare function createLoadingState<ConnectorState>({ event, initialState, initialDomainMapping, options, }: StateInterface<ConnectorState>): Promise<LoadingState<ConnectorState>>;
+//# sourceMappingURL=loading-state.d.ts.map

package/dist/state/loading-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loading-state.d.ts","sourceRoot":"","sources":["../../src/state/loading-state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAEL,eAAe,EACf,cAAc,EACf,MAAM,oBAAoB,CAAC;AAE5B;;;;GAIG;AACH,qBAAa,YAAY,CAAC,cAAc,CAAE,SAAQ,SAAS,CACzD,cAAc,EACd,eAAe,CAChB;gBACa,MAAM,EAAE,cAAc,CAAC,cAAc,CAAC;CAGnD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,cAAc,EAAE,EACvD,KAAK,EACL,YAAY,EACZ,oBAAoB,EACpB,OAAO,GACR,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAiBxE"}

package/dist/state/loading-state.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoadingState = void 0;
+exports.createLoadingState = createLoadingState;
+const constants_1 = require("../common/constants");
+const base_state_1 = require("./base-state");
+const state_interfaces_1 = require("./state.interfaces");
+/**
+ * LoadingState is the per-mode state for loading workers. It narrows `sdkState`
+ * to `LoadingSdkState` (files-to-load bookkeeping) on top of the shared
+ * lifecycle provided by `BaseState`.
+ */
+class LoadingState extends base_state_1.BaseState {
+    constructor(params) {
+        super(params, state_interfaces_1.initialLoadingSdkState);
+    }
+}
+exports.LoadingState = LoadingState;
+/**
+ * Creates and initializes a `LoadingState` for a loading worker.
+ *
+ * For non-stateless events this fetches/migrates persisted state and installs
+ * the initial domain mapping if the snap-in version changed. Loading has no
+ * extraction-window resolution, so the factory is otherwise minimal.
+ */
+async function createLoadingState({ event, initialState, initialDomainMapping, options, }) {
+    // Deep clone the initial state to avoid mutating the original state
+    const deepCloneInitialState = structuredClone(initialState);
+    const state = new LoadingState({
+        event,
+        initialState: deepCloneInitialState,
+        initialDomainMapping,
+        options,
+    });
+    if (!constants_1.STATELESS_EVENT_TYPES.includes(event.payload.event_type)) {
+        await state.init(deepCloneInitialState);
+        await state.installInitialDomainMappingIfNeeded(initialDomainMapping);
+    }
+    return state;
+}

package/dist/state/state.extract-window.test.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jest_setup_1 = require("../tests/jest.setup");
 const test_utils_1 = require("../common/test-utils");
 const extraction_1 = require("../types/extraction");
-const state_1 = require("./state");
+const extraction_state_1 = require("./extraction-state");
 describe('State — extraction window validation', () => {
     let fetchStateSpy;
     let processExitSpy;
     beforeEach(() => {
         jest.clearAllMocks();
         jest.restoreAllMocks();
-        fetchStateSpy = jest.spyOn(state_1.State.prototype, 'fetchState');
+        fetchStateSpy = jest.spyOn(extraction_state_1.ExtractionState.prototype, 'fetchState');
         processExitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
@@ -38,7 +38,7 @@ describe('State — extraction window validation', () => {
             });
             fetchStateSpy.mockResolvedValue({ state: stringifiedState });
             // Act & Assert
-            await expect((0, state_1.createAdapterState)({
+            await expect((0, extraction_state_1.createExtractionState)({
                 event,
                 initialState: {},
                 initialDomainMapping: {},
@@ -67,7 +67,7 @@ describe('State — extraction window validation', () => {
             });
             fetchStateSpy.mockResolvedValue({ state: stringifiedState });
             // Act & Assert
-            await expect((0, state_1.createAdapterState)({
+            await expect((0, extraction_state_1.createExtractionState)({
                 event,
                 initialState: {},
                 initialDomainMapping: {},
@@ -96,7 +96,7 @@ describe('State — extraction window validation', () => {
             });
             fetchStateSpy.mockResolvedValue({ state: stringifiedState });
             // Act
-            await (0, state_1.createAdapterState)({
+            await (0, extraction_state_1.createExtractionState)({
                 event,
                 initialState: {},
                 initialDomainMapping: {},
@@ -122,7 +122,7 @@ describe('State — extraction window validation', () => {
             });
             fetchStateSpy.mockResolvedValue({ state: stringifiedState });
             // Act
-            await (0, state_1.createAdapterState)({
+            await (0, extraction_state_1.createExtractionState)({
                 event,
                 initialState: {},
                 initialDomainMapping: {},
@@ -151,7 +151,7 @@ describe('State — extraction window validation', () => {
             });
             fetchStateSpy.mockResolvedValue({ state: stringifiedState });
             // Act
-            await (0, state_1.createAdapterState)({
+            await (0, extraction_state_1.createExtractionState)({
                 event,
                 initialState: {},
                 initialDomainMapping: {},

package/dist/state/state.interfaces.d.ts

@@ -2,7 +2,16 @@ import { InitialDomainMapping } from '../types/common';
 import { AirSyncEvent } from '../types/extraction';
 import { FileToLoad } from '../types/loading';
 import { WorkerAdapterOptions } from '../types/workers';
-export interface SdkState {
+/**
+ * BaseSdkState holds SDK bookkeeping common to every sync mode.
+ */
+export interface BaseSdkState {
+    snapInVersionId?: string;
+}
+/**
+ * ExtractionSdkState holds SDK bookkeeping owned by the extraction modes.
+ */
+export interface ExtractionSdkState extends BaseSdkState {
     /** The pending (not yet committed) oldest extraction boundary (ISO 8601 timestamp).
      *  Set on StartExtractingMetadata, reused across subsequent phases, cleared on AttachmentExtractionDone. */
     pendingWorkersOldest?: string;
@@ -14,14 +23,22 @@ export interface SdkState {
     /** The newest point of extraction (ISO 8601 timestamp). */
     workersNewest?: string;
     toDevRev?: ToDevRev;
+}
+/**
+ * LoadingSdkState holds SDK bookkeeping owned by the loading modes.
+ */
+export interface LoadingSdkState extends BaseSdkState {
     fromDevRev?: FromDevRev;
-    snapInVersionId?: string;
 }
 /**
- * AdapterState is an interface that defines the structure of the adapter state that is used by the external extractor.
- * It extends the connector state with additional fields including snapInVersionId and attachmentsMetadata.
+ * AdapterStateEnvelope is the v2 on-disk state shape: connector state and SDK
+ * bookkeeping are stored as disjoint sub-objects so SDK internals stay
+ * encapsulated and never collide with connector keys.
  */
-export type AdapterState<ConnectorState> = ConnectorState & SdkState;
+export interface AdapterStateEnvelope<ConnectorState, SdkState extends BaseSdkState> {
+    connectorState: ConnectorState;
+    sdkState: SdkState;
+}
 export interface ToDevRev {
     attachmentsMetadata: {
         artifactIds: string[];
@@ -45,24 +62,14 @@ export interface StateInterface<ConnectorState> {
     initialDomainMapping?: InitialDomainMapping;
     options?: WorkerAdapterOptions;
 }
-export declare const extractionSdkState: {
-    pendingWorkersOldest: string;
-    pendingWorkersNewest: string;
-    workersOldest: string;
-    workersNewest: string;
-    snapInVersionId: string;
-    toDevRev: {
-        attachmentsMetadata: {
-            artifactIds: never[];
-            lastProcessed: number;
-            lastProcessedAttachmentsIdsList: never[];
-        };
-    };
-};
-export declare const loadingSdkState: {
-    snapInVersionId: string;
-    fromDevRev: {
-        filesToLoad: never[];
-    };
-};
+export declare const initialExtractionSdkState: ExtractionSdkState;
+export declare const initialLoadingSdkState: LoadingSdkState;
+/**
+ * The set of top-level state keys owned by the SDK. Derived from the initial
+ * SDK state constants so it auto-updates whenever a new SDK field is added.
+ * Used by the migration shim to split a flat v1 state blob into the
+ * `{ connectorState, sdkState }` envelope: keys in this set go to `sdkState`,
+ * everything else is connector state.
+ */
+export declare const V1_SDK_STATE_KEYS: ReadonlySet<string>;
 //# sourceMappingURL=state.interfaces.d.ts.map

package/dist/state/state.interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.interfaces.d.ts","sourceRoot":"","sources":["../../src/state/state.interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,MAAM,WAAW,QAAQ;IACvB;gHAC4G;IAC5G,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;gHAC4G;IAC5G,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,cAAc,IAAI,cAAc,GAAG,QAAQ,CAAC;AAErE,MAAM,WAAW,QAAQ;IACvB,mBAAmB,EAAE;QACnB,WAAW,EAAE,MAAM,EAAE,CAAC;QACtB,aAAa,EAAE,MAAM,CAAC;QACtB,+BAA+B,CAAC,EAAE,mBAAmB,EAAE,CAAC;KACzD,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc,CAAC,cAAc;IAC5C,KAAK,EAAE,YAAY,CAAC;IACpB,YAAY,EAAE,cAAc,CAAC;IAC7B,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC;AAED,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;CAa9B,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;CAK3B,CAAC"}
+{"version":3,"file":"state.interfaces.d.ts","sourceRoot":"","sources":["../../src/state/state.interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IACtD;gHAC4G;IAC5G,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;gHAC4G;IAC5G,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB,CACnC,cAAc,EACd,QAAQ,SAAS,YAAY;IAE7B,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,QAAQ;IACvB,mBAAmB,EAAE;QACnB,WAAW,EAAE,MAAM,EAAE,CAAC;QACtB,aAAa,EAAE,MAAM,CAAC;QACtB,+BAA+B,CAAC,EAAE,mBAAmB,EAAE,CAAC;KACzD,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc,CAAC,cAAc;IAC5C,KAAK,EAAE,YAAY,CAAC;IACpB,YAAY,EAAE,cAAc,CAAC;IAC7B,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,OAAO,CAAC,EAAE,oBAAoB,CAAC;CAChC;AAED,eAAO,MAAM,yBAAyB,EAAE,kBAavC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,eAKpC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAGhD,CAAC"}

package/dist/state/state.interfaces.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadingSdkState = exports.extractionSdkState = void 0;
-exports.extractionSdkState = {
+exports.V1_SDK_STATE_KEYS = exports.initialLoadingSdkState = exports.initialExtractionSdkState = void 0;
+exports.initialExtractionSdkState = {
+    snapInVersionId: '',
     pendingWorkersOldest: '',
     pendingWorkersNewest: '',
     workersOldest: '',
     workersNewest: '',
-    snapInVersionId: '',
     toDevRev: {
         attachmentsMetadata: {
             artifactIds: [],
@@ -15,9 +15,20 @@ exports.extractionSdkState = {
         },
     },
 };
-exports.loadingSdkState = {
+exports.initialLoadingSdkState = {
     snapInVersionId: '',
     fromDevRev: {
         filesToLoad: [],
     },
 };
+/**
+ * The set of top-level state keys owned by the SDK. Derived from the initial
+ * SDK state constants so it auto-updates whenever a new SDK field is added.
+ * Used by the migration shim to split a flat v1 state blob into the
+ * `{ connectorState, sdkState }` envelope: keys in this set go to `sdkState`,
+ * everything else is connector state.
+ */
+exports.V1_SDK_STATE_KEYS = new Set([
+    ...Object.keys(exports.initialExtractionSdkState),
+    ...Object.keys(exports.initialLoadingSdkState),
+]);

package/dist/state/state.pending-boundaries.test.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jest_setup_1 = require("../tests/jest.setup");
 const test_utils_1 = require("../common/test-utils");
 const extraction_1 = require("../types/extraction");
-const state_1 = require("./state");
+const extraction_state_1 = require("./extraction-state");
 /* eslint-disable @typescript-eslint/no-require-imports */
 const FIXED_NOW = '2026-03-26T10:00:00.000Z';
 describe('State — pending extraction boundaries', () => {
@@ -13,8 +13,8 @@ describe('State — pending extraction boundaries', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         jest.restoreAllMocks();
-        postStateSpy = jest.spyOn(state_1.State.prototype, 'postState');
-        fetchStateSpy = jest.spyOn(state_1.State.prototype, 'fetchState');
+        postStateSpy = jest.spyOn(extraction_state_1.ExtractionState.prototype, 'postState');
+        fetchStateSpy = jest.spyOn(extraction_state_1.ExtractionState.prototype, 'fetchState');
         installInitialDomainMappingSpy = jest.spyOn(require('../common/install-initial-domain-mapping'), 'installInitialDomainMapping');
         jest.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
@@ -50,14 +50,14 @@ describe('State — pending extraction boundaries', () => {
         installInitialDomainMappingSpy.mockResolvedValue({ success: true });
         postStateSpy.mockResolvedValue({ success: true });
         // Act
-        const state = await (0, state_1.createAdapterState)({
+        const state = await (0, extraction_state_1.createExtractionState)({
             event,
             initialState: {},
             initialDomainMapping: {},
         });
         // Assert
-        expect(state.state.pendingWorkersOldest).toBe('1970-01-01T00:00:00.000Z');
-        expect(state.state.pendingWorkersNewest).toBe(FIXED_NOW);
+        expect(state.sdkState.pendingWorkersOldest).toBe('1970-01-01T00:00:00.000Z');
+        expect(state.sdkState.pendingWorkersNewest).toBe(FIXED_NOW);
         expect(event.payload.event_context.extract_from).toBe('1970-01-01T00:00:00.000Z');
         expect(event.payload.event_context.extract_to).toBe(FIXED_NOW);
     });
@@ -88,15 +88,15 @@ describe('State — pending extraction boundaries', () => {
         });
         fetchStateSpy.mockResolvedValue({ state: stringifiedState });
         // Act
-        const state = await (0, state_1.createAdapterState)({
+        const state = await (0, extraction_state_1.createExtractionState)({
             event,
             initialState: {},
             initialDomainMapping: {},
         });
         // Assert: pending values are overwritten with fresh resolution, not stale values
-        expect(state.state.pendingWorkersOldest).toBe('1970-01-01T00:00:00.000Z');
-        expect(state.state.pendingWorkersNewest).toBe(FIXED_NOW);
-        expect(state.state.pendingWorkersNewest).not.toBe(staleNewest);
+        expect(state.sdkState.pendingWorkersOldest).toBe('1970-01-01T00:00:00.000Z');
+        expect(state.sdkState.pendingWorkersNewest).toBe(FIXED_NOW);
+        expect(state.sdkState.pendingWorkersNewest).not.toBe(staleNewest);
     });
     it('should reuse pending values from state on ContinueExtractingData instead of re-resolving', async () => {
         // Arrange: state has pending values from a prior StartExtractingMetadata phase
@@ -126,7 +126,7 @@ describe('State — pending extraction boundaries', () => {
         });
         fetchStateSpy.mockResolvedValue({ state: stringifiedState });
         // Act
-        const state = await (0, state_1.createAdapterState)({
+        const state = await (0, extraction_state_1.createExtractionState)({
             event,
             initialState: {},
             initialDomainMapping: {},
@@ -135,8 +135,8 @@ describe('State — pending extraction boundaries', () => {
         expect(event.payload.event_context.extract_from).toBe(pendingOldest);
         expect(event.payload.event_context.extract_to).toBe(pendingNewest);
         // Pending values in state remain unchanged
-        expect(state.state.pendingWorkersOldest).toBe(pendingOldest);
-        expect(state.state.pendingWorkersNewest).toBe(pendingNewest);
+        expect(state.sdkState.pendingWorkersOldest).toBe(pendingOldest);
+        expect(state.sdkState.pendingWorkersNewest).toBe(pendingNewest);
     });
     it('should not set extract_from/extract_to on ContinueExtractingData if no pending values exist', async () => {
         // Arrange: state has no pending values (e.g. old state from before this feature)
@@ -151,7 +151,7 @@ describe('State — pending extraction boundaries', () => {
         });
         fetchStateSpy.mockResolvedValue({ state: stringifiedState });
         // Act
-        await (0, state_1.createAdapterState)({
+        await (0, extraction_state_1.createExtractionState)({
             event,
             initialState: {},
             initialDomainMapping: {},
@@ -177,7 +177,7 @@ describe('State — pending extraction boundaries', () => {
         });
         fetchStateSpy.mockResolvedValue({ state: stringifiedState });
         // Act
-        await (0, state_1.createAdapterState)({
+        await (0, extraction_state_1.createExtractionState)({
             event,
             initialState: {},
             initialDomainMapping: {},

package/dist/state/state.post-state.test.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jest_setup_1 = require("../tests/jest.setup");
 const test_utils_1 = require("../common/test-utils");
 const extraction_1 = require("../types/extraction");
-const state_1 = require("./state");
+const extraction_state_1 = require("./extraction-state");
 /* eslint-disable @typescript-eslint/no-require-imports */
 describe('State.postState', () => {
     let postStateSpy;
@@ -12,8 +12,8 @@ describe('State.postState', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         jest.restoreAllMocks();
-        postStateSpy = jest.spyOn(state_1.State.prototype, 'postState');
-        fetchStateSpy = jest.spyOn(state_1.State.prototype, 'fetchState');
+        postStateSpy = jest.spyOn(extraction_state_1.ExtractionState.prototype, 'postState');
+        fetchStateSpy = jest.spyOn(extraction_state_1.ExtractionState.prototype, 'fetchState');
         processExitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
@@ -32,7 +32,7 @@ describe('State.postState', () => {
             state: JSON.stringify({ snapInVersionId: '1.0.0' }),
         });
         postStateSpy.mockRestore();
-        const adapterState = await (0, state_1.createAdapterState)({
+        const adapterState = await (0, extraction_state_1.createExtractionState)({
             event,
             initialState: {},
             initialDomainMapping: {},
@@ -43,11 +43,12 @@ describe('State.postState', () => {
         const requests = jest_setup_1.mockServer.getRequests('POST', '/worker_data_url.update');
         expect(requests).toHaveLength(1);
         const body = requests[0].body;
-        // Body must contain the stringified state, preserving the original fields
+        // Body must contain the stringified v2 envelope: connector state and SDK
+        // bookkeeping stored as disjoint sub-objects.
         expect(typeof body.state).toBe('string');
         const parsed = JSON.parse(body.state);
-        expect(parsed.foo).toBe('bar');
-        expect(parsed.snapInVersionId).toBe('1.0.0');
+        expect(parsed.connectorState.foo).toBe('bar');
+        expect(parsed.sdkState.snapInVersionId).toBe('1.0.0');
     });
     it('should exit(1) when postState HTTP request fails', async () => {
         // Arrange
@@ -59,7 +60,7 @@ describe('State.postState', () => {
             state: JSON.stringify({ snapInVersionId: '1.0.0' }),
         });
         postStateSpy.mockRestore();
-        const adapterState = await (0, state_1.createAdapterState)({
+        const adapterState = await (0, extraction_state_1.createExtractionState)({
             event,
             initialState: {},
             initialDomainMapping: {},