@towns-protocol/contracts 0.0.337 → 0.0.339

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.337",
+  "version": "0.0.339",
   "packageManager": "yarn@3.8.0",
   "scripts": {
     "build-types": "bash scripts/build-contract-types.sh",
@@ -34,7 +34,7 @@
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@openzeppelin/merkle-tree": "^1.0.8",
     "@prb/test": "^0.6.4",
-    "@towns-protocol/prettier-config": "^0.0.337",
+    "@towns-protocol/prettier-config": "^0.0.339",
     "@typechain/ethers-v5": "^10.1.1",
     "@wagmi/cli": "^2.2.0",
     "account-abstraction": "https://github.com/eth-infinitism/account-abstraction/archive/refs/tags/v0.7.0.tar.gz",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a8dae6ecef2c3bc7713acf56e6738fd47d608482"
+  "gitHead": "0ad93e42f93eba4356839b148fa166a818cd0f9d"
 }

package/scripts/deployments/diamonds/IDiamondInitHelper.sol

@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IDiamond} from "@towns-protocol/diamond/src/Diamond.sol";
+import {IDiamond, Diamond} from "@towns-protocol/diamond/src/Diamond.sol";
 
 interface IDiamondInitHelper is IDiamond {
     function diamondInitHelper(
         address deployer,
         string[] memory facetNames
     ) external returns (FacetCut[] memory);
+
+    function diamondInitParams(address deployer) external returns (Diamond.InitParams memory);
 }

package/scripts/deployments/facets/DeployAppAccount.s.sol

@@ -15,11 +15,12 @@ library DeployAppAccount {
     using DynamicArrayLib for DynamicArrayLib.DynamicArray;
 
     function selectors() internal pure returns (bytes4[] memory res) {
-        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(11);
+        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(12);
         arr.p(AppAccount.execute.selector);
         arr.p(AppAccount.onInstallApp.selector);
         arr.p(AppAccount.onUninstallApp.selector);
         arr.p(AppAccount.onRenewApp.selector);
+        arr.p(AppAccount.isAppExecuting.selector);
         arr.p(AppAccount.isAppEntitled.selector);
         arr.p(AppAccount.disableApp.selector);
         arr.p(AppAccount.getInstalledApps.selector);

package/scripts/deployments/facets/DeploySimpleApp.s.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.29;
 
-import {SimpleApp} from "src/apps/helpers/SimpleApp.sol";
+import {LibDeploy} from "@towns-protocol/diamond/src/utils/LibDeploy.sol";
 
 library DeploySimpleApp {
     function deploy() internal returns (address) {
-        return address(new SimpleApp());
+        return LibDeploy.deployCode("SimpleApp.sol", "");
     }
 }

package/scripts/deployments/facets/DeploySubscriptionModuleFacet.s.sol

@@ -15,7 +15,7 @@ library DeploySubscriptionModuleFacet {
     using DynamicArrayLib for DynamicArrayLib.DynamicArray;
 
     function selectors() internal pure returns (bytes4[] memory res) {
-        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(19);
+        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(20);
         arr.p(SubscriptionModuleFacet.moduleId.selector);
         arr.p(SubscriptionModuleFacet.onInstall.selector);
         arr.p(SubscriptionModuleFacet.onUninstall.selector);
@@ -30,6 +30,7 @@ library DeploySubscriptionModuleFacet {
         arr.p(SubscriptionModuleFacet.getSubscription.selector);
         arr.p(SubscriptionModuleFacet.pauseSubscription.selector);
         arr.p(SubscriptionModuleFacet.getEntityIds.selector);
+        arr.p(SubscriptionModuleFacet.isOperator.selector);
         arr.p(SubscriptionModuleFacet.grantOperator.selector);
         arr.p(SubscriptionModuleFacet.revokeOperator.selector);
         arr.p(bytes4(keccak256("MAX_BATCH_SIZE()")));

package/scripts/interactions/InteractBaseAlpha.s.sol

@@ -2,10 +2,8 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-import {IDiamondCut} from "@towns-protocol/diamond/src/facets/cut/IDiamondCut.sol";
 
 // libraries
-import {console} from "forge-std/console.sol";
 
 // contracts
 import {DeployBaseRegistry} from "scripts/deployments/diamonds/DeployBaseRegistry.s.sol";
@@ -34,141 +32,24 @@ contract InteractBaseAlpha is AlphaHelper {
         address riverAirdrop = getDeployment("riverAirdrop");
         address appRegistry = getDeployment("appRegistry");
 
-        deploySpaceCuts(deployer, space);
-        deploySpaceOwnerCuts(deployer, spaceOwner);
-        deploySpaceFactoryCuts(deployer, spaceFactory);
-        deployBaseRegistryCuts(deployer, baseRegistry);
-        deployRiverAirdropCuts(deployer, riverAirdrop);
-        deployAppRegistryCuts(deployer, appRegistry);
-
-        vm.resumeGasMetering();
-    }
-
-    function deploySpaceCuts(address deployer, address space) internal {
-        console.log("[INFO]: === Upgrading Space diamond ===");
-        deploySpace.diamondInitParams(deployer);
-        FacetCut[] memory proposedCuts = deploySpace.getCuts();
-        FacetCut[] memory smartCuts = generateSmartCuts(space, proposedCuts);
-
-        console.log(
-            "[INFO]: Generated %d smart cuts from %d proposed cuts",
-            smartCuts.length,
-            proposedCuts.length
-        );
-
-        if (smartCuts.length > 0) {
-            vm.broadcast(deployer);
-            IDiamondCut(space).diamondCut(smartCuts, address(0), "");
-            console.log("[INFO]: \u2705 Space diamond upgrade completed");
-        } else {
-            console.log("[INFO]: Space diamond already up to date - no cuts needed");
-        }
-    }
-
-    function deploySpaceOwnerCuts(address deployer, address spaceOwner) internal {
-        console.log("[INFO]: === Upgrading SpaceOwner diamond ===");
-        deploySpaceOwner.diamondInitParams(deployer);
-        FacetCut[] memory proposedCuts = deploySpaceOwner.getCuts();
-        FacetCut[] memory smartCuts = generateSmartCuts(spaceOwner, proposedCuts);
-
-        console.log(
-            "[INFO]: Generated %d smart cuts from %d proposed cuts",
-            smartCuts.length,
-            proposedCuts.length
-        );
-
-        if (smartCuts.length > 0) {
-            vm.broadcast(deployer);
-            IDiamondCut(spaceOwner).diamondCut(smartCuts, address(0), "");
-            console.log("[INFO]: \u2705 SpaceOwner diamond upgrade completed");
-        } else {
-            console.log("[INFO]: SpaceOwner diamond already up to date - no cuts needed");
-        }
-    }
-
-    function deploySpaceFactoryCuts(address deployer, address spaceFactory) internal {
-        console.log("[INFO]: === Upgrading SpaceFactory diamond ===");
-        deploySpaceFactory.diamondInitParams(deployer);
-        FacetCut[] memory proposedCuts = deploySpaceFactory.getCuts();
-        FacetCut[] memory smartCuts = generateSmartCuts(spaceFactory, proposedCuts);
-
-        console.log(
-            "[INFO]: Generated %d smart cuts from %d proposed cuts",
-            smartCuts.length,
-            proposedCuts.length
+        executeDiamondCutsWithLogging(deployer, space, "Space", deploySpace);
+        executeDiamondCutsWithLogging(deployer, spaceOwner, "SpaceOwner", deploySpaceOwner);
+
+        address spaceFactoryInit = deploySpaceFactory.spaceFactoryInit();
+        bytes memory initData = deploySpaceFactory.spaceFactoryInitData();
+        executeDiamondCutsWithLogging(
+            deployer,
+            spaceFactory,
+            "SpaceFactory",
+            deploySpaceFactory,
+            spaceFactoryInit,
+            initData
         );
 
-        if (smartCuts.length > 0) {
-            address spaceFactoryInit = deploySpaceFactory.spaceFactoryInit();
-            bytes memory initData = deploySpaceFactory.spaceFactoryInitData();
-            vm.broadcast(deployer);
-            IDiamondCut(spaceFactory).diamondCut(smartCuts, spaceFactoryInit, initData);
-            console.log("[INFO]: \u2705 SpaceFactory diamond upgrade completed");
-        } else {
-            console.log("[INFO]: SpaceFactory diamond already up to date - no cuts needed");
-        }
-    }
-
-    function deployBaseRegistryCuts(address deployer, address baseRegistry) internal {
-        console.log("[INFO]: === Upgrading BaseRegistry diamond ===");
-        deployBaseRegistry.diamondInitParams(deployer);
-        FacetCut[] memory proposedCuts = deployBaseRegistry.getCuts();
-        FacetCut[] memory smartCuts = generateSmartCuts(baseRegistry, proposedCuts);
-
-        console.log(
-            "[INFO]: Generated %d smart cuts from %d proposed cuts",
-            smartCuts.length,
-            proposedCuts.length
-        );
+        executeDiamondCutsWithLogging(deployer, baseRegistry, "BaseRegistry", deployBaseRegistry);
+        executeDiamondCutsWithLogging(deployer, riverAirdrop, "RiverAirdrop", deployRiverAirdrop);
+        executeDiamondCutsWithLogging(deployer, appRegistry, "AppRegistry", deployAppRegistry);
 
-        if (smartCuts.length > 0) {
-            vm.broadcast(deployer);
-            IDiamondCut(baseRegistry).diamondCut(smartCuts, address(0), "");
-            console.log("[INFO]: \u2705 BaseRegistry diamond upgrade completed");
-        } else {
-            console.log("[INFO]: BaseRegistry diamond already up to date - no cuts needed");
-        }
-    }
-
-    function deployRiverAirdropCuts(address deployer, address riverAirdrop) internal {
-        console.log("[INFO]: === Upgrading RiverAirdrop diamond ===");
-        deployRiverAirdrop.diamondInitParams(deployer);
-        FacetCut[] memory proposedCuts = deployRiverAirdrop.getCuts();
-        FacetCut[] memory smartCuts = generateSmartCuts(riverAirdrop, proposedCuts);
-
-        console.log(
-            "[INFO]: Generated %d smart cuts from %d proposed cuts",
-            smartCuts.length,
-            proposedCuts.length
-        );
-
-        if (smartCuts.length > 0) {
-            vm.broadcast(deployer);
-            IDiamondCut(riverAirdrop).diamondCut(smartCuts, address(0), "");
-            console.log("[INFO]: \u2705 RiverAirdrop diamond upgrade completed");
-        } else {
-            console.log("[INFO]: RiverAirdrop diamond already up to date - no cuts needed");
-        }
-    }
-
-    function deployAppRegistryCuts(address deployer, address appRegistry) internal {
-        console.log("[INFO]: === Upgrading AppRegistry diamond ===");
-        deployAppRegistry.diamondInitParams(deployer);
-        FacetCut[] memory proposedCuts = deployAppRegistry.getCuts();
-        FacetCut[] memory smartCuts = generateSmartCuts(appRegistry, proposedCuts);
-
-        console.log(
-            "[INFO]: Generated %d smart cuts from %d proposed cuts",
-            smartCuts.length,
-            proposedCuts.length
-        );
-
-        if (smartCuts.length > 0) {
-            vm.broadcast(deployer);
-            IDiamondCut(appRegistry).diamondCut(smartCuts, address(0), "");
-            console.log("[INFO]: \u2705 AppRegistry diamond upgrade completed");
-        } else {
-            console.log("[INFO]: AppRegistry diamond already up to date - no cuts needed");
-        }
+        vm.resumeGasMetering();
     }
 }

package/scripts/interactions/InteractRiverAlpha.s.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-import {IDiamondCut} from "@towns-protocol/diamond/src/facets/cut/IDiamondCut.sol";
 
 // libraries
 
@@ -15,16 +14,13 @@ contract InteractRiverAlpha is AlphaHelper {
     DeployRiverRegistry deployRiverRegistry = new DeployRiverRegistry();
 
     function __interact(address deployer) internal override {
-        vm.setEnv("OVERRIDE_DEPLOYMENTS", "1");
         address riverRegistry = getDeployment("riverRegistry");
 
-        removeRemoteFacets(deployer, riverRegistry);
-        FacetCut[] memory newCuts;
-
-        deployRiverRegistry.diamondInitParams(deployer);
-        newCuts = deployRiverRegistry.getCuts();
-
-        vm.broadcast(deployer);
-        IDiamondCut(riverRegistry).diamondCut(newCuts, address(0), "");
+        executeDiamondCutsWithLogging(
+            deployer,
+            riverRegistry,
+            "RiverRegistry",
+            deployRiverRegistry
+        );
     }
 }

package/scripts/interactions/helpers/AlphaHelper.sol

@@ -7,10 +7,12 @@ import {IDiamondCut} from "@towns-protocol/diamond/src/facets/cut/IDiamondCut.so
 import {IDiamondLoupe, IDiamondLoupeBase} from "@towns-protocol/diamond/src/facets/loupe/IDiamondLoupe.sol";
 import {IERC173} from "@towns-protocol/diamond/src/facets/ownable/IERC173.sol";
 import {IOwnablePending} from "@towns-protocol/diamond/src/facets/ownable/pending/IOwnablePending.sol";
+import {IDiamondInitHelper} from "scripts/deployments/diamonds/IDiamondInitHelper.sol";
 
 // libraries
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {DynamicArrayLib} from "solady/utils/DynamicArrayLib.sol";
+import {LibString} from "solady/utils/LibString.sol";
 
 // contracts
 import {DiamondHelper} from "@towns-protocol/diamond/scripts/common/helpers/DiamondHelper.s.sol";
@@ -37,6 +39,7 @@ abstract contract AlphaHelper is Interaction, DiamondHelper, IDiamondLoupeBase {
     using DynamicArrayLib for DynamicArrayLib.DynamicArray;
     using EnumerableSet for EnumerableSet.AddressSet;
     using EnumerableSet for EnumerableSet.Bytes32Set;
+    using LibString for *;
 
     struct DiamondInfo {
         DiamondCutStorage.Layout layout;
@@ -256,6 +259,68 @@ abstract contract AlphaHelper is Interaction, DiamondHelper, IDiamondLoupeBase {
         }
     }
 
+    /// @notice Execute diamond cuts with smart cut optimization and logging
+    /// @param deployer The address that will execute the diamond cut
+    /// @param diamond The diamond contract address
+    /// @param diamondName Name of the diamond for logging purposes
+    /// @param deployContract The deployment contract that provides cuts and initialization
+    /// @param initAddress Optional initialization contract address
+    /// @param initData Optional initialization data
+    function executeDiamondCutsWithLogging(
+        address deployer,
+        address diamond,
+        string memory diamondName,
+        IDiamondInitHelper deployContract,
+        address initAddress,
+        bytes memory initData
+    ) internal {
+        info(string.concat("=== Upgrading ", diamondName, " diamond ==="), "");
+
+        deployContract.diamondInitParams(deployer);
+        FacetCut[] memory proposedCuts = DiamondHelper(address(deployContract)).getCuts();
+        FacetCut[] memory smartCuts = generateSmartCuts(diamond, proposedCuts);
+
+        info(
+            string.concat(
+                "Generated ",
+                smartCuts.length.toString(),
+                " smart cuts from ",
+                proposedCuts.length.toString(),
+                " proposed cuts"
+            ),
+            ""
+        );
+
+        if (smartCuts.length > 0) {
+            vm.broadcast(deployer);
+            IDiamondCut(diamond).diamondCut(smartCuts, initAddress, initData);
+            info(string.concat(unicode"✅ ", diamondName, " diamond upgrade completed"), "");
+        } else {
+            info(string.concat(diamondName, " diamond already up to date - no cuts needed"), "");
+        }
+    }
+
+    /// @notice Execute diamond cuts with smart cut optimization and logging (no initialization)
+    /// @param deployer The address that will execute the diamond cut
+    /// @param diamond The diamond contract address
+    /// @param diamondName Name of the diamond for logging purposes
+    /// @param deployContract The deployment contract that provides cuts and initialization
+    function executeDiamondCutsWithLogging(
+        address deployer,
+        address diamond,
+        string memory diamondName,
+        IDiamondInitHelper deployContract
+    ) internal {
+        executeDiamondCutsWithLogging(
+            deployer,
+            diamond,
+            diamondName,
+            deployContract,
+            address(0),
+            ""
+        );
+    }
+
     function asBytes4Array(
         DynamicArrayLib.DynamicArray memory input
     ) internal pure returns (bytes4[] memory selectors) {

package/src/apps/modules/subscription/ISubscriptionModule.sol

@@ -38,6 +38,7 @@ interface ISubscriptionModuleBase {
     error SubscriptionModule__ExceedsMaxBatchSize();
     error SubscriptionModule__EmptyBatch();
     error SubscriptionModule__InvalidTokenOwner();
+    error SubscriptionModule__InsufficientBalance();
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           Events                           */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -68,6 +69,9 @@ interface ISubscriptionModuleBase {
     event SubscriptionPaused(address indexed account, uint32 indexed entityId);
 
     event BatchRenewalSkipped(address indexed account, uint32 indexed entityId, string reason);
+
+    event OperatorGranted(address indexed operator);
+    event OperatorRevoked(address indexed operator);
 }
 
 interface ISubscriptionModule is ISubscriptionModuleBase {
@@ -101,6 +105,10 @@ interface ISubscriptionModule is ISubscriptionModuleBase {
     /// @return The entity IDs for the account
     function getEntityIds(address account) external view returns (uint256[] memory);
 
+    /// @notice Checks if an operator has access to call processRenewal
+    /// @param operator The address of the operator to check
+    function isOperator(address operator) external view returns (bool);
+
     /// @notice Grants an operator access to call processRenewal
     /// @param operator The address of the operator to grant
     function grantOperator(address operator) external;

package/src/apps/modules/subscription/SubscriptionModuleFacet.sol

@@ -242,21 +242,31 @@ contract SubscriptionModuleFacet is
     function grantOperator(address operator) external onlyOwner {
         Validator.checkAddress(operator);
         SubscriptionModuleStorage.getLayout().operators.add(operator);
+        emit OperatorGranted(operator);
+    }
+
+    /// @inheritdoc ISubscriptionModule
+    function isOperator(address operator) external view returns (bool) {
+        return SubscriptionModuleStorage.getLayout().operators.contains(operator);
     }
 
     /// @inheritdoc ISubscriptionModule
     function revokeOperator(address operator) external onlyOwner {
         Validator.checkAddress(operator);
         SubscriptionModuleStorage.getLayout().operators.remove(operator);
+        emit OperatorRevoked(operator);
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           Internal                         */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
+    /// @dev Processes a single subscription renewal
+    /// @param sub The subscription to renew
+    /// @param params The parameters for the renewal
     function _processRenewal(Subscription storage sub, RenewalParams calldata params) internal {
-        // Validate subscription state
         if (!sub.active) SubscriptionModule__InactiveSubscription.selector.revertWith();
+
         if (block.timestamp < sub.nextRenewalTime)
             SubscriptionModule__RenewalNotDue.selector.revertWith();
 
@@ -272,10 +282,9 @@ contract SubscriptionModuleFacet is
         // Get current renewal price from Towns contract
         uint256 actualRenewalPrice = membershipFacet.getMembershipRenewalPrice(sub.tokenId);
 
-        // Update state BEFORE external calls to prevent reentrancy
-        // Set to a far future time to prevent re-entry while processing
-        // This ensures the "renewal not due" check will fail if re-entered
-        sub.nextRenewalTime = uint40(block.timestamp + 365 days);
+        // Check if the account has enough balance
+        if (params.account.balance < actualRenewalPrice)
+            SubscriptionModule__InsufficientBalance.selector.revertWith();
 
         // Construct the renewal call to space contract
         bytes memory renewalCall = abi.encodeCall(MembershipFacet.renewMembership, (sub.tokenId));
@@ -320,6 +329,10 @@ contract SubscriptionModuleFacet is
         emit SubscriptionRenewed(params.account, params.entityId, sub.nextRenewalTime);
     }
 
+    /// @dev Creates the runtime final data for the renewal
+    /// @param entityId The entity ID of the subscription
+    /// @param finalData The final data for the renewal
+    /// @return The runtime final data
     function _runtimeFinal(
         uint32 entityId,
         bytes memory finalData
@@ -332,6 +345,10 @@ contract SubscriptionModuleFacet is
             );
     }
 
+    /// @dev Checks if the caller is allowed to call the function
+    /// @param operators The set of operators
+    /// @param account The account to check
+    /// @return True if the caller is allowed to call the function
     function _isAllowed(
         EnumerableSetLib.AddressSet storage operators,
         address account

package/src/apps/modules/subscription/SubscriptionModuleStorage.sol

@@ -4,12 +4,12 @@ pragma solidity ^0.8.29;
 import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
 
 struct Subscription {
-    address space;
-    bool active;
-    uint40 lastRenewalTime;
-    uint40 nextRenewalTime;
-    uint256 spent;
-    uint256 tokenId;
+    uint256 tokenId; // 32 bytes
+    uint256 spent; // 32 bytes
+    address space; // 20 bytes
+    uint40 lastRenewalTime; // 5 bytes
+    uint40 nextRenewalTime; // 5 bytes
+    bool active; // 1 byte
 }
 
 library SubscriptionModuleStorage {

package/src/spaces/facets/account/AppAccount.sol

@@ -22,6 +22,7 @@ contract AppAccount is IAppAccount, AppAccountBase, ReentrancyGuard, Facet {
     /*                      Execution                             */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
+    /// @inheritdoc IAppAccount
     function execute(
         address target,
         uint256 value,
@@ -90,4 +91,9 @@ contract AppAccount is IAppAccount, AppAccountBase, ReentrancyGuard, Facet {
     ) external view returns (bool) {
         return _isAppEntitled(app, publicKey, permission);
     }
+
+    /// @inheritdoc IAppAccount
+    function isAppExecuting(address app) external view returns (bool) {
+        return _isAppExecuting(app);
+    }
 }

package/src/spaces/facets/account/AppAccountBase.sol

@@ -18,6 +18,7 @@ import {DependencyLib} from "../DependencyLib.sol";
 import {LibCall} from "solady/utils/LibCall.sol";
 import {AppAccountStorage} from "./AppAccountStorage.sol";
 import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
+import {ExecutorStorage} from "../executor/ExecutorStorage.sol";
 
 // contracts
 import {ExecutorBase} from "../executor/ExecutorBase.sol";
@@ -207,6 +208,20 @@ abstract contract AppAccountBase is
         return AppAccountStorage.getLayout().installedApps.values();
     }
 
+    function _isAppExecuting(address app) internal view returns (bool) {
+        bytes32 currentExecutionId = ExecutorStorage.getExecutionId();
+        if (currentExecutionId == bytes32(0)) return false;
+
+        bytes32 targetId = ExecutorStorage.getTargetExecutionId(app);
+        if (targetId == bytes32(0)) return false;
+        if (currentExecutionId != targetId) return false;
+
+        bytes32 appId = _getInstalledAppId(app);
+        if (appId == EMPTY_UID) return false;
+
+        return true;
+    }
+
     function _isAppInstalled(address module) internal view returns (bool) {
         return AppAccountStorage.getLayout().installedApps.contains(module);
     }

package/src/spaces/facets/account/IAppAccount.sol

@@ -72,4 +72,20 @@ interface IAppAccount is IAppAccountBase {
         address publicKey,
         bytes32 permission
     ) external view returns (bool);
+
+    /// @notice Checks if an app is executing
+    /// @param app The address of the app to check
+    /// @return True if the app is executing, false otherwise
+    function isAppExecuting(address app) external view returns (bool);
+
+    /// @notice Executes a function on the app
+    /// @param target The address of the app to execute the function on
+    /// @param value The value to send with the function
+    /// @param data The data to send with the function
+    /// @return The result of the function
+    function execute(
+        address target,
+        uint256 value,
+        bytes calldata data
+    ) external payable returns (bytes memory);
 }

package/src/spaces/facets/executor/ExecutorBase.sol

@@ -395,8 +395,9 @@ abstract contract ExecutorBase is IExecutorBase {
         _executePreHooks($, target, selector, value, data);
 
         // Set the executionId for the target and selector using transient storage
+        bytes32 executionIdBefore = ExecutorStorage.getExecutionId();
         bytes32 executionId = _hashExecutionId(target, selector);
-        ExecutorStorage.setTransientExecutionId(executionId);
+        ExecutorStorage.setExecutionId(executionId);
         ExecutorStorage.setTargetExecutionId(target, executionId);
 
         // Call the target
@@ -406,7 +407,8 @@ abstract contract ExecutorBase is IExecutorBase {
         _executePostHooks($, target, selector);
 
         // Clear transient storage to prevent composability issues
-        ExecutorStorage.clearTransientStorage(target);
+        ExecutorStorage.setExecutionId(executionIdBefore);
+        ExecutorStorage.clearTargetExecutionId(target);
     }
 
     /// @notice Gets the scheduled timepoint for an operation.
@@ -421,7 +423,7 @@ abstract contract ExecutorBase is IExecutorBase {
     /// @param target The target contract.
     /// @return True if currently executing.
     function _isTargetExecuting(address target) internal view returns (bool) {
-        bytes32 globalId = ExecutorStorage.getTransientExecutionId();
+        bytes32 globalId = ExecutorStorage.getExecutionId();
         bytes32 targetId = ExecutorStorage.getTargetExecutionId(target);
         return globalId != 0 && targetId == globalId;
     }
@@ -524,7 +526,7 @@ abstract contract ExecutorBase is IExecutorBase {
     /// @param selector The function selector.
     /// @return True if currently executing.
     function _isExecuting(address target, bytes4 selector) private view returns (bool) {
-        return ExecutorStorage.getTransientExecutionId() == _hashExecutionId(target, selector);
+        return ExecutorStorage.getExecutionId() == _hashExecutionId(target, selector);
     }
 
     /// @dev Computes a unique hash for the execution context.

package/src/spaces/facets/executor/ExecutorStorage.sol

@@ -66,13 +66,13 @@ library ExecutorStorage {
     /*                   Transient Execution Id                   */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    function getTransientExecutionId() internal view returns (bytes32 id) {
+    function getExecutionId() internal view returns (bytes32 id) {
         assembly {
             id := tload(TRANSIENT_STORAGE_SLOT)
         }
     }
 
-    function setTransientExecutionId(bytes32 id) internal {
+    function setExecutionId(bytes32 id) internal {
         assembly {
             tstore(TRANSIENT_STORAGE_SLOT, id)
         }
@@ -90,10 +90,16 @@ library ExecutorStorage {
         }
     }
 
-    function clearTransientStorage(address target) internal {
+    function clearExecutionId(address target) internal {
         assembly {
             tstore(TRANSIENT_STORAGE_SLOT, 0)
             tstore(target, 0)
         }
     }
+
+    function clearTargetExecutionId(address target) internal {
+        assembly {
+            tstore(target, 0)
+        }
+    }
 }