@sharpee/stdlib 3.0.0 → 3.3.0

package/actions/standard/removing/removing-events.d.ts

@@ -2,8 +2,8 @@
  * Event type definitions for the removing action
  * @module
  */
-export { TakenEventData as RemovedEventData } from '../taking/taking-events';
+export { TakenEventData as RemovedEventData } from '../taking/taking-events.js';
 export interface RemovingEventMap {
-    'if.event.taken': import('../taking/taking-events').TakenEventData;
+    'if.event.taken': import('../taking/taking-events.js').TakenEventData;
 }
 //# sourceMappingURL=removing-events.d.ts.map

package/actions/standard/removing/removing-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removing-events.d.ts","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing-events.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,IAAI,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE7E,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,OAAO,yBAAyB,EAAE,cAAc,CAAC;CACpE"}
+{"version":3,"file":"removing-events.d.ts","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing-events.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,cAAc,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEhF,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,OAAO,4BAA4B,EAAE,cAAc,CAAC;CACvE"}

package/actions/standard/removing/removing-types.d.ts

@@ -3,29 +3,23 @@
  *
  * Provides type-safe access to shared data for multi-object support
  */
-import { IFEntity, IRemoveItemResult, IRemoveItemFromSupporterResult, ITakeItemResult } from '@sharpee/world-model';
+import { IRemoveItemResult, IRemoveItemFromSupporterResult, ITakeItemResult } from '@sharpee/world-model';
 /**
- * Result of validating/executing a single entity in multi-object command
+ * Per-item mutation scratch for removing one entity. For a single-object
+ * command this lives on the action's sharedData; for a multi-object
+ * command each item gets its own copy via the lifecycle engine's per-item
+ * `itemData` (ADR-228 D4).
  */
-export interface RemovingItemResult {
-    entity: IFEntity;
-    success: boolean;
-    error?: string;
-    errorParams?: Record<string, unknown>;
+export interface RemovingItemScratch {
     removeResult?: IRemoveItemResult | IRemoveItemFromSupporterResult | null;
     takeResult?: ITakeItemResult;
 }
 /**
- * Typed shared data for removing action
+ * Typed shared data for removing action.
+ * Interceptor and multi-object state live in the lifecycle engine's
+ * reserved sharedData slots (ADR-228), not here.
  */
-export interface RemovingSharedData {
-    removeResult?: IRemoveItemResult | IRemoveItemFromSupporterResult | null;
-    takeResult?: ITakeItemResult;
-    /**
-     * Multi-object support: results for each entity
-     * When set, indicates this is a multi-object command
-     */
-    multiObjectResults?: RemovingItemResult[];
+export interface RemovingSharedData extends RemovingItemScratch {
 }
 /**
  * Safely get typed shared data from context

package/actions/standard/removing/removing-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removing-types.d.ts","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,8BAA8B,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEpH;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,iBAAiB,GAAG,8BAA8B,GAAG,IAAI,CAAC;IACzE,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE,iBAAiB,GAAG,8BAA8B,GAAG,IAAI,CAAC;IACzE,UAAU,CAAC,EAAE,eAAe,CAAC;IAE7B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC3C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,GAAG,kBAAkB,CAKtG"}
+{"version":3,"file":"removing-types.d.ts","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,8BAA8B,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE1G;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,iBAAiB,GAAG,8BAA8B,GAAG,IAAI,CAAC;IACzE,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;CAAG;AAElE;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,GAAG,kBAAkB,CAKtG"}

package/actions/standard/removing/removing-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"removing-types.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing-types.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAiCH,sDAKC;AARD;;GAEG;AACH,SAAgB,qBAAqB,CAAC,OAA4C;IAChF,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QAC1E,OAAO,CAAC,UAAU,GAAG,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,OAAO,CAAC,UAAgC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"removing-types.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing-types.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAyBH,sDAKC;AARD;;GAEG;AACH,SAAgB,qBAAqB,CAAC,OAA4C;IAChF,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QAC1E,OAAO,CAAC,UAAU,GAAG,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,OAAO,CAAC,UAAgC,CAAC;AAClD,CAAC"}

package/actions/standard/removing/removing.d.ts

@@ -15,8 +15,21 @@
  * - "remove all but X from box" - removes all except specified items
  * - "remove X and Y from box" - removes multiple specified items
  */
-import { Action } from '../../enhanced-types';
-import { ActionMetadata } from '../../../validation';
+import { Action } from '../../enhanced-types.js';
+import { ActionMetadata } from '../../../validation/index.js';
+import { ActionLifecycleDescriptor } from '../../lifecycle/index.js';
+/**
+ * Interceptor surface (ADR-228). D6-B delegation-seam ruling: removing IS
+ * a take (it re-implements taking's mutation and emits `if.event.taken`),
+ * so the item is consulted under BOTH ids — `if.action.removing` first
+ * (the specific phrasing), then `if.action.taking`. A taking-guard (the
+ * TrollAxe class) can therefore never be bypassed by REMOVE FROM
+ * phrasing. Authors: one physical operation fires hooks under two ids —
+ * register a trait's interceptor under exactly ONE of them to avoid
+ * double-mutation. The source container/supporter is consulted under
+ * `if.action.removing` per D3-B (all command entities fire).
+ */
+export declare const removingLifecycle: ActionLifecycleDescriptor;
 export declare const removingAction: Action & {
     metadata: ActionMetadata;
 };

package/actions/standard/removing/removing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removing.d.ts","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAwTrD,eAAO,MAAM,cAAc,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAyL/D,CAAC"}
+{"version":3,"file":"removing.d.ts","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee_v2/packages/stdlib/src/actions/standard/removing/removing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAyB9D,OAAO,EACL,yBAAyB,EAa1B,MAAM,0BAA0B,CAAC;AAElC;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iBAAiB,EAAE,yBA4C/B,CAAC;AAuPF,eAAO,MAAM,cAAc,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAwO/D,CAAC"}

package/actions/standard/removing/removing.js

@@ -17,17 +17,74 @@
  * - "remove X and Y from box" - removes multiple specified items
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removingAction = void 0;
-const snapshot_utils_1 = require("../../base/snapshot-utils");
+exports.removingAction = exports.removingLifecycle = void 0;
+const snapshot_utils_js_1 = require("../../base/snapshot-utils.js");
 const world_model_1 = require("@sharpee/world-model");
-const constants_1 = require("../../constants");
-const scope_1 = require("../../../scope");
-const removing_messages_1 = require("./removing-messages");
+const constants_js_1 = require("../../constants.js");
+const index_js_1 = require("../../../scope/index.js");
+const removing_messages_js_1 = require("./removing-messages.js");
 // Import types
-const removing_types_1 = require("./removing-types");
+const removing_types_js_1 = require("./removing-types.js");
 // Import multi-object helpers
-const multi_object_handler_1 = require("../../../helpers/multi-object-handler");
-const utils_1 = require("../../../utils");
+const multi_object_handler_js_1 = require("../../../helpers/multi-object-handler.js");
+const index_js_2 = require("../../../utils/index.js");
+const index_js_3 = require("../../lifecycle/index.js");
+/**
+ * Interceptor surface (ADR-228). D6-B delegation-seam ruling: removing IS
+ * a take (it re-implements taking's mutation and emits `if.event.taken`),
+ * so the item is consulted under BOTH ids — `if.action.removing` first
+ * (the specific phrasing), then `if.action.taking`. A taking-guard (the
+ * TrollAxe class) can therefore never be bypassed by REMOVE FROM
+ * phrasing. Authors: one physical operation fires hooks under two ids —
+ * register a trait's interceptor under exactly ONE of them to avoid
+ * double-mutation. The source container/supporter is consulted under
+ * `if.action.removing` per D3-B (all command entities fire).
+ */
+exports.removingLifecycle = {
+    actionId: constants_js_1.IFActions.REMOVING,
+    slots: [
+        {
+            id: 'item',
+            actionIds: [constants_js_1.IFActions.REMOVING, constants_js_1.IFActions.TAKING],
+            resolve: (ctx) => ctx.command.directObject?.entity,
+            seedData: (ctx, entity) => ({
+                itemId: entity.id,
+                itemName: entity.name,
+                sourceId: ctx.command.indirectObject?.entity?.id,
+                sourceName: ctx.command.indirectObject?.entity?.name
+            })
+        },
+        {
+            id: 'source',
+            actionIds: [constants_js_1.IFActions.REMOVING],
+            resolve: (ctx) => ctx.command.indirectObject?.entity,
+            seedData: (ctx, entity, multiObjectItem) => {
+                const item = multiObjectItem ?? ctx.command.directObject?.entity;
+                return {
+                    itemId: item?.id,
+                    itemName: item?.name,
+                    sourceId: entity.id,
+                    sourceName: entity.name
+                };
+            }
+        },
+        {
+            // ADR-230 Phase 6 (sketch ruling 6): `take X from Y with Z` remapped
+            // from the orphan if.action.taking_with onto removing; the explicit
+            // tool is consultable (D3b treatment, interceptor-only — no trait
+            // requirement). Published order item → source → tool.
+            id: 'tool',
+            actionIds: [constants_js_1.IFActions.REMOVING],
+            resolve: (ctx) => ctx.command.instrument?.entity,
+            seedData: (ctx, entity) => ({
+                toolId: entity.id,
+                toolName: entity.name,
+                itemId: ctx.command.directObject?.entity?.id,
+                sourceId: ctx.command.indirectObject?.entity?.id
+            })
+        }
+    ]
+};
 // ============================================================================
 // Helper Functions (standalone to avoid `this` issues in object literal)
 // ============================================================================
@@ -59,8 +116,8 @@ function validateSingleEntity(context, item, source) {
     if (world_model_1.ActorBehavior.isHolding(actor, item.id, context.world)) {
         return {
             valid: false,
-            error: removing_messages_1.RemovingMessages.ALREADY_HAVE,
-            params: { item: (0, utils_1.nounPhraseFor)(item) }
+            error: removing_messages_js_1.RemovingMessages.ALREADY_HAVE,
+            params: { item: (0, index_js_2.nounPhraseFor)(item) }
         };
     }
     // Check if the item is actually in/on the source
@@ -69,30 +126,30 @@ function validateSingleEntity(context, item, source) {
         if (source.has(world_model_1.TraitType.CONTAINER)) {
             return {
                 valid: false,
-                error: removing_messages_1.RemovingMessages.NOT_IN_CONTAINER,
+                error: removing_messages_js_1.RemovingMessages.NOT_IN_CONTAINER,
                 params: {
-                    item: (0, utils_1.nounPhraseFor)(item),
-                    container: (0, utils_1.nounPhraseFor)(source)
+                    item: (0, index_js_2.nounPhraseFor)(item),
+                    container: (0, index_js_2.nounPhraseFor)(source)
                 }
             };
         }
         else if (source.has(world_model_1.TraitType.SUPPORTER)) {
             return {
                 valid: false,
-                error: removing_messages_1.RemovingMessages.NOT_ON_SURFACE,
+                error: removing_messages_js_1.RemovingMessages.NOT_ON_SURFACE,
                 params: {
-                    item: (0, utils_1.nounPhraseFor)(item),
-                    surface: (0, utils_1.nounPhraseFor)(source)
+                    item: (0, index_js_2.nounPhraseFor)(item),
+                    surface: (0, index_js_2.nounPhraseFor)(source)
                 }
             };
         }
         else {
             return {
                 valid: false,
-                error: removing_messages_1.RemovingMessages.NOT_IN_CONTAINER,
+                error: removing_messages_js_1.RemovingMessages.NOT_IN_CONTAINER,
                 params: {
-                    item: (0, utils_1.nounPhraseFor)(item),
-                    container: (0, utils_1.nounPhraseFor)(source)
+                    item: (0, index_js_2.nounPhraseFor)(item),
+                    container: (0, index_js_2.nounPhraseFor)(source)
                 }
             };
         }
@@ -103,8 +160,8 @@ function validateSingleEntity(context, item, source) {
         if (source.has(world_model_1.TraitType.OPENABLE) && !world_model_1.OpenableBehavior.isOpen(source)) {
             return {
                 valid: false,
-                error: removing_messages_1.RemovingMessages.CONTAINER_CLOSED,
-                params: { container: (0, utils_1.nounPhraseFor)(source) }
+                error: removing_messages_js_1.RemovingMessages.CONTAINER_CLOSED,
+                params: { container: (0, index_js_2.nounPhraseFor)(source) }
             };
         }
     }
@@ -112,37 +169,24 @@ function validateSingleEntity(context, item, source) {
     if (!world_model_1.ActorBehavior.canTakeItem(actor, item, context.world)) {
         return {
             valid: false,
-            error: removing_messages_1.RemovingMessages.CANNOT_TAKE,
-            params: { item: (0, utils_1.nounPhraseFor)(item) }
+            error: removing_messages_js_1.RemovingMessages.CANNOT_TAKE,
+            params: { item: (0, index_js_2.nounPhraseFor)(item) }
         };
     }
     return { valid: true };
 }
 /**
- * Validate a multi-object command (remove all from box, remove X and Y from box)
+ * Expand the multi-object item list for "remove all/X and Y from Z" —
+ * removing resolves its items from the SOURCE's contents, not from scope.
  */
-function validateMultiObject(context) {
-    const source = context.command.indirectObject?.entity;
-    // Must have a source
-    if (!source) {
-        return { valid: false, error: removing_messages_1.RemovingMessages.NO_SOURCE };
-    }
-    // Container must be open if it's openable
-    if (source.has(world_model_1.TraitType.CONTAINER) && source.has(world_model_1.TraitType.OPENABLE) && !world_model_1.OpenableBehavior.isOpen(source)) {
-        return {
-            valid: false,
-            error: removing_messages_1.RemovingMessages.CONTAINER_CLOSED,
-            params: { container: (0, utils_1.nounPhraseFor)(source) }
-        };
-    }
-    // Get items from source - for "remove all from X" we need contents of X
+function expandRemovableItems(context, source) {
     const directObject = context.command.parsed.structure.directObject;
     let items;
     if (directObject?.isAll) {
         // "remove all from X" - get all contents of source
         items = getSourceContents(context, source);
         // Apply exclusions from "all but X"
-        const excludedNames = (0, multi_object_handler_1.getExcludedNames)(context);
+        const excludedNames = (0, multi_object_handler_js_1.getExcludedNames)(context);
         if (excludedNames.length > 0) {
             items = items.filter(e => {
                 const name = e.name.toLowerCase();
@@ -165,34 +209,14 @@ function validateMultiObject(context) {
     else {
         items = [];
     }
-    if (items.length === 0) {
-        return { valid: false, error: removing_messages_1.RemovingMessages.NOTHING_TO_REMOVE };
-    }
-    // Validate each entity, store results
-    const results = items.map(item => {
-        const validation = validateSingleEntity(context, item, source);
-        return {
-            entity: item,
-            success: validation.valid,
-            error: validation.valid ? undefined : validation.error,
-            errorParams: validation.valid ? undefined : validation.params
-        };
-    });
-    // Store results for execute/report phases
-    const sharedData = (0, removing_types_1.getRemovingSharedData)(context);
-    sharedData.multiObjectResults = results;
-    // Valid if at least one can be removed
-    const anySuccess = results.some(r => r.success);
-    if (!anySuccess) {
-        // All failed - return the first error
-        return { valid: false, error: results[0].error, params: results[0].errorParams };
-    }
-    return { valid: true };
+    return items;
 }
 /**
- * Execute removing a single entity from source
+ * Execute removing a single entity from source. Mutation results are
+ * written into `scratch` — the single-object sharedData or the item's
+ * multi-object itemData (ADR-228 D4).
  */
-function executeSingleEntity(context, item, source, result) {
+function executeSingleEntity(context, item, source, scratch) {
     const actor = context.player;
     // First validate removal from source using appropriate behavior
     let removeResult = null;
@@ -202,10 +226,10 @@ function executeSingleEntity(context, item, source, result) {
     else if (source.has(world_model_1.TraitType.SUPPORTER)) {
         removeResult = world_model_1.SupporterBehavior.removeItem(source, item, context.world);
     }
-    result.removeResult = removeResult;
+    scratch.removeResult = removeResult;
     // Validate taking using ActorBehavior
     const takeResult = world_model_1.ActorBehavior.takeItem(actor, item, context.world);
-    result.takeResult = takeResult;
+    scratch.takeResult = takeResult;
     // Perform the actual move - this is the critical mutation!
     context.world.moveEntity(item.id, actor.id);
 }
@@ -214,20 +238,20 @@ function executeSingleEntity(context, item, source, result) {
  *
  * Uses simplified event pattern (ADR-097): domain event carries messageId directly.
  */
-function reportSingleSuccess(context, item, source, result, events) {
+function reportSingleSuccess(context, item, source, _scratch, events) {
     const actor = context.player;
     // Build message params — EntityInfo for the formatter chain (ADR-158)
     const params = {
-        item: (0, utils_1.nounPhraseFor)(item)
+        item: (0, index_js_2.nounPhraseFor)(item)
     };
     let messageKey;
     if (source.has(world_model_1.TraitType.CONTAINER)) {
-        params.container = (0, utils_1.nounPhraseFor)(source);
-        messageKey = removing_messages_1.RemovingMessages.REMOVED_FROM;
+        params.container = (0, index_js_2.nounPhraseFor)(source);
+        messageKey = removing_messages_js_1.RemovingMessages.REMOVED_FROM;
     }
     else {
-        params.surface = (0, utils_1.nounPhraseFor)(source);
-        messageKey = removing_messages_1.RemovingMessages.REMOVED_FROM_SURFACE;
+        params.surface = (0, index_js_2.nounPhraseFor)(source);
+        messageKey = removing_messages_js_1.RemovingMessages.REMOVED_FROM_SURFACE;
     }
     // Emit domain event with messageId (simplified pattern - ADR-097)
     // Using if.event.taken since removing is semantically a form of taking
@@ -243,9 +267,9 @@ function reportSingleSuccess(context, item, source, result, events) {
         container: source.name,
         fromContainer: source.has(world_model_1.TraitType.CONTAINER),
         fromSupporter: source.has(world_model_1.TraitType.SUPPORTER) && !source.has(world_model_1.TraitType.CONTAINER),
-        itemSnapshot: (0, snapshot_utils_1.captureEntitySnapshot)(item, context.world, true),
-        actorSnapshot: (0, snapshot_utils_1.captureEntitySnapshot)(actor, context.world, false),
-        sourceSnapshot: (0, snapshot_utils_1.captureEntitySnapshot)(source, context.world, source.has(world_model_1.TraitType.ROOM))
+        itemSnapshot: (0, snapshot_utils_js_1.captureEntitySnapshot)(item, context.world, true),
+        actorSnapshot: (0, snapshot_utils_js_1.captureEntitySnapshot)(actor, context.world, false),
+        sourceSnapshot: (0, snapshot_utils_js_1.captureEntitySnapshot)(source, context.world, source.has(world_model_1.TraitType.ROOM))
     }));
 }
 /**
@@ -253,28 +277,28 @@ function reportSingleSuccess(context, item, source, result, events) {
  *
  * Uses simplified event pattern (ADR-097): domain event carries messageId directly.
  */
-function reportSingleBlocked(context, item, source, error, errorParams, events) {
+function reportSingleBlocked(context, item, source, result, events) {
     events.push(context.event('if.event.remove_blocked', {
         // Rendering data — EntityInfo for the formatter chain (ADR-158)
-        messageId: `${context.action.id}.${error}`,
-        params: { ...errorParams, item: (0, utils_1.nounPhraseFor)(item), source: (0, utils_1.nounPhraseFor)(source) },
+        messageId: (0, index_js_3.blockedMessageId)(context, result),
+        params: { ...result.params, item: (0, index_js_2.nounPhraseFor)(item), source: (0, index_js_2.nounPhraseFor)(source) },
         // Domain data — strings for handlers
         itemId: item.id,
         itemName: item.name,
         sourceId: source.id,
         sourceName: source.name,
-        reason: error
+        reason: result.error
     }));
 }
 // ============================================================================
 // Action Definition
 // ============================================================================
 exports.removingAction = {
-    id: constants_1.IFActions.REMOVING,
+    id: constants_js_1.IFActions.REMOVING,
     // Default scope requirements for this action's slots
     defaultScope: {
-        item: scope_1.ScopeLevel.REACHABLE,
-        source: scope_1.ScopeLevel.REACHABLE
+        item: index_js_1.ScopeLevel.REACHABLE,
+        source: index_js_1.ScopeLevel.REACHABLE
     },
     requiredMessages: [
         'no_target',
@@ -292,21 +316,42 @@ exports.removingAction = {
     metadata: {
         requiresDirectObject: true,
         requiresIndirectObject: true,
-        directObjectScope: scope_1.ScopeLevel.REACHABLE
+        directObjectScope: index_js_1.ScopeLevel.REACHABLE
     },
     validate(context) {
-        // Check for multi-object command
-        if ((0, multi_object_handler_1.isMultiObjectCommand)(context)) {
-            return validateMultiObject(context);
+        const source = context.command.indirectObject?.entity;
+        // Check for multi-object command — full per-item lifecycle (ADR-228 D4)
+        if ((0, multi_object_handler_js_1.isMultiObjectCommand)(context)) {
+            // Must have a source
+            if (!source) {
+                return { valid: false, error: removing_messages_js_1.RemovingMessages.NO_SOURCE };
+            }
+            // Container must be open if it's openable
+            if (source.has(world_model_1.TraitType.CONTAINER) && source.has(world_model_1.TraitType.OPENABLE) && !world_model_1.OpenableBehavior.isOpen(source)) {
+                return {
+                    valid: false,
+                    error: removing_messages_js_1.RemovingMessages.CONTAINER_CLOSED,
+                    params: { container: (0, index_js_2.nounPhraseFor)(source) }
+                };
+            }
+            const items = expandRemovableItems(context, source);
+            if (items.length === 0) {
+                return { valid: false, error: removing_messages_js_1.RemovingMessages.NOTHING_TO_REMOVE };
+            }
+            const results = (0, index_js_3.runMultiObjectValidate)(context, exports.removingLifecycle, 'item', items, (ctx, item) => validateSingleEntity(ctx, item, source));
+            // Valid if at least one can be removed; all-fail returns the first error
+            if (!results.some(r => r.success)) {
+                return { valid: false, error: results[0].error, errorQualified: results[0].errorQualified, params: results[0].errorParams };
+            }
+            return { valid: true };
         }
         // Single object validation
         const item = context.command.directObject?.entity;
-        const source = context.command.indirectObject?.entity;
         // Validate we have an item
         if (!item) {
             return {
                 valid: false,
-                error: removing_messages_1.RemovingMessages.NO_TARGET,
+                error: removing_messages_js_1.RemovingMessages.NO_TARGET,
                 params: {}
             };
         }
@@ -314,63 +359,56 @@ exports.removingAction = {
         if (!source) {
             return {
                 valid: false,
-                error: removing_messages_1.RemovingMessages.NO_SOURCE,
-                params: { item: (0, utils_1.nounPhraseFor)(item) }
+                error: removing_messages_js_1.RemovingMessages.NO_SOURCE,
+                params: { item: (0, index_js_2.nounPhraseFor)(item) }
             };
         }
-        return validateSingleEntity(context, item, source);
+        const state = (0, index_js_3.resolveLifecycle)(context, exports.removingLifecycle);
+        const preVeto = (0, index_js_3.runPreValidate)(context, state);
+        if (preVeto)
+            return preVeto;
+        const standard = validateSingleEntity(context, item, source);
+        if (!standard.valid)
+            return standard;
+        // Canonical placement (ADR-228): postValidate runs after ALL standard validation
+        const postVeto = (0, index_js_3.runPostValidate)(context, state);
+        if (postVeto)
+            return postVeto;
+        return { valid: true };
     },
     execute(context) {
-        const sharedData = (0, removing_types_1.getRemovingSharedData)(context);
         const source = context.command.indirectObject.entity;
-        // Check for multi-object command
-        if (sharedData.multiObjectResults) {
-            // Execute for each successful validation
-            for (const result of sharedData.multiObjectResults) {
-                if (result.success) {
-                    executeSingleEntity(context, result.entity, source, result);
-                }
-            }
+        // Multi-object command: per-item execute + hooks (D4)
+        const multi = (0, index_js_3.getMultiObjectLifecycle)(context);
+        if (multi) {
+            (0, index_js_3.runMultiObjectExecute)(context, multi, (ctx, item, itemData) => {
+                executeSingleEntity(ctx, item, source, itemData);
+            });
             return;
         }
         // Single object execution
-        const actor = context.player;
+        const sharedData = (0, removing_types_js_1.getRemovingSharedData)(context);
         const item = context.command.directObject.entity;
-        // First validate removal from source using appropriate behavior
-        let removeResult = null;
-        if (source.has(world_model_1.TraitType.CONTAINER)) {
-            removeResult = world_model_1.ContainerBehavior.removeItem(source, item, context.world);
-        }
-        else if (source.has(world_model_1.TraitType.SUPPORTER)) {
-            removeResult = world_model_1.SupporterBehavior.removeItem(source, item, context.world);
-        }
-        // Store results for report phase using sharedData
-        sharedData.removeResult = removeResult;
-        // Validate taking using ActorBehavior
-        const takeResult = world_model_1.ActorBehavior.takeItem(actor, item, context.world);
-        sharedData.takeResult = takeResult;
-        // Perform the actual move - this is the critical mutation!
-        context.world.moveEntity(item.id, actor.id);
+        executeSingleEntity(context, item, source, sharedData);
+        const state = (0, index_js_3.getLifecycleState)(context);
+        if (state)
+            (0, index_js_3.runPostExecute)(context, state);
     },
     /**
      * Report events after successful removing
      * Only called on success path - validation passed
      */
     report(context) {
-        const sharedData = (0, removing_types_1.getRemovingSharedData)(context);
         const source = context.command.indirectObject.entity;
-        // Check for multi-object command
-        if (sharedData.multiObjectResults) {
+        // Multi-object command: per-item success/blocked events + hooks (D4)
+        const multi = (0, index_js_3.getMultiObjectLifecycle)(context);
+        if (multi) {
             const events = [];
-            // Generate events for each item (success and failure)
-            for (const result of sharedData.multiObjectResults) {
-                if (result.success) {
-                    reportSingleSuccess(context, result.entity, source, result, events);
-                }
-                else {
-                    reportSingleBlocked(context, result.entity, source, result.error, result.errorParams, events);
-                }
-            }
+            (0, index_js_3.runMultiObjectReport)(context, multi, events, 'if.event.taken', 'if.event.remove_blocked', (ctx, item, itemData, evts) => {
+                reportSingleSuccess(ctx, item, source, itemData, evts);
+            }, (ctx, item, itemResult, evts) => {
+                reportSingleBlocked(ctx, item, source, itemResult, evts);
+            });
             return events;
         }
         // Single object report
@@ -378,19 +416,19 @@ exports.removingAction = {
         const item = context.command.directObject.entity;
         // Build message params — EntityInfo for the formatter chain (ADR-158)
         const params = {
-            item: (0, utils_1.nounPhraseFor)(item)
+            item: (0, index_js_2.nounPhraseFor)(item)
         };
         let messageKey;
         if (source.has(world_model_1.TraitType.CONTAINER)) {
-            params.container = (0, utils_1.nounPhraseFor)(source);
-            messageKey = removing_messages_1.RemovingMessages.REMOVED_FROM;
+            params.container = (0, index_js_2.nounPhraseFor)(source);
+            messageKey = removing_messages_js_1.RemovingMessages.REMOVED_FROM;
         }
         else {
-            params.surface = (0, utils_1.nounPhraseFor)(source);
-            messageKey = removing_messages_1.RemovingMessages.REMOVED_FROM_SURFACE;
+            params.surface = (0, index_js_2.nounPhraseFor)(source);
+            messageKey = removing_messages_js_1.RemovingMessages.REMOVED_FROM_SURFACE;
         }
         // Emit domain event with messageId (simplified pattern - ADR-097)
-        return [
+        const events = [
             context.event('if.event.taken', {
                 // Rendering data (messageId + params for text-service)
                 messageId: `${context.action.id}.${messageKey}`,
@@ -403,11 +441,15 @@ exports.removingAction = {
                 container: source.name,
                 fromContainer: source.has(world_model_1.TraitType.CONTAINER),
                 fromSupporter: source.has(world_model_1.TraitType.SUPPORTER) && !source.has(world_model_1.TraitType.CONTAINER),
-                itemSnapshot: (0, snapshot_utils_1.captureEntitySnapshot)(item, context.world, true),
-                actorSnapshot: (0, snapshot_utils_1.captureEntitySnapshot)(actor, context.world, false),
-                sourceSnapshot: (0, snapshot_utils_1.captureEntitySnapshot)(source, context.world, source.has(world_model_1.TraitType.ROOM))
+                itemSnapshot: (0, snapshot_utils_js_1.captureEntitySnapshot)(item, context.world, true),
+                actorSnapshot: (0, snapshot_utils_js_1.captureEntitySnapshot)(actor, context.world, false),
+                sourceSnapshot: (0, snapshot_utils_js_1.captureEntitySnapshot)(source, context.world, source.has(world_model_1.TraitType.ROOM))
             })
         ];
+        const state = (0, index_js_3.getLifecycleState)(context);
+        if (state)
+            (0, index_js_3.runPostReport)(context, state, events, 'if.event.taken');
+        return events;
     },
     /**
      * Generate events when validation fails
@@ -417,13 +459,13 @@ exports.removingAction = {
     blocked(context, result) {
         const item = context.command.directObject?.entity;
         const source = context.command.indirectObject?.entity;
-        return [context.event('if.event.remove_blocked', {
+        const events = [context.event('if.event.remove_blocked', {
                 // Rendering data — EntityInfo for the formatter chain (ADR-158)
-                messageId: `${context.action.id}.${result.error}`,
+                messageId: (0, index_js_3.blockedMessageId)(context, result),
                 params: {
                     ...result.params,
-                    item: item ? (0, utils_1.nounPhraseFor)(item) : undefined,
-                    source: source ? (0, utils_1.nounPhraseFor)(source) : undefined
+                    item: item ? (0, index_js_2.nounPhraseFor)(item) : undefined,
+                    source: source ? (0, index_js_2.nounPhraseFor)(source) : undefined
                 },
                 // Domain data — strings for handlers
                 itemId: item?.id,
@@ -432,6 +474,23 @@ exports.removingAction = {
                 sourceName: source?.name,
                 reason: result.error
             })];
+        if (result.error) {
+            const state = (0, index_js_3.getLifecycleState)(context);
+            if (state) {
+                // Single-object path: notify all consultations (ADR-228 D2/D3)
+                (0, index_js_3.runOnBlocked)(context, state, events, 'if.event.remove_blocked', result.error);
+            }
+            else {
+                // Multi-object all-fail path: first failed item's consultations only
+                // (taking's pattern — the blocked event carries that item's error).
+                const multi = (0, index_js_3.getMultiObjectLifecycle)(context);
+                const first = multi?.[0];
+                if (first && !first.success) {
+                    (0, index_js_3.runOnBlocked)(context, first.state, events, 'if.event.remove_blocked', first.error ?? result.error);
+                }
+            }
+        }
+        return events;
     }
 };
 //# sourceMappingURL=removing.js.map