merged latest changes

Author: shafeeqd959

.github/workflows/sca-scan.yml

@@ -13,3 +13,6 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
           args: --all-projects --fail-on=all
+          json: true
+        continue-on-error: true
+      - uses: contentstack/sca-policy@main

.talismanrc

@@ -1,10 +1,10 @@
 fileignoreconfig:
-  - filename: package-lock.json
-    checksum: c91b9e5fba1c84c0b6de15ad2f8cce698a5c781c9db31bebb7a3ad63ee88d9e1
-  - filename: pnpm-lock.yaml
-    checksum: 93f587bdb40e90560278654d116ca15ac901abfbfc666f82cddb53eac212eebe
   - filename: packages/contentstack-bootstrap/src/bootstrap/utils.ts
     checksum: 6e6fb00bb11b03141e5ad27eeaa4af9718dc30520c3e73970bc208cc0ba2a7d2
   - filename: .github/workflows/release.yml
     checksum: 73807361b1a862dc882846ac75fefca49e3c734db032e9aa80158f2a686bea13
+  - filename: pnpm-lock.yaml
+    checksum: 45b77e385a0b13c82ba125dcdc82d27a360132ff6edda801cd8b75943996c310
+  - filename: packages/contentstack-auth/src/commands/auth/logout.ts
+    checksum: 20ff708d5a0ee56eb8786b19df07b49dacaddfa1deafe99c0397716c7865726d
 version: '1.0'

packages/contentstack-auth/messages/index.json

@@ -18,6 +18,7 @@
   "CLI_AUTH_LOGOUT_DESCRIPTION": "User session logout",
   "CLI_AUTH_LOGOUT_FLAG_FORCE": "Force logging out for skipping the confirmation",
   "CLI_AUTH_LOGOUT_ALREADY": "You're already logged out",
+  "CLI_AUTH_LOGOUT_CANCELLED": "Log out cancelled",
   "CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS": "No authorizations found",
   "CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER": "No authorizations found for current user",
   "CLI_AUTH_WHOAMI_LOGGED_IN_AS": "You are currently logged in with email:",

packages/contentstack-auth/src/commands/auth/logout.ts

@@ -93,7 +93,10 @@ export default class LogoutCommand extends BaseCommand<typeof LogoutCommand> {
           confirm,
           isAuthenticated: oauthHandler.isAuthenticated(),
         });
-        log.success(messageHandler.parse('CLI_AUTH_LOGOUT_ALREADY'), this.contextDetails);
+        const messageKey = confirm === false && oauthHandler.isAuthenticated()
+          ? 'CLI_AUTH_LOGOUT_CANCELLED'
+          : 'CLI_AUTH_LOGOUT_ALREADY';
+        log.success(messageHandler.parse(messageKey), this.contextDetails);
       }
     } catch (error) {
       log.debug('Logout failed.', { ...this.contextDetails, error: error.message });

packages/contentstack-config/package.json

@@ -67,7 +67,21 @@
     "protected": [
       "config:get:region"
     ],
-    "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-config/<%- commandPath %>"
+    "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-config/<%- commandPath %>",
+    "topics": {
+      "config": {
+        "description": "Perform configuration related activities"
+      },
+      "config:get": {
+        "description": "View the list of set configuration values"
+      },
+      "config:set": {
+        "description": "Set configuration values"
+      },
+      "config:remove": {
+        "description": "Remove set configuration values"
+      }
+    }
   },
   "csdxConfig": {
     "shortCommandName": {

packages/contentstack/README.md

@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.60.0-beta.0 darwin-arm64 node-v22.13.1
+@contentstack/cli/1.60.0-beta.5 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -70,7 +70,7 @@ USAGE
 * [`csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]`](#csdx-cmstacksimport-setup--k-value--d-value--a-value---modules-valuevalue)
 * [`csdx cm:migrate-rte`](#csdx-cmmigrate-rte)
 * [`csdx cm:stacks:migration [-k <value>] [-a <value>] [--file-path <value>] [--branch <value>] [--config-file <value>] [--config <value>] [--multiple]`](#csdx-cmstacksmigration--k-value--a-value---file-path-value---branch-value---config-file-value---config-value---multiple)
-* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value---locale-value)
+* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y--s-value---locale-value)
 * [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent)
 * [`csdx cm:stacks:audit`](#csdx-cmstacksaudit)
 * [`csdx cm:stacks:audit:fix`](#csdx-cmstacksauditfix)
@@ -83,7 +83,7 @@ USAGE
 * [`csdx cm:stacks:publish-clear-logs`](#csdx-cmstackspublish-clear-logs)
 * [`csdx cm:stacks:publish-configure`](#csdx-cmstackspublish-configure)
 * [`csdx cm:stacks:publish-revert`](#csdx-cmstackspublish-revert)
-* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y-value--s-value---locale-value)
+* [`csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`](#csdx-cmstacksseed---repo-value---org-value--k-value--n-value--y--s-value---locale-value)
 * [`csdx csdx cm:stacks:unpublish [-a <value>] [-e <value>] [-c <value>] [-y] [--locale <value>] [--branch <value>] [--retry-failed <value>] [--bulk-unpublish <value>] [--content-type <value>] [--delivery-token <value>] [--only-assets] [--only-entries]`](#csdx-csdx-cmstacksunpublish--a-value--e-value--c-value--y---locale-value---branch-value---retry-failed-value---bulk-unpublish-value---content-type-value---delivery-token-value---only-assets---only-entries)
 * [`csdx config:get:base-branch`](#csdx-configgetbase-branch)
 * [`csdx config:get:ea-header`](#csdx-configgetea-header)
@@ -2561,19 +2561,19 @@ EXAMPLES
 
   $ csdx cm:migration --config-file <path/to/json/config/file> --file-path <migration/script/file/path>
 
-  $ csdx cm:migration --multiple --file-path <migration/scripts/dir/path> 
+  $ csdx cm:migration --multiple --file-path <migration/scripts/dir/path>
 
   $ csdx cm:migration --alias --file-path <migration/script/file/path> -k <api-key>
 ```
 
-## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`
+## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`
 
 Create a stack from existing content types, entries, assets, etc
 
 ```
 USAGE
-  $ csdx cm:seed cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s
-    <value>] [--locale <value>]
+  $ csdx cm:seed cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>]
+    [--locale <value>]
 
 FLAGS
   -a, --alias=<value>          Alias of the management token
@@ -2582,7 +2582,7 @@ FLAGS
   -o, --org=<value>            Provide Organization UID to create a new stack
   -r, --repo=<value>           GitHub organization name or GitHub user name/repository name.
   -s, --stack=<value>          Provide the stack UID to seed content.
-  -y, --yes=<value>            [Optional] Skip the stack confirmation.
+  -y, --yes                    [Optional] Skip the stack confirmation.
 
 DESCRIPTION
   Create a stack from existing content types, entries, assets, etc
@@ -3055,7 +3055,7 @@ EXAMPLES
 
   $ csdx cm:migration --config-file <path/to/json/config/file> --file-path <migration/script/file/path>
 
-  $ csdx cm:migration --multiple --file-path <migration/scripts/dir/path> 
+  $ csdx cm:migration --multiple --file-path <migration/scripts/dir/path>
 
   $ csdx cm:migration --alias --file-path <migration/script/file/path> -k <api-key>
 ```
@@ -3213,14 +3213,14 @@ EXAMPLES
 
 _See code: [@contentstack/cli-cm-bulk-publish](https://github.com/contentstack/cli/blob/main/packages/contentstack-bulk-publish/src/commands/cm/stacks/publish-revert.js)_
 
-## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>] [--locale <value>]`
+## `csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale <value>]`
 
 Create a stack from existing content types, entries, assets, etc
 
 ```
 USAGE
-  $ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]
-    [--locale <value>]
+  $ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y] [-s <value>] [--locale
+    <value>]
 
 FLAGS
   -a, --alias=<value>          Alias of the management token
@@ -3229,7 +3229,7 @@ FLAGS
   -o, --org=<value>            Provide Organization UID to create a new stack
   -r, --repo=<value>           GitHub organization name or GitHub user name/repository name.
   -s, --stack=<value>          Provide the stack UID to seed content.
-  -y, --yes=<value>            [Optional] Skip the stack confirmation.
+  -y, --yes                    [Optional] Skip the stack confirmation.
 
 DESCRIPTION
   Create a stack from existing content types, entries, assets, etc
@@ -4148,7 +4148,7 @@ EXAMPLES
   $ csdx plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.58/src/commands/plugins/index.ts)_
 
 ## `csdx plugins:add PLUGIN`
 
@@ -4222,7 +4222,7 @@ EXAMPLES
   $ csdx plugins:inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.58/src/commands/plugins/inspect.ts)_
 
 ## `csdx plugins:install PLUGIN`
 
@@ -4271,7 +4271,7 @@ EXAMPLES
     $ csdx plugins:install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.58/src/commands/plugins/install.ts)_
 
 ## `csdx plugins:link PATH`
 
@@ -4302,7 +4302,7 @@ EXAMPLES
   $ csdx plugins:link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.58/src/commands/plugins/link.ts)_
 
 ## `csdx plugins:remove [PLUGIN]`
 
@@ -4343,7 +4343,7 @@ FLAGS
   --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.58/src/commands/plugins/reset.ts)_
 
 ## `csdx plugins:uninstall [PLUGIN]`
 
@@ -4371,7 +4371,7 @@ EXAMPLES
   $ csdx plugins:uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.58/src/commands/plugins/uninstall.ts)_
 
 ## `csdx plugins:unlink [PLUGIN]`
 
@@ -4415,7 +4415,7 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v5.4.56/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/5.4.58/src/commands/plugins/update.ts)_
 
 ## `csdx tokens`
 

packages/contentstack/package.json

@@ -24,16 +24,16 @@
   "dependencies": {
     "@contentstack/cli-audit": "~1.19.0-beta.0",
     "@contentstack/cli-cm-export": "~1.24.0-beta.0",
-    "@contentstack/cli-cm-import": "~1.32.0-beta.0",
+    "@contentstack/cli-cm-import": "~1.32.0-beta.1",
     "@contentstack/cli-auth": "~1.8.0-beta.0",
-    "@contentstack/cli-cm-bootstrap": "~1.19.0-beta.0",
+    "@contentstack/cli-cm-bootstrap": "~1.19.0-beta.1",
     "@contentstack/cli-cm-branches": "~1.7.0-beta.0",
     "@contentstack/cli-cm-bulk-publish": "~1.11.0-beta.0",
-    "@contentstack/cli-cm-clone": "~1.21.0-beta.0",
+    "@contentstack/cli-cm-clone": "~1.21.0-beta.1",
     "@contentstack/cli-cm-export-to-csv": "~1.12.0-beta.0",
     "@contentstack/cli-cm-import-setup": "~1.8.0-beta.0",
     "@contentstack/cli-cm-migrate-rte": "~1.6.4",
-    "@contentstack/cli-cm-seed": "~1.15.0-beta.0",
+    "@contentstack/cli-cm-seed": "~1.15.0-beta.2",
     "@contentstack/cli-command": "~1.8.0-beta.0",
     "@contentstack/cli-config": "~1.20.0-beta.0",
     "@contentstack/cli-launch": "^1.9.6",
@@ -156,6 +156,7 @@
     ],
     "hooks": {
       "prerun": [
+        "./lib/hooks/prerun/init-context-for-command",
         "./lib/hooks/prerun/command-deprecation-check",
         "./lib/hooks/prerun/default-rate-limit-check",
         "./lib/hooks/prerun/latest-version-warning"
@@ -167,4 +168,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}

packages/contentstack/src/hooks/prerun/init-context-for-command.ts

@@ -0,0 +1,27 @@
+import {
+  cliux,
+  messageHandler,
+  managementSDKInitiator,
+  marketplaceSDKInitiator,
+} from '@contentstack/cli-utilities';
+import { CsdxContext } from '../../utils';
+
+/**
+ * When an invalid command is corrected (e.g. loginasda → login), init ran with the invalid
+ * command so context.messageFilePath was never set. Re-build context and re-init utilities
+ * for the actual command so i18n prompts show human-readable text.
+ */
+export default async function (opts: {
+  Command?: { id?: string };
+  config?: any;
+}): Promise<void> {
+  const config = opts?.config ?? this.config;
+  const commandId = opts?.Command?.id;
+  if (!config?.context?.messageFilePath && commandId) {
+    config.context = new CsdxContext({ id: commandId }, config);
+    messageHandler.init(config.context);
+    cliux.init(config.context);
+    managementSDKInitiator.init(config.context);
+    marketplaceSDKInitiator.init(config.context);
+  }
+}