@onlineapps/conn-orch-api-mapper 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-api-mapper",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "API mapping connector for OA Drive - maps cookbook operations to HTTP endpoints",
   "main": "src/index.js",
   "scripts": {

package/src/ApiMapper.js

@@ -686,7 +686,7 @@ class ApiMapper {
    * @private
    * @param {Object} operation - Operation definition
    * @param {Object} input - Resolved input
-   * @param {Object} context - Workflow context (must include _system.tenant_id + _system.workspace_id)
+   * @param {Object} context - Workflow context (must include _system.tenant_id + _system.default_workspace_id)
    * @returns {Object} Request object
    */
   _buildRequest(operation, input, context = {}) {
@@ -760,25 +760,40 @@ class ApiMapper {
     const sys = context && typeof context === 'object' ? context._system : null;
     if (!sys) {
       throw new Error(
-        '[ApiMapper][TenantContext] Missing _system context - Expected context._system with tenant_id + workspace_id. ' +
-        'Fix: Gateway must set _system.tenant_id + _system.workspace_id.'
+        '[ApiMapper][TenantContext] Missing _system context - Expected context._system with tenant_id. ' +
+        'Fix: Gateway must set _system.tenant_id.'
       );
     }
 
-    if (sys.tenant_id === undefined || sys.workspace_id === undefined) {
+    if (sys.tenant_id === undefined) {
       throw new Error(
-        '[ApiMapper][TenantContext] Missing tenant context - Expected _system.tenant_id + _system.workspace_id'
+        '[ApiMapper][TenantContext] Missing tenant context - Expected _system.tenant_id'
       );
     }
 
     const tenantId = Number.parseInt(String(sys.tenant_id), 10);
-    const workspaceId = Number.parseInt(String(sys.workspace_id), 10);
     if (!Number.isInteger(tenantId) || tenantId <= 0) {
       throw new Error(`[ApiMapper][TenantContext] Invalid tenant_id - Expected positive integer, got: ${sys.tenant_id}`);
     }
+
+    // workspace_id: per-step override → cookbook default → error
+    // See: .cursor/rules/workspace-architecture.mdc
+    const stepDef = context._pointer?.currentStep || operation;
+    const rawStepWs = stepDef?.workspace_id;
+    const rawDefaultWs = sys.default_workspace_id;
+    const rawWorkspaceId = rawStepWs !== undefined && rawStepWs !== null ? rawStepWs : rawDefaultWs;
+
+    if (rawWorkspaceId === undefined || rawWorkspaceId === null) {
+      throw new Error(
+        '[ApiMapper][TenantContext] Missing workspace_id - set per-step workspace_id or cookbook defaults.workspace_id'
+      );
+    }
+
+    const workspaceId = Number.parseInt(String(rawWorkspaceId), 10);
     if (!Number.isInteger(workspaceId) || workspaceId <= 0) {
-      throw new Error(`[ApiMapper][TenantContext] Invalid workspace_id - Expected positive integer, got: ${sys.workspace_id}`);
+      throw new Error(`[ApiMapper][TenantContext] Invalid workspace_id - Expected positive integer, got: ${rawWorkspaceId}`);
     }
+
     const personId = sys.person_id !== undefined && sys.person_id !== null
       ? Number.parseInt(String(sys.person_id), 10)
       : undefined;
@@ -786,6 +801,7 @@ class ApiMapper {
       throw new Error(`[ApiMapper][TenantContext] Invalid person_id - Expected positive integer, got: ${sys.person_id}`);
     }
 
+    // See: docs/standards/tenant-context-contract.md (§3 Data Flow)
     request.headers['x-tenant-id'] = String(tenantId);
     request.headers['x-workspace-id'] = String(workspaceId);
     request.headers['x-person-id'] = String(personId);