@adobe/aio-cli-plugin-app 14.0.1 → 14.1.1

package/README.md

@@ -74,7 +74,7 @@ DESCRIPTION
   Create, run, test, and deploy Adobe I/O Apps
 ```
 
-_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/index.js)_
+_See code: [src/commands/app/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/index.js)_
 
 ## `aio app add`
 
@@ -92,7 +92,7 @@ DESCRIPTION
   Add a new component to an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/add/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/add/index.js)_
+_See code: [src/commands/app/add/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/add/index.js)_
 
 ## `aio app add action`
 
@@ -117,7 +117,7 @@ ALIASES
   $ aio app add actions
 ```
 
-_See code: [src/commands/app/add/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/add/action.js)_
+_See code: [src/commands/app/add/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/add/action.js)_
 
 ## `aio app add ci`
 
@@ -135,7 +135,7 @@ DESCRIPTION
   Add CI files
 ```
 
-_See code: [src/commands/app/add/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/add/ci.js)_
+_See code: [src/commands/app/add/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/add/ci.js)_
 
 ## `aio app add event`
 
@@ -160,7 +160,7 @@ ALIASES
   $ aio app add events
 ```
 
-_See code: [src/commands/app/add/event.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/add/event.js)_
+_See code: [src/commands/app/add/event.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/add/event.js)_
 
 ## `aio app add extension`
 
@@ -186,7 +186,7 @@ ALIASES
   $ aio app add extensions
 ```
 
-_See code: [src/commands/app/add/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/add/extension.js)_
+_See code: [src/commands/app/add/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/add/extension.js)_
 
 ## `aio app add service`
 
@@ -210,7 +210,7 @@ ALIASES
   $ aio app add services
 ```
 
-_See code: [src/commands/app/add/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/add/service.js)_
+_See code: [src/commands/app/add/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/add/service.js)_
 
 ## `aio app add web-assets`
 
@@ -231,7 +231,7 @@ DESCRIPTION
   Add web assets support
 ```
 
-_See code: [src/commands/app/add/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/add/web-assets.js)_
+_See code: [src/commands/app/add/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/add/web-assets.js)_
 
 ## `aio app build`
 
@@ -261,7 +261,7 @@ DESCRIPTION
   Use the --force-build flag to force a build even if one already exists.
 ```
 
-_See code: [src/commands/app/build.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/build.js)_
+_See code: [src/commands/app/build.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/build.js)_
 
 ## `aio app clean`
 
@@ -286,7 +286,7 @@ DESCRIPTION
   Note that this will require a full rebuild on your next build command.
 ```
 
-_See code: [src/commands/app/clean.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/clean.js)_
+_See code: [src/commands/app/clean.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/clean.js)_
 
 ## `aio app create [PATH]`
 
@@ -308,7 +308,7 @@ DESCRIPTION
   Create a new Adobe I/O App with default parameters
 ```
 
-_See code: [src/commands/app/create.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/create.js)_
+_See code: [src/commands/app/create.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/create.js)_
 
 ## `aio app delete`
 
@@ -326,7 +326,7 @@ DESCRIPTION
   Delete a component from an existing Adobe I/O App
 ```
 
-_See code: [src/commands/app/delete/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/delete/index.js)_
+_See code: [src/commands/app/delete/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/delete/index.js)_
 
 ## `aio app delete action [ACTION-NAME]`
 
@@ -352,7 +352,7 @@ ALIASES
   $ aio app delete actions
 ```
 
-_See code: [src/commands/app/delete/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/delete/action.js)_
+_See code: [src/commands/app/delete/action.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/delete/action.js)_
 
 ## `aio app delete ci`
 
@@ -371,7 +371,7 @@ DESCRIPTION
   Delete existing CI files
 ```
 
-_See code: [src/commands/app/delete/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/delete/ci.js)_
+_See code: [src/commands/app/delete/ci.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/delete/ci.js)_
 
 ## `aio app delete extension`
 
@@ -397,7 +397,7 @@ ALIASES
   $ aio app delete extensions
 ```
 
-_See code: [src/commands/app/delete/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/delete/extension.js)_
+_See code: [src/commands/app/delete/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/delete/extension.js)_
 
 ## `aio app delete service`
 
@@ -421,7 +421,7 @@ ALIASES
   $ aio app delete services
 ```
 
-_See code: [src/commands/app/delete/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/delete/service.js)_
+_See code: [src/commands/app/delete/service.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/delete/service.js)_
 
 ## `aio app delete web-assets`
 
@@ -440,7 +440,7 @@ DESCRIPTION
   Delete existing web assets
 ```
 
-_See code: [src/commands/app/delete/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/delete/web-assets.js)_
+_See code: [src/commands/app/delete/web-assets.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/delete/web-assets.js)_
 
 ## `aio app deploy`
 
@@ -486,7 +486,7 @@ DESCRIPTION
   Use the --force-deploy flag to force deploy changes, regardless of production Workspace being published in Exchange.
 ```
 
-_See code: [src/commands/app/deploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/deploy.js)_
+_See code: [src/commands/app/deploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/deploy.js)_
 
 ## `aio app get-url [ACTION]`
 
@@ -508,7 +508,7 @@ DESCRIPTION
   Get action URLs
 ```
 
-_See code: [src/commands/app/get-url.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/get-url.js)_
+_See code: [src/commands/app/get-url.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/get-url.js)_
 
 ## `aio app info`
 
@@ -530,7 +530,7 @@ DESCRIPTION
   Display settings/configuration in use by an Adobe I/O App
 ```
 
-_See code: [src/commands/app/info.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/info.js)_
+_See code: [src/commands/app/info.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/info.js)_
 
 ## `aio app init [PATH]`
 
@@ -569,7 +569,7 @@ DESCRIPTION
   Create a new Adobe I/O App
 ```
 
-_See code: [src/commands/app/init.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/init.js)_
+_See code: [src/commands/app/init.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/init.js)_
 
 ## `aio app install PATH`
 
@@ -592,7 +592,7 @@ DESCRIPTION
   This command will support installing apps packaged by 'aio app pack'.
 ```
 
-_See code: [src/commands/app/install.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/install.js)_
+_See code: [src/commands/app/install.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/install.js)_
 
 ## `aio app list`
 
@@ -610,7 +610,7 @@ DESCRIPTION
   List components for Adobe I/O App
 ```
 
-_See code: [src/commands/app/list/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/list/index.js)_
+_See code: [src/commands/app/list/index.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/list/index.js)_
 
 ## `aio app list extension`
 
@@ -635,7 +635,7 @@ ALIASES
   $ aio app list extensions
 ```
 
-_See code: [src/commands/app/list/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/list/extension.js)_
+_See code: [src/commands/app/list/extension.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/list/extension.js)_
 
 ## `aio app logs`
 
@@ -659,7 +659,7 @@ DESCRIPTION
   Fetch logs for an Adobe I/O App
 ```
 
-_See code: [src/commands/app/logs.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/logs.js)_
+_See code: [src/commands/app/logs.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/logs.js)_
 
 ## `aio app pack [PATH]`
 
@@ -681,7 +681,7 @@ DESCRIPTION
   This command will support packaging apps for redistribution.
 ```
 
-_See code: [src/commands/app/pack.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/pack.js)_
+_See code: [src/commands/app/pack.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/pack.js)_
 
 ## `aio app run`
 
@@ -703,7 +703,7 @@ DESCRIPTION
   Run an Adobe I/O App
 ```
 
-_See code: [src/commands/app/run.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/run.js)_
+_See code: [src/commands/app/run.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/run.js)_
 
 ## `aio app test`
 
@@ -731,7 +731,7 @@ DESCRIPTION
   If the extension has a hook called 'test' in its 'ext.config.yaml', the script specified will be run instead.
 ```
 
-_See code: [src/commands/app/test.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/test.js)_
+_See code: [src/commands/app/test.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/test.js)_
 
 ## `aio app undeploy`
 
@@ -756,7 +756,7 @@ DESCRIPTION
   Undeploys an Adobe I/O App
 ```
 
-_See code: [src/commands/app/undeploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/undeploy.js)_
+_See code: [src/commands/app/undeploy.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/undeploy.js)_
 
 ## `aio app use [CONFIG_FILE_PATH]`
 
@@ -803,5 +803,5 @@ DESCRIPTION
   page in https://developer.adobe.com/console/
 ```
 
-_See code: [src/commands/app/use.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.0.1/src/commands/app/use.js)_
+_See code: [src/commands/app/use.js](https://github.com/adobe/aio-cli-plugin-app/blob/14.1.1/src/commands/app/use.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -2190,5 +2190,5 @@
       ]
     }
   },
-  "version": "14.0.1"
+  "version": "14.1.1"
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@adobe/aio-cli-plugin-app",
   "description": "Create, Build and Deploy Adobe I/O Applications",
-  "version": "14.0.1",
+  "version": "14.1.1",
   "author": "Adobe Inc.",
   "bugs": "https://github.com/adobe/aio-cli-plugin-app/issues",
   "dependencies": {
     "@adobe/aio-cli-lib-app-config": "^4.0.3",
-    "@adobe/aio-cli-lib-console": "^5",
+    "@adobe/aio-cli-lib-console": "^5.0.3",
     "@adobe/aio-lib-core-config": "^5",
     "@adobe/aio-lib-core-logging": "^3",
     "@adobe/aio-lib-core-networking": "^5",
     "@adobe/aio-lib-env": "^3",
     "@adobe/aio-lib-ims": "^7",
-    "@adobe/aio-lib-runtime": "^7.1.0",
+    "@adobe/aio-lib-runtime": "^7.1.2",
     "@adobe/aio-lib-templates": "^3",
     "@adobe/aio-lib-web": "^7",
     "@adobe/generator-aio-app": "^9",

package/src/BaseCommand.js

@@ -21,7 +21,7 @@ const STAGE_LAUNCH_PREFIX = 'https://experience-stage.adobe.com/?devMode=true#/c
 const appConfig = require('@adobe/aio-cli-lib-app-config')
 const inquirer = require('inquirer')
 const { CONSOLE_API_KEYS, APPLICATION_CONFIG_KEY, EXTENSIONS_CONFIG_KEY } = require('./lib/defaults')
-const { getCliInfo } = require('./lib/app-helper')
+const { getAccessToken } = require('./lib/auth-helper')
 const LibConsoleCLI = require('@adobe/aio-cli-lib-console')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app', { provider: 'debug' })
 
@@ -54,7 +54,7 @@ class BaseCommand extends Command {
   async getLibConsoleCLI () {
     if (!this.consoleCLI) {
       // requires valid login
-      const { accessToken, env } = await getCliInfo()
+      const { accessToken, env } = await getAccessToken()
       // init console CLI sdk consoleCLI
       this.consoleCLI = await LibConsoleCLI.init({ accessToken, env, apiKey: CONSOLE_API_KEYS[env] })
     }

package/src/commands/app/build.js

@@ -102,6 +102,8 @@ class Build extends BaseCommand {
     if (flags['web-assets']) {
       if (config.app.hasFrontend && (flags['force-build'] || !fs.existsSync(config.web.distProd))) {
         if (config.app.hasBackend) {
+          // note: 3rd arg, _isLocalDev is not used in RuntimeLib
+          // there is no such thing as --local anymore
           const urls = RuntimeLib.utils.getActionUrls(config, false, false, true)
           await writeConfig(config.web.injectedConfig, urls)
         }

package/src/commands/app/config/get/log-forwarding/errors.js

@@ -12,6 +12,7 @@ governing permissions and limitations under the License.
 const BaseCommand = require('../../../../../BaseCommand')
 const rtLib = require('@adobe/aio-lib-runtime')
 const ora = require('ora')
+const { setRuntimeApiHostAndAuthHandler } = require('../../../../../lib/auth-helper')
 
 class ErrorsCommand extends BaseCommand {
   async run () {
@@ -30,7 +31,10 @@ class ErrorsCommand extends BaseCommand {
   }
 
   async getLogForwarding () {
-    const runtimeConfig = (await this.getFullConfig()).aio.runtime
+    let aioConfig = (await this.getFullConfig()).aio
+    aioConfig = setRuntimeApiHostAndAuthHandler(aioConfig)
+
+    const runtimeConfig = aioConfig.runtime
     rtLib.utils.checkOpenWhiskCredentials({ ow: runtimeConfig })
     const rt = await rtLib.init({
       ...runtimeConfig,

package/src/commands/app/config/get/log-forwarding.js

@@ -11,10 +11,13 @@ governing permissions and limitations under the License.
 
 const BaseCommand = require('../../../../BaseCommand')
 const LogForwarding = require('../../../../lib/log-forwarding')
+const { setRuntimeApiHostAndAuthHandler } = require('../../../../lib/auth-helper')
 
 class LogForwardingCommand extends BaseCommand {
   async run () {
-    const lf = await LogForwarding.init((await this.getFullConfig()).aio)
+    let aioConfig = (await this.getFullConfig()).aio
+    aioConfig = setRuntimeApiHostAndAuthHandler(aioConfig)
+    const lf = await LogForwarding.init(aioConfig)
 
     const localConfig = lf.getLocalConfig()
     const serverConfig = await lf.getServerConfig()

package/src/commands/app/config/set/log-forwarding.js

@@ -17,10 +17,7 @@ const { setRuntimeApiHostAndAuthHandler } = require('../../../../lib/auth-helper
 class LogForwardingCommand extends BaseCommand {
   async run () {
     let aioConfig = (await this.getFullConfig()).aio
-    // TODO: remove this check once the deploy service is enabled by default
-    if (process.env.IS_DEPLOY_SERVICE_ENABLED === 'true') {
-      aioConfig = setRuntimeApiHostAndAuthHandler(aioConfig)
-    }
+    aioConfig = setRuntimeApiHostAndAuthHandler(aioConfig)
     const lf = await LogForwarding.init(aioConfig)
 
     const destination = await this.promptDestination(lf.getSupportedDestinations())

package/src/commands/app/deploy.js

@@ -18,11 +18,15 @@ const BaseCommand = require('../../BaseCommand')
 const BuildCommand = require('./build')
 const webLib = require('@adobe/aio-lib-web')
 const { Flags } = require('@oclif/core')
-const { runInProcess, buildExtensionPointPayloadWoMetadata, buildExcShellViewExtensionMetadata, getCliInfo } = require('../../lib/app-helper')
+const {
+  rewriteActionUrlInEntities, runInProcess,
+  buildExtensionPointPayloadWoMetadata, buildExcShellViewExtensionMetadata,
+  getFilesCountWithExtension
+} = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
 const LogForwarding = require('../../lib/log-forwarding')
-const { sendAuditLogs, getAuditLogEvent, getFilesCountWithExtension } = require('../../lib/audit-logger')
-const { setRuntimeApiHostAndAuthHandler } = require('../../lib/auth-helper')
+const { sendAppAssetsDeployedAuditLog, sendAppDeployAuditLog } = require('../../lib/audit-logger')
+const { setRuntimeApiHostAndAuthHandler, getAccessToken } = require('../../lib/auth-helper')
 const logActions = require('../../lib/log-actions')
 
 const PRE_DEPLOY_EVENT_REG = 'pre-deploy-event-reg'
@@ -53,15 +57,40 @@ class Deploy extends BuildCommand {
     const spinner = ora()
 
     try {
-      const aioConfig = (await this.getFullConfig()).aio
-      const cliDetails = await getCliInfo(flags.publish)
+      const { aio: aioConfig, packagejson: packageJson } = await this.getFullConfig()
+      const cliDetails = await getAccessToken({ useCachedToken: flags.publish })
+      const appInfo = {
+        name: packageJson.name,
+        version: packageJson.version,
+        project: aioConfig?.project,
+        runtimeNamespace: aioConfig?.runtime?.namespace
+      }
+
+      if (cliDetails?.accessToken) {
+        try {
+          // send audit log at start (don't wait for deployment to finish)
+          await sendAppDeployAuditLog({
+            accessToken: cliDetails?.accessToken,
+            cliCommandFlags: flags,
+            appInfo,
+            env: cliDetails.env
+          })
+        } catch (error) {
+          if (flags.verbose) {
+            this.warn('Error: Audit Log Service Error: Failed to send audit log event for deployment.')
+            this.warn(error.message)
+          }
+        }
+      }
 
       // 1. update log forwarding configuration
       // note: it is possible that .aio file does not exist, which means there is no local lg config
       if (aioConfig?.project?.workspace && flags['log-forwarding-update'] && flags.actions) {
         spinner.start('Updating log forwarding configuration')
         try {
-          const lf = await LogForwarding.init(aioConfig)
+          const lfConfig = setRuntimeApiHostAndAuthHandler(aioConfig)
+
+          const lf = await LogForwarding.init(lfConfig)
           if (lf.isLocalConfigChanged()) {
             const lfConfig = lf.getLocalConfigWithSecrets()
             if (lfConfig.isDefined()) {
@@ -103,20 +132,22 @@ class Deploy extends BuildCommand {
         const k = keys[i]
         const v = setRuntimeApiHostAndAuthHandler(values[i])
 
-        await this.deploySingleConfig(k, v, flags, spinner)
-        if (v.app.hasFrontend && flags['web-assets']) {
+        await this.deploySingleConfig({ name: k, config: v, originalConfig: values[i], flags, spinner })
+        if (cliDetails?.accessToken && v.app.hasFrontend && flags['web-assets']) {
           const opItems = getFilesCountWithExtension(v.web.distProd)
-          const assetDeployedLogEvent = getAuditLogEvent(flags, aioConfig.project, 'AB_APP_ASSETS_DEPLOYED')
-          if (assetDeployedLogEvent && cliDetails?.accessToken) {
-            assetDeployedLogEvent.data.opItems = opItems
-            try {
-              // only send logs in case of web-assets deployment
-              await sendAuditLogs(cliDetails.accessToken, assetDeployedLogEvent, cliDetails.env)
-            } catch (error) {
-              if (flags.verbose) {
-                this.warn('Error: Audit Log Service Error: Failed to send audit log event for deployment.')
-                this.warn(error.message)
-              }
+          try {
+            // only send logs in case of web-assets deployment
+            await sendAppAssetsDeployedAuditLog({
+              accessToken: cliDetails?.accessToken,
+              cliCommandFlags: flags,
+              opItems,
+              appInfo,
+              env: cliDetails.env
+            })
+          } catch (error) {
+            if (flags.verbose) {
+              this.warn('Error: Audit Log Service Error: Failed to send audit log event for deployment.')
+              this.warn(error.message)
             }
           }
         }
@@ -140,7 +171,7 @@ class Deploy extends BuildCommand {
     this.log(chalk.green(chalk.bold('Successful deployment 🏄')))
   }
 
-  async deploySingleConfig (name, config, flags, spinner) {
+  async deploySingleConfig ({ name, config, originalConfig, flags, spinner }) {
     const onProgress = !flags.verbose
       ? info => {
         spinner.text = info
@@ -240,7 +271,8 @@ class Deploy extends BuildCommand {
 
     // log deployed resources
     if (deployedRuntimeEntities.actions && deployedRuntimeEntities.actions.length > 0) {
-      await logActions({ entities: deployedRuntimeEntities, log: (...rest) => this.log(chalk.bold(chalk.blue(...rest))) })
+      const entities = await rewriteActionUrlInEntities({ entities: deployedRuntimeEntities, config: originalConfig })
+      await logActions({ entities, log: (...rest) => this.log(chalk.bold(chalk.blue(...rest))) })
     }
 
     // TODO urls should depend on extension point, exc shell only for exc shell extension point - use a post-app-deploy hook ?

package/src/commands/app/pack.js

@@ -177,7 +177,7 @@ class Pack extends BaseCommand {
         this.spinner.succeed('Got api-mesh config')
       } catch (err) {
         // Ignore error if no mesh found, otherwise throw
-        if (err?.message.includes('Error: Unable to get mesh config. No mesh found for Org')) {
+        if (err?.message.includes('Error: Unable to get mesh config.')) {
           aioLogger.debug('No api-mesh config found')
         } else {
           console.error(err)

package/src/commands/app/undeploy.js

@@ -17,10 +17,10 @@ const { Flags } = require('@oclif/core')
 
 const BaseCommand = require('../../BaseCommand')
 const webLib = require('@adobe/aio-lib-web')
-const { runInProcess, buildExtensionPointPayloadWoMetadata, getCliInfo } = require('../../lib/app-helper')
+const { runInProcess, buildExtensionPointPayloadWoMetadata } = require('../../lib/app-helper')
 const rtLib = require('@adobe/aio-lib-runtime')
-const { sendAuditLogs, getAuditLogEvent } = require('../../lib/audit-logger')
-const { setRuntimeApiHostAndAuthHandler } = require('../../lib/auth-helper')
+const { sendAppAssetsUndeployedAuditLog, sendAppUndeployAuditLog } = require('../../lib/audit-logger')
+const { setRuntimeApiHostAndAuthHandler, getAccessToken } = require('../../lib/auth-helper')
 
 class Undeploy extends BaseCommand {
   async run () {
@@ -51,20 +51,47 @@ class Undeploy extends BaseCommand {
 
     const spinner = ora()
     try {
-      const aioConfig = (await this.getFullConfig()).aio
-      const cliDetails = await getCliInfo(flags.unpublish)
+      const { aio: aioConfig, packagejson: packageJson } = await this.getFullConfig()
+      const cliDetails = await getAccessToken({ useCachedToken: flags.unpublish })
+      const appInfo = {
+        name: packageJson.name,
+        version: packageJson.version,
+        project: aioConfig?.project,
+        runtimeNamespace: aioConfig?.runtime?.namespace
+      }
+
+      if (cliDetails?.accessToken) {
+        try {
+          // send audit log at start (don't wait for deployment to finish)
+          await sendAppUndeployAuditLog({
+            accessToken: cliDetails?.accessToken,
+            cliCommandFlags: flags,
+            appInfo,
+            env: cliDetails.env
+          })
+        } catch (error) {
+          if (flags.verbose) {
+            this.warn('Error: Audit Log Service Error: Failed to send audit log event for deployment.')
+            this.warn(error.message)
+          }
+        }
+      }
 
       for (let i = 0; i < keys.length; ++i) {
         const k = keys[i]
         // TODO: remove this check once the deploy service is enabled by default
-        const v = process.env.IS_DEPLOY_SERVICE_ENABLED === 'true' ? setRuntimeApiHostAndAuthHandler(values[i]) : values[i]
+        const v = setRuntimeApiHostAndAuthHandler(values[i])
 
         await this.undeployOneExt(k, v, flags, spinner)
-        const assetUndeployLogEvent = getAuditLogEvent(flags, aioConfig.project, 'AB_APP_ASSETS_UNDEPLOYED')
-        // send logs for case of web-assets undeployment
-        if (assetUndeployLogEvent && cliDetails?.accessToken) {
+        if (cliDetails?.accessToken) {
+          // send logs for case of web-assets undeployment
           try {
-            await sendAuditLogs(cliDetails.accessToken, assetUndeployLogEvent, cliDetails.env)
+            await sendAppAssetsUndeployedAuditLog({
+              accessToken: cliDetails?.accessToken,
+              cliCommandFlags: flags,
+              appInfo,
+              env: cliDetails.env
+            })
           } catch (error) {
             this.warn('Warning: Audit Log Service Error: Failed to send audit log event for un-deployment.')
           }
@@ -83,8 +110,15 @@ class Undeploy extends BaseCommand {
       // delegate to top handler
       throw error
     }
+
+    const command = await this.config.findCommand('app:clean')
+    if (command) {
+      this.log('running app:clean command')
+      await this.config.runCommand('app:clean')
+    }
+
     // final message
-    this.log(chalk.green(chalk.bold('Undeploy done !')))
+    this.log(chalk.green(chalk.bold('Undeploy done!')))
   }
 
   async undeployOneExt (extName, config, flags, spinner) {

package/src/lib/app-helper.js

@@ -11,16 +11,13 @@ governing permissions and limitations under the License.
 
 const execa = require('execa')
 const fs = require('fs-extra')
-const path = require('path')
+const path = require('node:path')
 const which = require('which')
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:lib-app-helper', { provider: 'debug' })
-const { getToken, context } = require('@adobe/aio-lib-ims')
-const { CLI } = require('@adobe/aio-lib-ims/src/context')
 const chalk = require('chalk')
 const aioConfig = require('@adobe/aio-lib-core-config')
 const { AIO_CONFIG_WORKSPACE_SERVICES, AIO_CONFIG_ORG_SERVICES } = require('./defaults')
 const { EOL } = require('os')
-const { getCliEnv } = require('@adobe/aio-lib-env')
 const yaml = require('js-yaml')
 const RuntimeLib = require('@adobe/aio-lib-runtime')
 
@@ -179,33 +176,6 @@ function wrapError (err) {
   return new Error(message)
 }
 
-/**
- * getCliInfo
- *
- * @private
- *
- * @param {boolean} useForce - if true, user will be forced to login if not already logged in
- * @returns {Promise<{accessToken: string, env: string}>} accessToken and env
-*/
-async function getCliInfo (useForce = true) {
-  const env = getCliEnv()
-  let accessToken
-  await context.setCli({ 'cli.bare-output': true }, false) // set this globally
-  if (useForce) {
-    aioLogger.debug('Retrieving CLI Token using force=true')
-    accessToken = await getToken(CLI)
-  } else {
-    aioLogger.debug('Retrieving CLI Token using force=false')
-    // in this case, the user might be logged in, but we don't want to force them
-    // we just check the config for the token ( we still use the cli context so we don't need to know
-    // the inner workings of ims-lib and where it stores access tokens)
-    // todo: this is a workaround, we should have a better way to check if the user is logged in (in ims-lib)
-    const contextConfig = await context.getCli()
-    accessToken = contextConfig?.access_token?.token
-  }
-  return { accessToken, env }
-}
-
 /**
  * Joins url path parts
  *
@@ -391,6 +361,8 @@ function buildExtensionPointPayloadWoMetadata (extConfigs) {
       endpointsPayload[extPointName] = {}
       let actionUrls = {}
       if (extPointConfig.app.hasBackend) {
+        // note: 3rd arg, _isLocalDev is not used in RuntimeLib
+        // there is no such thing as --local anymore
         actionUrls = RuntimeLib.utils.getActionUrls(extPointConfig, false, false)
       }
       Object.entries(extPointConfig.operations)
@@ -473,7 +445,110 @@ function getObjectValue (obj, key) {
   return keys.filter(o => o.trim()).reduce((o, i) => o && getObjectProp(o, i), obj)
 }
 
+/**
+ * Counts files by extension in a directory
+ *
+ * @param {string} directory Path to assets directory
+ * @returns {Array<string>} Array of formatted log messages
+ */
+function getFilesCountWithExtension (directory) {
+  const log = []
+
+  if (!fs.existsSync(directory)) {
+    throw new Error(`Error: Directory ${directory} does not exist.`)
+  }
+
+  const files = fs.readdirSync(directory, { recursive: true })
+  if (files.length === 0) {
+    throw new Error(`Error: No files found in directory ${directory}.`)
+  }
+
+  const fileTypeCounts = {}
+  files.forEach(file => {
+    const ext = path.extname(file).toLowerCase() || 'no extension'
+    if (fileTypeCounts[ext]) {
+      fileTypeCounts[ext]++
+    } else {
+      fileTypeCounts[ext] = 1
+    }
+  })
+
+  Object.keys(fileTypeCounts).forEach(ext => {
+    const count = fileTypeCounts[ext]
+    let description
+    switch (ext) {
+      case '.js':
+        description = 'Javascript file(s)'
+        break
+      case '.css':
+        description = 'CSS file(s)'
+        break
+      case '.html':
+        description = 'HTML page(s)'
+        break
+      case '.png':
+      case '.jpg':
+      case '.jpeg':
+      case '.gif':
+      case '.svg':
+      case '.webp':
+        description = `${ext} image(s)`
+        break
+      case 'no extension':
+        description = 'file(s) without extension'
+        break
+      default:
+        description = `${ext} file(s)`
+    }
+    log.push(`${count} ${description}\n`)
+  })
+
+  return log
+}
+
+/**
+ * Rewrites action URLs in deployed runtime entities using URLs from the manifest configuration.
+ *
+ * This function takes deployed runtime entities and updates the URL property of each action
+ * with the corresponding URL from the runtime manifest configuration. It creates a deep copy
+ * of the entities to avoid mutating the original object.
+ *
+ * @param {object} params - Parameters object
+ * @param {object} params.entities - The deployed runtime entities object
+ * @param {object} params.config - The application configuration object containing runtime manifest
+ * @returns {Promise<object>} A promise that resolves to a deep copy of the entities object with updated action URLs
+ * @example
+ * const entities = {
+ *   actions: [
+ *     { name: 'my-action', url: 'old-url' },
+ *     { name: 'another-action', url: 'another-old-url' }
+ *   ]
+ * }
+ * const config = {
+ *   actions: { devRemote: false },
+ *   // ... other config properties
+ * }
+ *
+ * const rewrittenEntities = await rewriteActionUrlInEntities({ entities, config })
+ * // rewrittenEntities.actions will have updated URLs from the manifest
+ */
+async function rewriteActionUrlInEntities ({ entities, config }) {
+  const actionUrlsFromManifest = RuntimeLib.utils.getActionUrls(config, config.actions.devRemote)
+  const rewrittenEntities = structuredClone(entities)
+
+  rewrittenEntities.actions = rewrittenEntities.actions?.map(action => {
+    const retAction = structuredClone(action)
+    const url = actionUrlsFromManifest[action.name]
+    if (url) {
+      retAction.url = url
+    }
+    return retAction
+  })
+  return rewrittenEntities
+}
+
 module.exports = {
+  rewriteActionUrlInEntities,
   getObjectValue,
   getObjectProp,
   createWebExportFilter,
@@ -484,7 +559,6 @@ module.exports = {
   runInProcess,
   runPackageScript,
   wrapError,
-  getCliInfo,
   removeProtocolFromURL,
   urlJoin,
   checkFile,
@@ -496,5 +570,6 @@ module.exports = {
   buildExtensionPointPayloadWoMetadata,
   buildExcShellViewExtensionMetadata,
   atLeastOne,
-  deleteUserConfig
+  deleteUserConfig,
+  getFilesCountWithExtension
 }

package/src/lib/audit-logger.js

@@ -8,38 +8,74 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-const fs = require('fs')
-const path = require('path')
-const chalk = require('chalk')
 
 const OPERATIONS = {
   AB_APP_DEPLOY: 'ab_app_deploy',
   AB_APP_UNDEPLOY: 'ab_app_undeploy',
-  AB_APP_TEST: 'ab_app_test',
   AB_APP_ASSETS_DEPLOYED: 'ab_app_assets_deployed',
   AB_APP_ASSETS_UNDEPLOYED: 'ab_app_assets_undeployed'
 }
 
+const AUDIT_SERVICE_ENDPOINT_ROUTE = '/audit-log-api/event-post'
 const AUDIT_SERVICE_ENDPOINTS = {
-  stage: 'https://adp-auditlog-service-stage.adobeioruntime.net/api/v1/web/audit-log-api/event-post',
-  prod: 'https://adp-auditlog-service-prod.adobeioruntime.net/api/v1/web/audit-log-api/event-post'
+  stage: 'https://deploy-service.stg.app-builder.corp.adp.adobe.io',
+  prod: 'https://deploy-service.app-builder.adp.adobe.io'
 }
 
 /**
- * Send audit log events to audit service
- * @param {string} accessToken valid access token
- * @param {object} logEvent logEvent details
- * @param {string} env valid env stage|prod
+ * @typedef {object} AppInfo
+ * @property {string} name - Application name
+ * @property {string} version - Application version
+ * @property {object} project - Project details containing org and workspace information
+ * @property {object} namespace - the runtime namespace
  */
-async function sendAuditLogs (accessToken, logEvent, env = 'prod') {
-  const url = AUDIT_SERVICE_ENDPOINTS[env] ?? AUDIT_SERVICE_ENDPOINTS.prod
+
+/**
+ * @typedef {object} AuditLogParams
+ * @property {string} accessToken - Valid access token for authentication
+ * @property {object} cliCommandFlags - CLI command flags and options
+ * @property {AppInfo} appInfo - Application information including project details, name, and version
+ * @property {Array} [opItems] - List of deployed files (only for assets deployment)
+ * @property {string} [env='prod'] - Environment to use: 'stage' or 'prod'
+ */
+
+/**
+ * @typedef {object} PublishAuditLogParams
+ * @property {string} accessToken - Valid access token for authentication
+ * @property {object} logEvent - Audit log event details to be published
+ * @property {string} [env='prod'] - Environment to use: 'stage' or 'prod'
+ */
+
+/**
+ * @typedef {object} GetAuditLogEventParams
+ * @property {object} cliCommandFlags - CLI command flags and options
+ * @property {AppInfo} appInfo - Application information containing project details, name, version, and optional runtime namespace
+ * @property {string} operation - Operation type: 'ab_app_deploy', 'ab_app_undeploy', 'ab_app_assets_deployed', or 'ab_app_assets_undeployed'
+ */
+
+/**
+ * Publish audit log events to audit service
+ *
+ * @param {PublishAuditLogParams} params - Parameters object containing access token, log event, and environment
+ * @returns {Promise<void>} Promise that resolves when the audit log is sent successfully
+ * @throws {Error} If the audit log request fails
+ */
+async function publishAuditLogs ({ accessToken, logEvent, env = 'prod' }) {
+  let url = AUDIT_SERVICE_ENDPOINTS[env] ?? AUDIT_SERVICE_ENDPOINTS.prod
+  if (process.env.AIO_DEPLOY_SERVICE_URL) {
+    url = process.env.AIO_DEPLOY_SERVICE_URL
+  }
+
+  // add the route to the endpoint
+  url += AUDIT_SERVICE_ENDPOINT_ROUTE
+
   const payload = {
     event: logEvent
   }
   const options = {
     method: 'POST',
     headers: {
-      Authorization: 'Bearer ' + accessToken,
+      Authorization: `Bearer ${accessToken}`,
       'Content-type': 'application/json'
     },
     body: JSON.stringify(payload)
@@ -47,111 +83,112 @@ async function sendAuditLogs (accessToken, logEvent, env = 'prod') {
   const response = await fetch(url, options)
   if (response.status !== 200) {
     const err = await response.text()
-    throw new Error('Failed to send audit log - ' + response.status + ' ' + err)
+    throw new Error(`Failed to send audit log - ${response.status} ${err}`)
   }
 }
 
 /**
+ * Creates an audit log event object
  *
- * @param {object} flags cli flags
- * @param {object} project details
- * @param {string} event log name
- * @returns {object} logEvent
+ * @param {GetAuditLogEventParams} params - Parameters object containing CLI flags, operation type, and app info
+ * @returns {object} Log event object containing audit log details
+ * @throws {Error} If project is missing, or if operation is invalid
  */
-function getAuditLogEvent (flags, project, event) {
-  let logEvent, logStrMsg
-  if (project && project.org && project.workspace) {
-    if (event === 'AB_APP_DEPLOY') {
-      logStrMsg = `Starting deployment for the App Builder application in workspace ${project.workspace.name}`
-    } else if (event === 'AB_APP_UNDEPLOY') {
-      logStrMsg = `Starting undeployment for the App Builder application in workspace ${project.workspace.name}`
-    } else if (event === 'AB_APP_ASSETS_UNDEPLOYED') {
-      logStrMsg = `All static assets for the App Builder application in workspace: ${project.workspace.name} were successfully undeployed from the CDN`
-    } else if (event === 'AB_APP_ASSETS_DEPLOYED') {
-      logStrMsg = `All static assets for the App Builder application in workspace: ${project.workspace.name} were successfully deployed to the CDN.\n Files deployed - `
-    }
+function getAuditLogEvent ({ cliCommandFlags, operation, appInfo }) {
+  const { project, runtimeNamespace } = appInfo
 
-    logEvent = {
-      orgId: project.org.id,
-      projectId: project.id,
-      workspaceId: project.workspace.id,
-      workspaceName: project.workspace.name,
-      operation: event in OPERATIONS ? OPERATIONS[event] : OPERATIONS.AB_APP_TEST,
-      timestamp: new Date().valueOf(),
-      data: {
-        cliCommandFlags: flags,
-        opDetailsStr: logStrMsg
-      }
+  if (!project) {
+    throw new Error('Project is required')
+  }
+
+  if (!project.org) {
+    throw new Error('Project org is required')
+  }
+  if (!project.workspace) {
+    throw new Error('Project workspace is required')
+  }
+
+  if (!runtimeNamespace) {
+    throw new Error('Runtime namespace is required')
+  }
+
+  if (!Object.values(OPERATIONS).find((op) => op === operation)) {
+    throw new Error(`Invalid operation: ${operation}`)
+  }
+  const orgId = project.org.id
+
+  const logEvent = {
+    orgId,
+    operation,
+    objectRef: appInfo.name,
+    objectRev: appInfo.version,
+    objectName: appInfo.name,
+    timestamp: new Date().valueOf(),
+    runtimeNamespace,
+    data: {
+      cliCommandFlags
     }
   }
   return logEvent
 }
 
 /**
+ * Send audit log event for app deployment
  *
- * @param {string} directory | path to assets directory
- * @returns {Array} log | array of log messages
+ * @param {AuditLogParams} params - Parameters object containing access token, CLI flags, app info, and environment
+ * @returns {Promise<void>} Promise that resolves when the audit log is sent successfully
+ * @throws {Error} If the audit log request fails
  */
-function getFilesCountWithExtension (directory) {
-  const log = []
-
-  if (!fs.existsSync(directory)) {
-    this.log(chalk.red(chalk.bold(`Error: Directory ${directory} does not exist.`)))
-    return log
-  }
+async function sendAppDeployAuditLog ({ accessToken, cliCommandFlags, appInfo, env }) {
+  const logEvent = getAuditLogEvent({ cliCommandFlags, appInfo, operation: OPERATIONS.AB_APP_DEPLOY })
+  return publishAuditLogs({ accessToken, logEvent, env })
+}
 
-  const files = fs.readdirSync(directory, { recursive: true })
+/**
+ * Send audit log event for app undeployment
+ *
+ * @param {AuditLogParams} params - Parameters object containing access token, CLI flags, app info, and environment
+ * @returns {Promise<void>} Promise that resolves when the audit log is sent successfully
+ * @throws {Error} If the audit log request fails
+ */
+async function sendAppUndeployAuditLog ({ accessToken, cliCommandFlags, appInfo, env }) {
+  const logEvent = getAuditLogEvent({ cliCommandFlags, appInfo, operation: OPERATIONS.AB_APP_UNDEPLOY })
+  return publishAuditLogs({ accessToken, logEvent, env })
+}
 
-  if (files.length === 0) {
-    this.log(chalk.red(chalk.bold(`Error: No files found in directory ${directory}.`)))
-    return log
-  }
+/**
+ * Send audit log event for app assets deployment
+ *
+ * @param {AuditLogParams} params - Parameters object containing access token, CLI flags, app info, operation items, and environment
+ * @returns {Promise<void>} Promise that resolves when the audit log is sent successfully
+ * @throws {Error} If the audit log request fails
+ */
+async function sendAppAssetsDeployedAuditLog ({ accessToken, cliCommandFlags, appInfo, opItems, env }) {
+  const logEvent = getAuditLogEvent({ cliCommandFlags, appInfo, operation: OPERATIONS.AB_APP_ASSETS_DEPLOYED })
+  logEvent.data.opItems = opItems
+  return publishAuditLogs({ accessToken, logEvent, env })
+}
 
-  const fileTypeCounts = {}
-  files.forEach(file => {
-    const ext = path.extname(file).toLowerCase() || 'no extension'
-    if (fileTypeCounts[ext]) {
-      fileTypeCounts[ext]++
-    } else {
-      fileTypeCounts[ext] = 1
-    }
-  })
-
-  Object.keys(fileTypeCounts).forEach(ext => {
-    const count = fileTypeCounts[ext]
-    let description
-    switch (ext) {
-      case '.js':
-        description = 'Javascript file(s)'
-        break
-      case '.css':
-        description = 'CSS file(s)'
-        break
-      case '.html':
-        description = 'HTML page(s)'
-        break
-      case '.png':
-      case '.jpg':
-      case '.jpeg':
-      case '.gif':
-      case '.svg':
-      case '.webp':
-        description = `${ext} image(s)`
-        break
-      case 'no extension':
-        description = 'file(s) without extension'
-        break
-      default:
-        description = `${ext} file(s)`
-    }
-    log.push(`${count} ${description}\n`)
-  })
-  return log
+/**
+ * Send audit log event for app assets undeployment
+ *
+ * @param {AuditLogParams} params - Parameters object containing access token, CLI flags, app info, and environment
+ * @returns {Promise<void>} Promise that resolves when the audit log is sent successfully
+ * @throws {Error} If the audit log request fails
+ */
+async function sendAppAssetsUndeployedAuditLog ({ accessToken, cliCommandFlags, appInfo, env }) {
+  const logEvent = getAuditLogEvent({ cliCommandFlags, appInfo, operation: OPERATIONS.AB_APP_ASSETS_UNDEPLOYED })
+  return publishAuditLogs({ accessToken, logEvent, env })
 }
 
 module.exports = {
-  sendAuditLogs,
-  getAuditLogEvent,
+  OPERATIONS,
+  AUDIT_SERVICE_ENDPOINT_ROUTE,
   AUDIT_SERVICE_ENDPOINTS,
-  getFilesCountWithExtension
+  publishAuditLogs,
+  getAuditLogEvent,
+  sendAppDeployAuditLog,
+  sendAppUndeployAuditLog,
+  sendAppAssetsDeployedAuditLog,
+  sendAppAssetsUndeployedAuditLog
 }

package/src/lib/auth-helper.js

@@ -12,7 +12,49 @@ governing permissions and limitations under the License.
 const { getToken, context } = require('@adobe/aio-lib-ims')
 const { CLI } = require('@adobe/aio-lib-ims/src/context')
 const { getCliEnv } = require('@adobe/aio-lib-env')
-const defaultRuntimeUrl = 'https://adobeioruntime.net'
+const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:auth-helper', { provider: 'debug' })
+
+const DEPLOY_SERVICE_ENDPOINTS = {
+  stage: 'https://deploy-service.stg.app-builder.corp.adp.adobe.io',
+  prod: 'https://deploy-service.app-builder.adp.adobe.io'
+}
+
+/**
+ * Retrieves an access token for Adobe I/O CLI authentication.
+ * This function handles both CLI and custom contexts, setting up the appropriate
+ * authentication context and retrieving the corresponding access token.
+ *
+ * @async
+ * @function getAccessToken
+ * @param {object} [options] - Options for token retrieval
+ * @param {boolean} [options.useCachedToken=false] - Whether to use a cached token instead of requesting a new one
+ * @returns {Promise<{accessToken: string|null, env: string}>} An object containing:
+ *   - accessToken: The retrieved access token for authentication, or null if token retrieval failed
+ *   - env: The current CLI environment (e.g. 'prod', 'stage')
+ * @throws {Error} If token retrieval fails or context setup fails
+ */
+async function getAccessToken ({ useCachedToken = false } = {}) {
+  const env = getCliEnv()
+  aioLogger.debug(`Retrieving CLI Token using env=${env}`)
+
+  let contextName = CLI // default
+  const currentContext = await context.getCurrent() // potential override
+  if (currentContext && currentContext !== CLI) {
+    contextName = currentContext
+  } else {
+    await context.setCli({ 'cli.bare-output': true }, false) // set this globally
+  }
+
+  let accessToken = null
+  if (useCachedToken) {
+    const contextConfig = await context.get(contextName)
+    accessToken = contextConfig?.access_token?.token
+  } else {
+    accessToken = await getToken(contextName)
+  }
+
+  return { accessToken, env }
+}
 
 /**
  * For use with the openwhisk client js library to send a bearer token instead of basic
@@ -20,44 +62,36 @@ const defaultRuntimeUrl = 'https://adobeioruntime.net'
  */
 const bearerAuthHandler = {
   getAuthHeader: async () => {
-    await context.setCli({ 'cli.bare-output': true }, false) // set this globally
-
-    const env = getCliEnv()
-
-    console.debug(`Retrieving CLI Token using env=${env}`)
-    const accessToken = await getToken(CLI)
+    const { accessToken } = await getAccessToken()
 
     return `Bearer ${accessToken}`
   }
 }
 
-const setRuntimeApiHostAndAuthHandler = (config) => {
-  // TODO: remove this check once the deploy service is enabled by default
-  if (process.env.IS_DEPLOY_SERVICE_ENABLED === 'true') {
-    const aioConfig = (config && 'runtime' in config) ? config : null
-    if (aioConfig) {
-      aioConfig.runtime.apihost = process.env.AIO_RUNTIME_APIHOST ?? defaultRuntimeUrl
-      aioConfig.runtime.auth_handler = bearerAuthHandler
-      return aioConfig
-    }
-    const owConfig = (config && 'ow' in config) ? config : null
-    if (owConfig) {
-      owConfig.ow.apihost = process.env.AIO_RUNTIME_APIHOST ?? defaultRuntimeUrl
-      owConfig.ow.auth_handler = bearerAuthHandler
-      return owConfig
-    }
-  } else {
-    if (config && config.runtime) {
-      config.runtime.apihost = process.env.AIO_RUNTIME_APIHOST ?? defaultRuntimeUrl
-    }
-    if (config && config.ow) {
-      config.ow.apihost = process.env.AIO_RUNTIME_APIHOST ?? defaultRuntimeUrl
-    }
+const setRuntimeApiHostAndAuthHandler = (_config) => {
+  const env = getCliEnv()
+  let apiEndpoint = DEPLOY_SERVICE_ENDPOINTS[env] ?? DEPLOY_SERVICE_ENDPOINTS.prod
+  if (process.env.AIO_DEPLOY_SERVICE_URL) {
+    apiEndpoint = process.env.AIO_DEPLOY_SERVICE_URL
+  }
+
+  const config = structuredClone(_config)
+  const aioConfig = (config && 'runtime' in config) ? config : null
+  if (aioConfig) {
+    aioConfig.runtime.apihost = `${apiEndpoint}/runtime`
+    aioConfig.runtime.auth_handler = bearerAuthHandler
+    return aioConfig
+  }
+  const owConfig = (config && 'ow' in config) ? config : null
+  if (owConfig) {
+    owConfig.ow.apihost = `${apiEndpoint}/runtime`
+    owConfig.ow.auth_handler = bearerAuthHandler
+    return owConfig
   }
-  return config
 }
 
 module.exports = {
+  getAccessToken,
   bearerAuthHandler,
   setRuntimeApiHostAndAuthHandler
 }

package/src/lib/run-dev.js

@@ -85,7 +85,9 @@ async function runDev (config, dataDir, options = {}, log = () => {}, inprocHook
         // note the condition: we still write backend urls EVEN if skipActions is set
         // the urls will always point to remotely deployed actions if skipActions is set
         log('injecting backend urls into frontend config')
-        urls = rtLibUtils.getActionUrls(devConfig, true, !skipActions, true)
+        // note: 3rd arg, _isLocalDev is not used in RuntimeLib
+        // there is no such thing as --local anymore
+        urls = rtLibUtils.getActionUrls(devConfig, false, false, true)
       }
       utils.writeConfig(devConfig.web.injectedConfig, urls)