@sap/cds-dk 9.9.3 → 10.0.4

package/lib/init/template/portal/index.js

@@ -29,15 +29,15 @@ module.exports = class PortalTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, isJava, addMta, hasMta, srvPath, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addKyma, addContainerize, hasApprouter, hasHtml5Repo, hasMultitenancy, hasXsuaa } = project
+    const { isJava, addMta, hasMta, srv, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addKyma, hasApprouter, hasHtml5Repo, hasMultitenancy, hasXsuaa } = project
 
     if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }
 
     if (addMta || (addXsuaa || addHtml5Repo || addApprouter || addMultitenancy) && hasMta) {
-      const srv = srv4(srvPath)
-      const additions = [srv, portal, appDeployer, portalDeployer]
+      const srvModule = srv4(srv.path)
+      const additions = [srvModule, portal, appDeployer, portalDeployer]
       const relationships = [{
         insert: [portal, 'name'],
         into: [portalDeployer, 'requires', 'name']
@@ -69,7 +69,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       if (hasMultitenancy) {
         relationships.push({
           insert: [portal, 'name'],
-          into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
+          into: [isJava ? srvModule : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
         })
       }
 
@@ -78,18 +78,10 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       })
     }
 
-    if (addContainerize || addKyma) {
-      const additions = [{
-          in: 'modules',
-          where: { name: `${appName}-portal-deployer` }
-      }]
-      await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
-    }
-
     if (addKyma) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
       await KymaTemplate.mergeDependency('service-instance', 'portal')
-      await KymaTemplate.mergeDependency('content-deployment', 'portal-deployer')
+      await renderAndCopy(path.join(__dirname, 'files/portal-site'), 'app/html5-deployer/portal/portal-site', project)
     }
   }
 }

package/lib/init/template/postgres/files/containerize.yaml.hbs

@@ -3,13 +3,13 @@ modules:
   - name: {{appName}}-postgres-deployer
     build-parameters:
       buildpack:
-        {{#hasHelmUnifiedRuntime}}
+        {{#hasKymaUnifiedRuntime}}
         builder: proxy-unified-runtime-dmz.int.repositories.cloud.sap/builder/noble
-        {{/hasHelmUnifiedRuntime}}
-        {{^hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
+        {{^hasKymaUnifiedRuntime}}
         type: nodejs
         builder: builder-jammy-base
-        {{/hasHelmUnifiedRuntime}}
+        {{/hasKymaUnifiedRuntime}}
         path: gen/pg
         env:
           BP_NODE_RUN_SCRIPTS: ""

package/lib/init/template/postgres/files/mta.yml.hbs

@@ -2,7 +2,7 @@
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
     requires:
       - name: {{appName}}-postgres
 

package/lib/init/template/postgres/files/package.json.hbs

@@ -1,7 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@cap-js/postgres": "^2"
+    "@cap-js/postgres": "^3"
   }{{#profile}},
   "cds": {
     "requires": {

package/lib/init/template/postgres/index.js

@@ -29,16 +29,16 @@ module.exports = class PostgresTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, srvPath, hasMultitenancy, addKyma, hasKyma, addMultitenancy } = project
+    const { addMta, srv, hasMultitenancy, addKyma, hasKyma, addMultitenancy } = project
 
     if (addMta) {
-      const srv = srv4(srvPath)
+      const srvModule = srv4(srv.path)
       await merge(__dirname, 'files/mta.yml.hbs').into('mta.yaml', {
         project,
-        additions: [srv, postgres, postgresDeployer],
+        additions: [srvModule, postgres, postgresDeployer],
         relationships: [{
             insert: [postgres, 'name'],
-            into: [srv, 'requires', 'name']
+            into: [srvModule, 'requires', 'name']
         }, {
           insert: [postgres, 'name'],
           into: [postgresDeployer, 'requires', 'name']

package/lib/init/template/react/files/{index.html → index.html.hbs}

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>catalog</title>
+    <title>{{app}}</title>
   </head>
   <body>
     <div id="root"></div>

package/lib/init/template/react/files/{vite.config.js → vite.config.js.hbs}

@@ -3,12 +3,13 @@ import AdmZip from 'adm-zip'
 import react from '@vitejs/plugin-react'
 
 export default defineConfig({
+  base: '{{{base}}}',
   plugins: [react(), {
       name: 'zip-dist', // zipping ./dist is required for BTP HTML5 repo or Application Frontend deployment
       closeBundle() {
         const zip = new AdmZip()
         zip.addLocalFolder('dist')
-        zip.writeZip('dist/catalog.zip')
+        zip.writeZip('dist/{{archiveName}}.zip')
       }
   }],
   server: {

package/lib/init/template/react/index.js

@@ -1,6 +1,5 @@
 const cds = require('../../../cds')
 const { path, sh: $ } = cds.utils
-const { ask4 } = require('../../../util/question')
 const { renderAndCopy } = require('../../template')
 
 module.exports = class ReactTemplate extends require('../../plugin') {
@@ -10,7 +9,7 @@ module.exports = class ReactTemplate extends require('../../plugin') {
       'into': {
         type: 'string',
         short: 'i',
-        help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'.`
+        help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'. Omit for a single-UI scenario where the Vite app sits directly in 'app/'.`
       }
     }
   }
@@ -20,10 +19,19 @@ module.exports = class ReactTemplate extends require('../../plugin') {
   }
 
   async run() {
-    const app = cds.cli.options.into ?? await ask4([`app name: `])
-    let into = path.join(cds.env.folders.app, app)
-    await renderAndCopy(path.join(__dirname, 'files'), into, { app, isJava: cds.env['project-nature'] === 'java' })
-    if (cds.cli.command === 'init') into = path.join(cds.cli.argv[0], into)
-    await $`npm i --prefix ${into}`
+    const into = cds.cli.options.into
+    const isRoot = !into || into === '.' || into === ''
+    const app = isRoot ? path.basename(cds.root) : into
+    const target = isRoot ? cds.env.folders.app : path.join(cds.env.folders.app, into)
+    await renderAndCopy(path.join(__dirname, 'files'), target, {
+      app,
+      isJava: cds.env['project-nature'] === 'java',
+      isRoot,
+      base: isRoot ? '/' : `/${into}/`,
+      archiveName: isRoot ? app : into,
+    })
+    let prefix = target
+    if (cds.cli.command === 'init') prefix = path.join(cds.cli.argv[0], target)
+    await $`npm i --prefix ${prefix}`
   }
 }

package/lib/init/template/redis/files/mta.yaml.hbs

@@ -2,7 +2,7 @@
 modules:
  - name: {{appName}}-srv
    type: {{language}}
-   path: {{& srvPath}}
+   path: {{& srv.path}}
    requires:
     - name: {{appName}}-redis
 

package/lib/init/template/redis/index.js

@@ -26,16 +26,16 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { addMta, srvPath } = project
+    const { addMta, srv } = project
 
     if (addMta) {
-      const srv = srv4(srvPath)
+      const srvModule = srv4(srv.path)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
         project,
-        additions: [srv, redis],
+        additions: [srvModule, redis],
         relationships: [{
           insert: [redis, 'name'],
-          into: [srv, 'requires', 'name']
+          into: [srvModule, 'requires', 'name']
         }]
       })
     }

package/lib/init/template/sample/files/app/admin-books/webapp/manifest.json

@@ -95,7 +95,8 @@
           "name": "sap.fe.templates.ObjectPage",
           "options": {
             "settings": {
-              "entitySet": "Books"
+              "entitySet": "Books",
+              "editableHeaderContent": false
             }
           }
         }

package/lib/init/template/side-by-side-extensibility/files/mta.yaml.hbs

@@ -2,7 +2,7 @@
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
     provides:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:

package/lib/init/template/sqlite/files/package.json.hbs

@@ -1,12 +1,12 @@
 {
   {{#profileProduction}}
   "dependencies": {
-    "@cap-js/sqlite": "^2"
+    "@cap-js/sqlite": "^3"
   }
   {{/profileProduction}}
   {{^profileProduction}}
   "devDependencies": {
-    "@cap-js/sqlite": "^2"
+    "@cap-js/sqlite": "^3"
   }{{/profileProduction}}{{#profile}},
   "cds": {
     "requires": {

package/lib/init/template/toggles/files/package.json.hbs

@@ -1,7 +1,7 @@
 {
   {{#isNodejs}}
   "dependencies": {
-    "@sap/cds-mtxs": "^3"
+    "@sap/cds-mtxs": "^4"
   },
   "cds": {
   {{/isNodejs}}

package/lib/init/template/typer/files/gitignore

@@ -1 +1 @@
-@cds-models
+@cds-models

package/lib/init/template/typescript/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-types": "^0.16.0",
+    "@cap-js/cds-types": "^0.18.0",
     "@types/node": "^24.0.0",
     "tsx": "^4",
     "typescript": "^6.0.0"

package/lib/init/template/vue/files/{index.html → index.html.hbs}

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>catalog</title>
+    <title>{{app}}</title>
   </head>
   <body>
     <div id="app"></div>

package/lib/init/template/vue/files/{vite.config.js → vite.config.js.hbs}

@@ -3,12 +3,13 @@ import AdmZip from 'adm-zip'
 import vue from '@vitejs/plugin-vue'
 
 export default defineConfig({
+  base: '{{{base}}}',
   plugins: [vue(), {
       name: 'zip-dist', // zipping ./dist is required for BTP HTML5 repo or Application Frontend deployment
       closeBundle() {
         const zip = new AdmZip()
         zip.addLocalFolder('dist')
-        zip.writeZip('dist/catalog.zip')
+        zip.writeZip('dist/{{archiveName}}.zip')
       }
   }],
   server: {

package/lib/init/template/vue/index.js

@@ -1,6 +1,5 @@
 const cds = require('../../../cds')
 const { path, sh: $ } = cds.utils
-const { ask4 } = require('../../../util/question')
 const { renderAndCopy } = require('../../template')
 
 module.exports = class VueTemplate extends require('../../plugin') {
@@ -10,7 +9,7 @@ module.exports = class VueTemplate extends require('../../plugin') {
       'into': {
         type: 'string',
         short: 'i',
-        help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'.`
+        help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'. Omit for a single-UI scenario where the Vite app sits directly in 'app/'.`
       }
     }
   }
@@ -20,11 +19,20 @@ module.exports = class VueTemplate extends require('../../plugin') {
   }
 
   async run() {
-    const app = cds.cli.options.into ?? await ask4([`app name: `])
-    let into = path.join(cds.env.folders.app, app)
-    await renderAndCopy(path.join(__dirname, 'files'), into, { app, isJava: cds.env['project-nature'] === 'java', literal: () => text => text,
- })
-    if (cds.cli.command === 'init') into = path.join(cds.cli.argv[0], into)
-    await $`npm i --prefix ${into}`
+    const into = cds.cli.options.into
+    const isRoot = !into || into === '.' || into === ''
+    const app = isRoot ? path.basename(cds.root) : into
+    const target = isRoot ? cds.env.folders.app : path.join(cds.env.folders.app, into)
+    await renderAndCopy(path.join(__dirname, 'files'), target, {
+      app,
+      isJava: cds.env['project-nature'] === 'java',
+      isRoot,
+      base: isRoot ? '/' : `/${into}/`,
+      archiveName: isRoot ? app : into,
+      literal: () => text => text,
+    })
+    let prefix = target
+    if (cds.cli.command === 'init') prefix = path.join(cds.cli.argv[0], target)
+    await $`npm i --prefix ${prefix}`
   }
 }

package/lib/init/template/workzone-standard/files/mta.yaml.hbs

@@ -2,7 +2,7 @@
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
     provides:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:

package/lib/init/template/workzone-standard/index.js

@@ -41,7 +41,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { isJava, addMta, hasMta, srvPath, apps, appPath, appUIPaths, addMultitenancy, addXsuaa, strippedAppName } = project
+    const { isJava, addMta, hasMta, srv, apps, appPath, appUIPaths, addMultitenancy, addXsuaa, strippedAppName } = project
 
     await Promise.all(appUIPaths.map(async p => {
       project.uiApp = p
@@ -79,8 +79,8 @@ module.exports = class extends require('../../plugin') {
     }
 
     if (addMta || (addMultitenancy || addXsuaa) && hasMta) {
-      const srv = srv4(srvPath)
-      const additions = [srv, destinations, destination, {
+      const srvModule = srv4(srv.path)
+      const additions = [srvModule, destinations, destination, {
         in: [destination, 'requires'],
         where: { name: 'srv-api' }
       }]

package/lib/init/template/xsuaa/files/mta.yaml.hbs

@@ -2,7 +2,7 @@
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srv.path}}
     requires:
       - name: {{appName}}-auth
 

package/lib/init/template/xsuaa/index.js

@@ -34,7 +34,7 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMultitenancy, hasMultitenancy, addMta, hasMta, addKyma, isJava, srvPath, hasKyma } = project
+        const { addMultitenancy, hasMultitenancy, addMta, hasMta, addKyma, isJava, srv, hasKyma } = project
 
         const cds = require('../../../../lib')
         const xsSecurity = await (async () => {
@@ -53,10 +53,10 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             const xsuaa = plan ? xsuaa4(plan) : xsuaaDefault
             additions.push(xsuaa)
             if (addMta) {
-                const srv = srv4(srvPath)
+                const srvModule = srv4(srv.path)
                 relationships.push({
                     insert: [xsuaa, 'name'],
-                    into: [srv, 'requires', 'name']
+                    into: [srvModule, 'requires', 'name']
                 })
             }
             if (hasMultitenancy) {

package/lib/lint/Linter.js

@@ -202,7 +202,7 @@ class Linter {
     try {
       await this.#runEslint(DefaultESLint)
     } catch (err) {
-      term.error(err)
+      console.error(term.error(err))
     }
   }
 
@@ -297,11 +297,12 @@ class Linter {
         try {
           const eslintBase = `${require.resolve('eslint').split('eslint')[0]}/eslint`
           const template = require(path.join(eslintBase, `messages/${err.messageTemplate}.js`))
-          console.log(template(err.messageData || {}))
+          console.error(term.error(template(err.messageData || {})))
         } catch {
-          // Ignore template error then fallback to use `error.stack`.
-          console.log(err.stack)
+          console.error(term.error(err.stack))
         }
+      } else {
+        console.error(term.error(err.stack))
       }
       exit(GENERAL_ERROR)
     }

package/lib/lint/eslintHelp.json

@@ -1,5 +1,5 @@
 {
-  "version": "9.39.4",
+  "version": "10.6.0",
   "help": "\n# SYNOPSIS\n\n    *cds lint* [options] file.js [file.js] [dir]\n\n    Runs environment checks and/or checks the specified models\n    based on the ESLint framework\n\n# OPTIONS\n    \n    Basic configuration:\n      --no-config-lookup               Disable look up for eslint.config.js\n      -c, --config path::String        Use this configuration instead of eslint.config.js, eslint.config.mjs, or eslint.config.cjs\n      --inspect-config                 Open the config inspector with the current configuration\n      --ext [String]                   Specify additional file extensions to lint\n      --global [String]                Define global variables\n      --parser String                  Specify the parser to be used\n      --parser-options Object          Specify parser options\n    \n    Specify Rules and Plugins:\n      --plugin [String]                Specify plugins\n      --rule Object                    Specify rules\n    \n    Fix Problems:\n      --fix                            Automatically fix problems\n      --fix-dry-run                    Automatically fix problems without saving the changes to the file system\n      --fix-type Array                 Specify the types of fixes to apply (directive, problem, suggestion, layout)\n    \n    Ignore Files:\n      --no-ignore                      Disable use of ignore files and patterns\n      --ignore-pattern [String]        Patterns of files to ignore\n    \n    Use stdin:\n      --stdin                          Lint code provided on <STDIN> - default: false\n      --stdin-filename String          Specify filename to process STDIN as\n    \n    Handle Warnings:\n      --quiet                          Report errors only - default: false\n      --max-warnings Int               Number of warnings to trigger nonzero exit code - default: -1\n    \n    Output:\n      -o, --output-file path::String   Specify file to write report to\n      -f, --format String              Use a specific output format - default: stylish\n      --color, --no-color              Force enabling/disabling of color\n    \n    Inline configuration comments:\n      --no-inline-config               Prevent comments from changing config or rules\n      --report-unused-disable-directives  Adds reported errors for unused eslint-disable and eslint-enable directives\n      --report-unused-disable-directives-severity String  Chooses severity level for reporting unused eslint-disable and eslint-enable directives - either: off, warn, error, 0, 1, or 2\n      --report-unused-inline-configs String  Adds reported errors for unused eslint inline config comments - either: off, warn, error, 0, 1, or 2\n    \n    Caching:\n      --cache                          Only check changed files - default: false\n      --cache-file path::String        Path to the cache file. Deprecated: use --cache-location - default: .eslintcache\n      --cache-location path::String    Path to the cache file or directory\n      --cache-strategy String          Strategy to use for detecting changed files in the cache - either: metadata or content - default: metadata\n    \n    Suppressing Violations:\n      --suppress-all                   Suppress all violations - default: false\n      --suppress-rule [String]         Suppress specific rules\n      --suppressions-location path::String  Specify the location of the suppressions file\n      --prune-suppressions             Prune unused suppressions - default: false\n      --pass-on-unpruned-suppressions  Ignore unused suppressions - default: false\n    \n    Miscellaneous:\n      --init                           Run config initialization wizard - default: false\n      --env-info                       Output execution environment information - default: false\n      --no-error-on-unmatched-pattern  Prevent errors when pattern is unmatched\n      --exit-on-fatal-error            Exit with exit code 2 in case of fatal error - default: false\n      --no-warn-ignored                Suppress warnings when the file list includes ignored files\n      --pass-on-no-patterns            Exit with exit code 0 in case no file patterns are passed\n      --debug                          Output debugging information\n      -h, --help                       Show help\n      -v, --version                    Output the version number\n      --print-config path::String      Print the configuration for the given file\n      --stats                          Add statistics to the lint report - default: false\n      --flag [String]                  Enable a feature flag\n      --mcp                            Start the ESLint MCP server\n      --concurrency Int|String         Number of linting threads, auto to choose automatically, off for no multithreading - default: off\n    \n",
   "options": [
     "--config",

package/lib/mtx/params.js

@@ -161,10 +161,6 @@ class Param {
 class BasicParams {
     constructor() {
         // GENERAL PARAMS
-        // - non-persisted
-        this.projectFolder          = new Param('projectFolder');
-        this.directory              = this.projectFolder.newAlias('directory');
-
         // - persisted
         this.appUrl                 = new Param('appUrl',                 undefined, { persist: Persistence.setting }); // any trailing slash (/) is removed
         this.url                    = this.appUrl.newAlias('url');

package/lib/mtx/pull.js

@@ -65,7 +65,7 @@ module.exports = class Pull {
 
     constructor(params) {
         this.params = params;
-        this.projectFolder = params.get('projectFolder');
+        this.projectFolder = cds.root;
         this.env = cds.env.for('cds', this.projectFolder);
         this.baseModelName = this.env.extends;
         this.packagePath = join(this.projectFolder, 'package.json');

package/lib/mtx/push.js

@@ -1,4 +1,5 @@
-const { utils: { local }} = require ('../cds');
+const cds = require('../cds');
+const { local } = cds.utils;
 const { join } = require('path');
 const { readFileSync, existsSync } = require('fs');
 
@@ -20,7 +21,7 @@ module.exports = class Push {
 
     static async run(paramValues, pushOptions = {}) {
         const params = await login(paramValues);
-        const projectFolder = params.get('projectFolder');
+        const projectFolder = cds.root;
         const extensionName = this.getExtensionName(projectFolder);
 
         if (!('extArchive' in pushOptions)) {
@@ -41,7 +42,7 @@ module.exports = class Push {
     }
 
     static async readSource(params, pushOptions) {
-        let src = pushOptions?.extArchive ?? join(params.get('projectFolder'), 'gen/extension.tgz');
+        let src = pushOptions?.extArchive ?? join(cds.root, 'gen/extension.tgz');
         let content;
         if (existsSync(src)) {
             content = readFileSync(src, { encoding: 'base64' });

package/lib/mtx/settings_manager.js

@@ -62,12 +62,8 @@ function other(tokenStorage) {
            : 'plain';
 }
 
-function getProjectFolder(params) {
-    if (params.has('projectFolder')) {
-        const maybeExistentPath = path.resolve(params.get('projectFolder'));
-        return maybeExistentPath;
-    }
-    return fs.realpathSync('.');
+function getProjectFolder() {
+    return path.resolve(cds.root);
 }
 
 async function getAppUrlAndSubdomainFromSuggestions(params) {
@@ -185,9 +181,9 @@ class SettingsManager {
         return CONFIG;
     }
 
-    // Call with 'projectFolder' param as a resolved path.
     static async saveSettings(params) {
-        DEBUG?.(`Saving settings for project ${params.get('projectFolder')}`);
+        const projectFolder = getProjectFolder();
+        DEBUG?.(`Saving settings for project ${projectFolder}`);
 
         const paramsMap = params.toEntries(Persistence.setting);
         if (params.has('username')) {
@@ -200,7 +196,7 @@ class SettingsManager {
                 delete paramsMap.isEmptyPassword;
             }
         }
-        await this._saveToFile(params.get('projectFolder'), paramsMap);
+        await this._saveToFile(projectFolder, paramsMap);
 
         if (params.get('skipToken') || !params.has('token')) {
             return;
@@ -223,11 +219,10 @@ class SettingsManager {
     }
 
     static async loadAndMergeSettings(params, logout = false) {
-        const projectFolder = getProjectFolder(params);
-        params.set('projectFolder', projectFolder);
+        const projectFolder = getProjectFolder();
 
         const loadedSettings = await this._loadFromFile(projectFolder);
-        DEBUG?.(`Loaded project settings for ${params.get('projectFolder')}: ${loadedSettings.format()}`);
+        DEBUG?.(`Loaded project settings for ${projectFolder}: ${loadedSettings.format()}`);
 
         const clashing = ['passcode', 'clientid', 'username'].filter(param => params.has(param));
         if (clashing.length > 1) {
@@ -488,8 +483,8 @@ class SettingsManager {
         }
     }
 
-    static async deleteSettingsWithoutToken(params) {
-        const projectFolder = getProjectFolder(params);
+    static async deleteSettingsWithoutToken() {
+        const projectFolder = getProjectFolder();
         await this._saveToFile(projectFolder, null);
     }
 

package/lib/mtx/tenant_action.js

@@ -15,8 +15,8 @@ const COMMANDS = {
     unsubscribe: 'from'
 };
 
-const DEFAULT_SUBSCRIBE_USER = 'yves';
-const DEFAULT_SUBSCRIBE_PASSWORD = '';
+const DEFAULT_LOCALHOST_USER = 'yves';
+const DEFAULT_LOCALHOST_PASSWORD = '';
 
 module.exports = class TenantAction {
 
@@ -42,10 +42,10 @@ module.exports = class TenantAction {
             await this.runWithServer(params, tenant);
         } else {
             params = await AuthManager.login(params.toEntries());
-            // subscribe: use 'yves' as default username against localhost if no username is provided
-            if (this.command === 'subscribe' && !params.has('username') && params.has('appUrl') && localhostRegex.test(params.get('appUrl'))) {
-                params.set('username', DEFAULT_SUBSCRIBE_USER);
-                params.set('password', DEFAULT_SUBSCRIBE_PASSWORD);
+            // use 'yves' as default username against localhost if no username is provided
+            if (!params.has('username') && params.has('appUrl') && localhostRegex.test(params.get('appUrl'))) {
+                params.set('username', DEFAULT_LOCALHOST_USER);
+                params.set('password', DEFAULT_LOCALHOST_PASSWORD);
                 params = await AuthManager.login(params.toEntries()); // set reqAuth param
             }
             // Connect to running MTXS server

package/lib/mtx/util/question.js

@@ -29,22 +29,4 @@ module.exports = class Question {
             }
         });
     }
-
-    static askBooleanQuestion(question) {
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout
-        });
-
-        return new Promise(resolve => {
-            rl.question(question, answer => {
-                if (answer === 'y' || answer === 'Y') {
-                    resolve(true);
-                } else {
-                    resolve(false);
-                }
-                rl.close();
-            });
-        });
-    }
 }