@teambit/harmony.content.cli-reference 2.0.458 → 2.0.459

package/dist/cli-reference.json

@@ -75,222 +75,288 @@
         "private": false
     },
     {
-        "name": "doctor [diagnosis-name]",
+        "name": "component-issues",
         "alias": "",
         "options": [
             [
                 "j",
                 "json",
-                "return diagnoses in json format"
-            ],
-            [
-                "",
-                "list",
-                "list all available diagnoses"
-            ],
-            [
-                "s",
-                "save [filePath]",
-                "save diagnoses to a file"
-            ],
-            [
-                "a",
-                "archive [filePath]",
-                "archive the workspace including diagnosis info (by default exclude node-modules and include .bit)"
-            ],
-            [
-                "n",
-                "include-node-modules",
-                "relevant for --archive. include node_modules in the archive file"
-            ],
-            [
-                "p",
-                "include-public",
-                "relevant for --archive. include public folder in the archive file"
-            ],
-            [
-                "e",
-                "exclude-local-scope",
-                "relevant for --archive. exclude .bit or .git/bit from the archive file"
+                "output issues in json format"
             ]
         ],
-        "description": "diagnose a bit workspace",
+        "description": "list available component-issues",
         "extendedDescription": "",
-        "group": "general",
-        "private": false
+        "group": "development",
+        "private": true
     },
     {
-        "name": "init [path]",
+        "name": "show <component-name>",
         "alias": "",
         "options": [
             [
-                "n",
-                "name <workspace-name>",
-                "name of the workspace"
-            ],
-            [
-                "",
-                "generator <env-id>",
-                "for multiple, separate by a comma. add env-ids into the generators field in the workspace config for future \"bit create\" templates"
-            ],
-            [
-                "T",
-                "standalone",
-                "do not nest component store within .git directory and do not write config data inside package.json"
+                "j",
+                "json",
+                "return the component data in json format"
             ],
             [
-                "",
-                "no-package-json",
-                "do not generate package.json"
+                "l",
+                "legacy",
+                "use the legacy bit show."
             ],
             [
                 "r",
-                "reset",
-                "write missing or damaged Bit files"
-            ],
-            [
-                "",
-                "reset-new",
-                "reset .bitmap file as if the components were newly added and remove all model data (objects)"
-            ],
-            [
-                "",
-                "reset-lane-new",
-                "same as reset-new, but it only resets components belong to lanes. main components are left intact"
-            ],
-            [
-                "",
-                "reset-hard",
-                "delete all Bit files and directories, including Bit configuration, tracking and model data. Useful for re-starting workspace from scratch"
-            ],
-            [
-                "",
-                "reset-scope",
-                "removes local scope (.bit or .git/bit). tags/snaps that have not been exported will be lost. workspace is left intact"
-            ],
-            [
-                "d",
-                "default-directory <default-directory>",
-                "set the default directory pattern to import/create components into"
-            ],
-            [
-                "",
-                "default-scope <default-scope>",
-                "set the default scope for components in the workspace"
-            ],
-            [
-                "f",
-                "force",
-                "force workspace initialization without clearing local objects"
+                "remote",
+                "show data for a remote component"
             ],
             [
                 "b",
-                "bare [name]",
-                "initialize an empty bit bare scope"
+                "browser",
+                "open the component page in the browser"
             ],
             [
-                "s",
-                "shared <groupname>",
-                "add group write permissions to a scope properly"
-            ]
-        ],
-        "description": "create or reinitialize an empty workspace",
-        "extendedDescription": "if the current directory is already a workspace, it validates that bit files are correct and rewrite them if needed.",
-        "group": "start",
-        "private": false,
-        "skipWorkspace": true
-    },
-    {
-        "name": "globals",
-        "alias": "",
-        "options": [
-            [
-                "j",
-                "json",
-                "json format"
+                "c",
+                "compare",
+                "legacy-only. compare current file system component to its latest tagged version [default=latest]"
             ]
         ],
-        "description": "list all globals",
+        "description": "display the component's essential information",
         "extendedDescription": "",
-        "group": "workspace",
-        "private": false
+        "group": "info",
+        "private": false,
+        "arguments": [
+            {
+                "name": "component-name",
+                "description": "component name or component id"
+            }
+        ]
     },
     {
-        "name": "system <sub-command>",
-        "alias": "",
+        "name": "envs",
+        "alias": "env",
         "options": [],
-        "description": "system operations",
+        "description": "list all components maintained by the workspace and their corresponding envs",
         "extendedDescription": "",
-        "group": "workspace",
+        "group": "development",
         "private": false,
         "commands": [
             {
-                "name": "log",
+                "name": "list",
                 "alias": "",
                 "options": [],
-                "description": "print debug.log to the screen",
+                "description": "list all envs currently used in the workspace",
                 "extendedDescription": "",
-                "group": "workspace",
+                "group": "development",
                 "private": false
             },
             {
-                "name": "tail-log",
-                "alias": "",
-                "options": [],
-                "description": "print the log file to the screen as it is being written",
-                "extendedDescription": "similar to linux \"tail -f\" command",
-                "group": "workspace",
-                "private": false
-            }
-        ]
-    },
-    {
-        "name": "config",
-        "alias": "",
-        "options": [],
-        "description": "global config management",
-        "extendedDescription": "https://bit.dev/reference/config/bit-config",
-        "group": "general",
-        "private": false,
-        "commands": [
-            {
-                "name": "set <key> <val>",
+                "name": "get <component-name>",
                 "alias": "",
-                "options": [],
-                "description": "set a global configuration",
-                "extendedDescription": "to set temporary configuration by env variable, prefix with \"BIT_CONFIG\", replace \".\" with \"_\" and change to upper case.\nfor example, \"user.token\" becomes \"BIT_CONFIG_USER_TOKEN\"",
-                "group": "ungrouped",
+                "options": [
+                    [
+                        "",
+                        "services <string>",
+                        "show information about the specific services only. for multiple services, separate by a comma and wrap with quotes"
+                    ]
+                ],
+                "description": "show config information from a component's env",
+                "extendedDescription": "",
+                "group": "development",
                 "private": false,
-                "skipWorkspace": true
+                "arguments": [
+                    {
+                        "name": "component-name",
+                        "description": "the 'component name' or 'component id' of the component whose env you'd like to inspect"
+                    }
+                ]
             },
             {
-                "name": "del <key>",
-                "alias": "",
+                "name": "set <component-pattern> <env>",
                 "options": [],
-                "description": "delete given key from global configuration",
-                "extendedDescription": "",
-                "group": "ungrouped",
-                "private": false
+                "description": "Assigns one or more components a development environment (env)",
+                "group": "development",
+                "arguments": [
+                    {
+                        "name": "component-pattern",
+                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                    },
+                    {
+                        "name": "env",
+                        "description": "the env's component id (include version if not latest, e.g `teambit.community/envs/community-react@1.95.13`)"
+                    }
+                ],
+                "examples": [
+                    {
+                        "cmd": "set ui/button teambit.react/react-env",
+                        "description": "configures 'ui/button' to use the latest version of the 'teambit.react/react-env' env"
+                    },
+                    {
+                        "cmd": "set ui/button teambit.community/envs/community-mdx@1.95.16",
+                        "description": "configures 'ui/button' to use the 'teambit.community/envs/community-mdx@1.95.16' env"
+                    },
+                    {
+                        "cmd": "set \"*/ui/**\" teambit.react/react-env",
+                        "description": "configures all components that have the 'ui' namespace to use the latest version of the teambit.react/react-env env"
+                    }
+                ]
             },
             {
-                "name": "get <key>",
-                "alias": "",
+                "name": "unset <component-pattern>",
                 "options": [],
-                "description": "get a value from global configuration",
-                "extendedDescription": "",
-                "group": "ungrouped",
-                "private": false
+                "description": "un-sets an env from components that were previously set by \"bit env set\" or by a component template",
+                "extendedDescription": "keep in mind that this doesn't remove envs that are set via variants.\nin only removes envs that appear in the .bitmap file, which were previously configured via \"bit env set\".\nthe purpose of this command is to reset previously assigned envs to either allow variants configure the env or use the base node env.\nyou can use a `<pattern>` for multiple component ids, such as `bit env unset \"org.scope/utils/**\"`.\nuse comma to separate patterns and '!' to exclude. e.g. 'ui/**, !ui/button'\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nalways wrap the pattern with single quotes to avoid collision with shell commands.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern.\n",
+                "group": "development",
+                "arguments": [
+                    {
+                        "name": "component-pattern",
+                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                    }
+                ]
             },
             {
-                "name": "list",
-                "alias": "",
+                "name": "replace <current-env> <new-env>",
                 "options": [],
-                "description": "list all configuration(s)",
-                "extendedDescription": "",
-                "group": "ungrouped",
-                "private": false
-            }
-        ]
+                "description": "replace an existing env with another env for all components using the old env",
+                "group": "development",
+                "arguments": [
+                    {
+                        "name": "current-env",
+                        "description": "the component id of the env to be replaced"
+                    },
+                    {
+                        "name": "new-env",
+                        "description": "the component id of the new env"
+                    }
+                ],
+                "examples": [
+                    {
+                        "cmd": "replace teambit.harmony/aspect teambit.harmony/node",
+                        "description": "components configured to use the 'aspect' env will be configured to use the 'node' env, instead"
+                    }
+                ]
+            },
+            {
+                "name": "update [env-id] [pattern]",
+                "options": [],
+                "description": "update a version of an env for all components using that env",
+                "group": "development",
+                "arguments": [
+                    {
+                        "name": "env-id",
+                        "description": "the environment id (defaults to all envs). optionally, add a version (id@version), if no version is supplied will use the latest version on the remote."
+                    },
+                    {
+                        "name": "pattern",
+                        "description": "the components to update (defaults to all components). component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                    }
+                ],
+                "examples": [
+                    {
+                        "cmd": "envs update",
+                        "description": "update all envs for all components in the workspace, to their latest version"
+                    },
+                    {
+                        "cmd": "envs update scope.org/env '**/ui/**'",
+                        "description": "update components in the \"ui\" namespace that use scope.org/env to use its latest version"
+                    },
+                    {
+                        "cmd": "envs update scope.org/env@2.0.0",
+                        "description": "update all components that use scope.org/env to version 2.0.0 (of this env)."
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "name": "globals",
+        "alias": "",
+        "options": [
+            [
+                "j",
+                "json",
+                "json format"
+            ]
+        ],
+        "description": "list all globals",
+        "extendedDescription": "",
+        "group": "workspace",
+        "private": false
+    },
+    {
+        "name": "system <sub-command>",
+        "alias": "",
+        "options": [],
+        "description": "system operations",
+        "extendedDescription": "",
+        "group": "workspace",
+        "private": false,
+        "commands": [
+            {
+                "name": "log",
+                "alias": "",
+                "options": [],
+                "description": "print debug.log to the screen",
+                "extendedDescription": "",
+                "group": "workspace",
+                "private": false
+            },
+            {
+                "name": "tail-log",
+                "alias": "",
+                "options": [],
+                "description": "print the log file to the screen as it is being written",
+                "extendedDescription": "similar to linux \"tail -f\" command",
+                "group": "workspace",
+                "private": false
+            }
+        ]
+    },
+    {
+        "name": "config",
+        "alias": "",
+        "options": [],
+        "description": "global config management",
+        "extendedDescription": "https://bit.dev/reference/config/bit-config",
+        "group": "general",
+        "private": false,
+        "commands": [
+            {
+                "name": "set <key> <val>",
+                "alias": "",
+                "options": [],
+                "description": "set a global configuration",
+                "extendedDescription": "to set temporary configuration by env variable, prefix with \"BIT_CONFIG\", replace \".\" with \"_\" and change to upper case.\nfor example, \"user.token\" becomes \"BIT_CONFIG_USER_TOKEN\"",
+                "group": "ungrouped",
+                "private": false,
+                "skipWorkspace": true
+            },
+            {
+                "name": "del <key>",
+                "alias": "",
+                "options": [],
+                "description": "delete given key from global configuration",
+                "extendedDescription": "",
+                "group": "ungrouped",
+                "private": false
+            },
+            {
+                "name": "get <key>",
+                "alias": "",
+                "options": [],
+                "description": "get a value from global configuration",
+                "extendedDescription": "",
+                "group": "ungrouped",
+                "private": false
+            },
+            {
+                "name": "list",
+                "alias": "",
+                "options": [],
+                "description": "list all configuration(s)",
+                "extendedDescription": "",
+                "group": "ungrouped",
+                "private": false
+            }
+        ]
     },
     {
         "name": "remote",
@@ -340,312 +406,120 @@
         ]
     },
     {
-        "name": "show <component-name>",
-        "alias": "",
+        "name": "start [component-pattern]",
+        "alias": "c",
         "options": [
             [
-                "j",
-                "json",
-                "return the component data in json format"
+                "d",
+                "dev",
+                "start UI server in dev mode."
             ],
             [
-                "l",
-                "legacy",
-                "use the legacy bit show."
+                "p",
+                "port [port-number]",
+                "port of the UI server."
             ],
             [
                 "r",
-                "remote",
-                "show data for a remote component"
+                "rebuild",
+                "rebuild the UI (useful e.g. when updating the workspace UI - can use the dev flag for HMR in this case)"
             ],
             [
-                "b",
-                "browser",
-                "open the component page in the browser"
+                "",
+                "skip-ui-build",
+                "skip building UI"
             ],
             [
-                "c",
-                "compare",
-                "legacy-only. compare current file system component to its latest tagged version [default=latest]"
+                "v",
+                "verbose",
+                "show verbose output for inspection and prints stack trace"
+            ],
+            [
+                "n",
+                "no-browser",
+                "do not automatically open browser when ready"
+            ],
+            [
+                "",
+                "skip-compilation",
+                "skip the auto-compilation before starting the web-server"
+            ],
+            [
+                "u",
+                "ui-root-name [type]",
+                "name of the ui root to use, e.g. \"teambit.scope/scope\" or \"teambit.workspace/workspace\""
             ]
         ],
-        "description": "display the component's essential information",
+        "description": "run the ui/development server",
         "extendedDescription": "",
-        "group": "info",
+        "group": "development",
         "private": false,
         "arguments": [
             {
-                "name": "component-name",
-                "description": "component name or component id"
+                "name": "component-pattern",
+                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
             }
         ]
     },
     {
-        "name": "component-issues",
+        "name": "ui-build [type]",
+        "alias": "c",
+        "options": [],
+        "description": "build production assets for deployment.",
+        "extendedDescription": "",
+        "group": "development",
+        "private": true
+    },
+    {
+        "name": "graph [id]",
         "alias": "",
         "options": [
+            [
+                "i",
+                "image <image>",
+                "image path and format. use one of the following extensions: [gif, png, svg, pdf]"
+            ],
+            [
+                "r",
+                "remote [remoteName]",
+                "remote name (name is optional, leave empty when id is specified)"
+            ],
+            [
+                "",
+                "all-versions",
+                "enter all components versions into the graph, not only latest"
+            ],
+            [
+                "",
+                "layout <name>",
+                "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
+            ],
             [
                 "j",
                 "json",
-                "output issues in json format"
+                "json format"
             ]
         ],
-        "description": "list available component-issues",
+        "description": "generate an image file with the workspace components' dependencies graph",
         "extendedDescription": "",
-        "group": "development",
-        "private": true
+        "group": "discover",
+        "private": false,
+        "remoteOp": true
     },
     {
-        "name": "envs",
-        "alias": "env",
+        "name": "scope <sub-command>",
+        "alias": "",
         "options": [],
-        "description": "list all components maintained by the workspace and their corresponding envs",
+        "description": "manage the scope-name for components",
         "extendedDescription": "",
         "group": "development",
         "private": false,
         "commands": [
             {
-                "name": "list",
-                "alias": "",
+                "name": "set <scope-name> [component-pattern]",
                 "options": [],
-                "description": "list all envs currently used in the workspace",
-                "extendedDescription": "",
-                "group": "development",
-                "private": false
-            },
-            {
-                "name": "get <component-name>",
-                "alias": "",
-                "options": [
-                    [
-                        "",
-                        "services <string>",
-                        "show information about the specific services only. for multiple services, separate by a comma and wrap with quotes"
-                    ]
-                ],
-                "description": "show config information from a component's env",
-                "extendedDescription": "",
-                "group": "development",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "component-name",
-                        "description": "the 'component name' or 'component id' of the component whose env you'd like to inspect"
-                    }
-                ]
-            },
-            {
-                "name": "set <component-pattern> <env>",
-                "options": [],
-                "description": "Assigns one or more components a development environment (env)",
-                "group": "development",
-                "arguments": [
-                    {
-                        "name": "component-pattern",
-                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    },
-                    {
-                        "name": "env",
-                        "description": "the env's component id (include version if not latest, e.g `teambit.community/envs/community-react@1.95.13`)"
-                    }
-                ],
-                "examples": [
-                    {
-                        "cmd": "set ui/button teambit.react/react-env",
-                        "description": "configures 'ui/button' to use the latest version of the 'teambit.react/react-env' env"
-                    },
-                    {
-                        "cmd": "set ui/button teambit.community/envs/community-mdx@1.95.16",
-                        "description": "configures 'ui/button' to use the 'teambit.community/envs/community-mdx@1.95.16' env"
-                    },
-                    {
-                        "cmd": "set \"*/ui/**\" teambit.react/react-env",
-                        "description": "configures all components that have the 'ui' namespace to use the latest version of the teambit.react/react-env env"
-                    }
-                ]
-            },
-            {
-                "name": "unset <component-pattern>",
-                "options": [],
-                "description": "un-sets an env from components that were previously set by \"bit env set\" or by a component template",
-                "extendedDescription": "keep in mind that this doesn't remove envs that are set via variants.\nin only removes envs that appear in the .bitmap file, which were previously configured via \"bit env set\".\nthe purpose of this command is to reset previously assigned envs to either allow variants configure the env or use the base node env.\nyou can use a `<pattern>` for multiple component ids, such as `bit env unset \"org.scope/utils/**\"`.\nuse comma to separate patterns and '!' to exclude. e.g. 'ui/**, !ui/button'\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nalways wrap the pattern with single quotes to avoid collision with shell commands.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern.\n",
-                "group": "development",
-                "arguments": [
-                    {
-                        "name": "component-pattern",
-                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    }
-                ]
-            },
-            {
-                "name": "replace <current-env> <new-env>",
-                "options": [],
-                "description": "replace an existing env with another env for all components using the old env",
-                "group": "development",
-                "arguments": [
-                    {
-                        "name": "current-env",
-                        "description": "the component id of the env to be replaced"
-                    },
-                    {
-                        "name": "new-env",
-                        "description": "the component id of the new env"
-                    }
-                ],
-                "examples": [
-                    {
-                        "cmd": "replace teambit.harmony/aspect teambit.harmony/node",
-                        "description": "components configured to use the 'aspect' env will be configured to use the 'node' env, instead"
-                    }
-                ]
-            },
-            {
-                "name": "update [env-id] [pattern]",
-                "options": [],
-                "description": "update a version of an env for all components using that env",
-                "group": "development",
-                "arguments": [
-                    {
-                        "name": "env-id",
-                        "description": "the environment id (defaults to all envs). optionally, add a version (id@version), if no version is supplied will use the latest version on the remote."
-                    },
-                    {
-                        "name": "pattern",
-                        "description": "the components to update (defaults to all components). component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    }
-                ],
-                "examples": [
-                    {
-                        "cmd": "envs update",
-                        "description": "update all envs for all components in the workspace, to their latest version"
-                    },
-                    {
-                        "cmd": "envs update scope.org/env '**/ui/**'",
-                        "description": "update components in the \"ui\" namespace that use scope.org/env to use its latest version"
-                    },
-                    {
-                        "cmd": "envs update scope.org/env@2.0.0",
-                        "description": "update all components that use scope.org/env to version 2.0.0 (of this env)."
-                    }
-                ]
-            }
-        ]
-    },
-    {
-        "name": "graph [id]",
-        "alias": "",
-        "options": [
-            [
-                "i",
-                "image <image>",
-                "image path and format. use one of the following extensions: [gif, png, svg, pdf]"
-            ],
-            [
-                "r",
-                "remote [remoteName]",
-                "remote name (name is optional, leave empty when id is specified)"
-            ],
-            [
-                "",
-                "all-versions",
-                "enter all components versions into the graph, not only latest"
-            ],
-            [
-                "",
-                "layout <name>",
-                "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
-            ],
-            [
-                "j",
-                "json",
-                "json format"
-            ]
-        ],
-        "description": "generate an image file with the workspace components' dependencies graph",
-        "extendedDescription": "",
-        "group": "discover",
-        "private": false,
-        "remoteOp": true
-    },
-    {
-        "name": "start [component-pattern]",
-        "alias": "c",
-        "options": [
-            [
-                "d",
-                "dev",
-                "start UI server in dev mode."
-            ],
-            [
-                "p",
-                "port [port-number]",
-                "port of the UI server."
-            ],
-            [
-                "r",
-                "rebuild",
-                "rebuild the UI (useful e.g. when updating the workspace UI - can use the dev flag for HMR in this case)"
-            ],
-            [
-                "",
-                "skip-ui-build",
-                "skip building UI"
-            ],
-            [
-                "v",
-                "verbose",
-                "show verbose output for inspection and prints stack trace"
-            ],
-            [
-                "n",
-                "no-browser",
-                "do not automatically open browser when ready"
-            ],
-            [
-                "",
-                "skip-compilation",
-                "skip the auto-compilation before starting the web-server"
-            ],
-            [
-                "u",
-                "ui-root-name [type]",
-                "name of the ui root to use, e.g. \"teambit.scope/scope\" or \"teambit.workspace/workspace\""
-            ]
-        ],
-        "description": "run the ui/development server",
-        "extendedDescription": "",
-        "group": "development",
-        "private": false,
-        "arguments": [
-            {
-                "name": "component-pattern",
-                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            }
-        ]
-    },
-    {
-        "name": "ui-build [type]",
-        "alias": "c",
-        "options": [],
-        "description": "build production assets for deployment.",
-        "extendedDescription": "",
-        "group": "development",
-        "private": true
-    },
-    {
-        "name": "scope <sub-command>",
-        "alias": "",
-        "options": [],
-        "description": "manage the scope-name for components",
-        "extendedDescription": "",
-        "group": "development",
-        "private": false,
-        "commands": [
-            {
-                "name": "set <scope-name> [component-pattern]",
-                "options": [],
-                "description": "Sets the scope for specified component/s. If no component is specified, sets the default scope of the workspace",
-                "extendedDescription": "default scopes for components are set in the bitmap file. the default scope for a workspace is set in the workspace.jsonc.\na component is set with a scope (as oppose to default scope) only once it is versioned.'\n\nyou can use a `<pattern>` for multiple component ids, such as `bit scope set scope-name \"org.scope/utils/**\"`.\nuse comma to separate patterns and '!' to exclude. e.g. 'ui/**, !ui/button'\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nalways wrap the pattern with single quotes to avoid collision with shell commands.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern.\n",
+                "description": "Sets the scope for specified component/s. If no component is specified, sets the default scope of the workspace",
+                "extendedDescription": "default scopes for components are set in the bitmap file. the default scope for a workspace is set in the workspace.jsonc.\na component is set with a scope (as oppose to default scope) only once it is versioned.'\n\nyou can use a `<pattern>` for multiple component ids, such as `bit scope set scope-name \"org.scope/utils/**\"`.\nuse comma to separate patterns and '!' to exclude. e.g. 'ui/**, !ui/button'\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nalways wrap the pattern with single quotes to avoid collision with shell commands.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern.\n",
                 "group": "development",
                 "arguments": [
                     {
@@ -876,118 +750,6 @@
         "private": true,
         "remoteOp": true
     },
-    {
-        "name": "version-history <sub-command>",
-        "alias": "vh",
-        "options": [],
-        "description": "manage the version-history of components",
-        "extendedDescription": "",
-        "group": "info",
-        "private": false,
-        "commands": [
-            {
-                "name": "graph <component-id>",
-                "alias": "",
-                "options": [
-                    [
-                        "s",
-                        "short-hash",
-                        "show only 9 chars of the hash"
-                    ],
-                    [
-                        "m",
-                        "mark <string>",
-                        "paint the given node-ids in the graph in red color, for multiple, separate by commas"
-                    ],
-                    [
-                        "",
-                        "png",
-                        "save the graph as a png file instead of svg. requires \"graphviz\" to be installed"
-                    ],
-                    [
-                        "l",
-                        "layout <name>",
-                        "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
-                    ]
-                ],
-                "description": "generate a graph of the version history of a component and save as an SVG file",
-                "extendedDescription": "",
-                "group": "info",
-                "private": false
-            },
-            {
-                "name": "show <component-id>",
-                "alias": "vh",
-                "options": [
-                    [
-                        "s",
-                        "short-hash",
-                        "show only 9 chars of the hash"
-                    ],
-                    [
-                        "j",
-                        "json",
-                        "json format"
-                    ]
-                ],
-                "description": "show the version-history of a component",
-                "extendedDescription": "",
-                "group": "info",
-                "private": false
-            },
-            {
-                "name": "build <component-pattern>",
-                "alias": "",
-                "options": [
-                    [
-                        "",
-                        "from-snap <snap>",
-                        "build the version history from a specific snap. the pattern must be a single component-id"
-                    ],
-                    [
-                        "",
-                        "from-all-lanes",
-                        "build the version history from the heads of all lanes that include this component"
-                    ],
-                    [
-                        "",
-                        "delete-existing",
-                        "delete the existing version history before building it"
-                    ],
-                    [
-                        "",
-                        "remote <scope>",
-                        "make the change on the remote scope"
-                    ]
-                ],
-                "description": "rebuild the version history of a component. helpful when it got corrupted for some reason",
-                "extendedDescription": "",
-                "group": "info",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "component-pattern",
-                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    }
-                ]
-            }
-        ]
-    },
-    {
-        "name": "cat-version-history <id>",
-        "alias": "cvh",
-        "options": [
-            [
-                "j",
-                "json",
-                "json format"
-            ]
-        ],
-        "description": "cat version-history object by component-id",
-        "extendedDescription": "",
-        "group": "ungrouped",
-        "private": true
-    },
     {
         "name": "eject-conf <pattern>",
         "alias": "",
@@ -1234,83 +996,6 @@
             }
         ]
     },
-    {
-        "name": "git <sub-command>",
-        "alias": "",
-        "options": [],
-        "description": "perform git operations",
-        "extendedDescription": "",
-        "group": "git",
-        "private": false,
-        "commands": [
-            {
-                "name": "set-merge-driver",
-                "alias": "smd",
-                "options": [
-                    [
-                        "g",
-                        "global",
-                        "set the git merge driver globally"
-                    ]
-                ],
-                "description": "setup bit's git merge driver for bitmap files",
-                "extendedDescription": "",
-                "group": "git",
-                "private": false
-            },
-            {
-                "name": "merge-bitmaps <ancestor> <current> <other>",
-                "alias": "",
-                "options": [],
-                "description": "a special command to merge conflicting bitmap files during git merge",
-                "extendedDescription": "",
-                "group": "git",
-                "private": true
-            }
-        ]
-    },
-    {
-        "name": "list [remote-scope]",
-        "alias": "ls",
-        "options": [
-            [
-                "i",
-                "ids",
-                "show only component ids, unformatted"
-            ],
-            [
-                "s",
-                "scope",
-                "show only components stored in the local scope, including indirect dependencies"
-            ],
-            [
-                "o",
-                "outdated",
-                "highlight outdated components, in comparison with their latest remote version (if one exists)"
-            ],
-            [
-                "d",
-                "include-deleted",
-                "EXPERIMENTAL. show also deleted components"
-            ],
-            [
-                "j",
-                "json",
-                "show the output in JSON format"
-            ],
-            [
-                "n",
-                "namespace <string>",
-                "show only components in the specified namespace/s e.g. '-n ui' or '*/ui'"
-            ]
-        ],
-        "description": "list components on a workspace or a remote scope (with flag).",
-        "extendedDescription": "",
-        "group": "discover",
-        "private": false,
-        "remoteOp": true,
-        "skipWorkspace": true
-    },
     {
         "name": "ws-config <sub-command>",
         "alias": "workspace-config",
@@ -1456,6 +1141,41 @@
         "remoteOp": true,
         "skipWorkspace": true
     },
+    {
+        "name": "git <sub-command>",
+        "alias": "",
+        "options": [],
+        "description": "perform git operations",
+        "extendedDescription": "",
+        "group": "git",
+        "private": false,
+        "commands": [
+            {
+                "name": "set-merge-driver",
+                "alias": "smd",
+                "options": [
+                    [
+                        "g",
+                        "global",
+                        "set the git merge driver globally"
+                    ]
+                ],
+                "description": "setup bit's git merge driver for bitmap files",
+                "extendedDescription": "",
+                "group": "git",
+                "private": false
+            },
+            {
+                "name": "merge-bitmaps <ancestor> <current> <other>",
+                "alias": "",
+                "options": [],
+                "description": "a special command to merge conflicting bitmap files during git merge",
+                "extendedDescription": "",
+                "group": "git",
+                "private": true
+            }
+        ]
+    },
     {
         "name": "add [path...]",
         "alias": "a",
@@ -2153,37 +1873,115 @@
         ]
     },
     {
-        "name": "move <current-component-dir> <new-component-dir>",
-        "alias": "mv",
-        "options": [],
-        "description": "move a component to a different filesystem path",
-        "extendedDescription": "(note: this does NOT affect the component's name or scope, just its location in the workspace)",
+        "name": "eject <component-pattern>",
+        "alias": "E",
+        "options": [
+            [
+                "f",
+                "force",
+                "ignore local changes/versions. eject component/s even when they are staged or modified. Note: unexported tags/snaps will be lost"
+            ],
+            [
+                "x",
+                "skip-dependency-installation",
+                "do not auto-install dependencies"
+            ],
+            [
+                "j",
+                "json",
+                "print the results in JSON format"
+            ],
+            [
+                "",
+                "keep-files",
+                "keep the component files in the workspace intact"
+            ]
+        ],
+        "description": "remove component from the workspace and install it instead as a regular npm package.",
+        "extendedDescription": "By default the component files will be removed from the workspace",
         "group": "development",
         "private": false,
         "arguments": [
             {
-                "name": "current-component-dir",
-                "description": "the component's current directory (relative to the workspace root)"
-            },
-            {
-                "name": "new-component-dir",
-                "description": "the new directory (relative to the workspace root) to create and move the component's files to"
+                "name": "component-pattern",
+                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
             }
         ]
     },
     {
-        "name": "import [component-patterns...]",
-        "alias": "",
+        "name": "list [remote-scope]",
+        "alias": "ls",
         "options": [
             [
-                "p",
-                "path <path>",
-                "import components into a specific directory (a relative path in the workspace)"
+                "i",
+                "ids",
+                "show only component ids, unformatted"
+            ],
+            [
+                "s",
+                "scope",
+                "show only components stored in the local scope, including indirect dependencies"
             ],
             [
                 "o",
-                "objects",
-                "import components objects to the local scope without checkout (without writing them to the file system). This is the default behavior for import with no id argument"
+                "outdated",
+                "highlight outdated components, in comparison with their latest remote version (if one exists)"
+            ],
+            [
+                "d",
+                "include-deleted",
+                "EXPERIMENTAL. show also deleted components"
+            ],
+            [
+                "j",
+                "json",
+                "show the output in JSON format"
+            ],
+            [
+                "n",
+                "namespace <string>",
+                "show only components in the specified namespace/s e.g. '-n ui' or '*/ui'"
+            ]
+        ],
+        "description": "list components on a workspace or a remote scope (with flag).",
+        "extendedDescription": "",
+        "group": "discover",
+        "private": false,
+        "remoteOp": true,
+        "skipWorkspace": true
+    },
+    {
+        "name": "move <current-component-dir> <new-component-dir>",
+        "alias": "mv",
+        "options": [],
+        "description": "move a component to a different filesystem path",
+        "extendedDescription": "(note: this does NOT affect the component's name or scope, just its location in the workspace)",
+        "group": "development",
+        "private": false,
+        "arguments": [
+            {
+                "name": "current-component-dir",
+                "description": "the component's current directory (relative to the workspace root)"
+            },
+            {
+                "name": "new-component-dir",
+                "description": "the new directory (relative to the workspace root) to create and move the component's files to"
+            }
+        ]
+    },
+    {
+        "name": "import [component-patterns...]",
+        "alias": "",
+        "options": [
+            [
+                "p",
+                "path <path>",
+                "import components into a specific directory (a relative path in the workspace)"
+            ],
+            [
+                "o",
+                "objects",
+                "import components objects to the local scope without checkout (without writing them to the file system). This is the default behavior for import with no id argument"
             ],
             [
                 "O",
@@ -2440,6 +2238,88 @@
         "group": "collaborate",
         "private": false
     },
+    {
+        "name": "resume-export <export-id> <remotes...>",
+        "alias": "",
+        "options": [],
+        "description": "EXPERIMENTAL. resume failed export",
+        "extendedDescription": "resume failed export to persist the pending objects on the given remotes.\nthe export-id is the id the client received in the error message during the failure.\nalternatively, exporting to any one of the failed scopes, throws server-is-busy error with the export-id",
+        "group": "collaborate",
+        "private": true,
+        "remoteOp": true
+    },
+    {
+        "name": "export [component-patterns...]",
+        "alias": "e",
+        "options": [
+            [
+                "e",
+                "eject",
+                "after export, remove the components from the workspace and install them as packages"
+            ],
+            [
+                "a",
+                "all",
+                "export all components, including non-staged (useful when components in the remote scope are corrupted or missing)"
+            ],
+            [
+                "",
+                "all-versions",
+                "export not only staged versions but all of them (useful when versions in the remote scope are corrupted or missing)"
+            ],
+            [
+                "",
+                "origin-directly",
+                "avoid export to the central hub, instead, export directly to the original scopes. not recommended!"
+            ],
+            [
+                "",
+                "resume <string>",
+                "in case the previous export failed and suggested to resume with an export-id, enter the id"
+            ],
+            [
+                "",
+                "head-only",
+                "in case previous export failed and locally it shows exported and only one snap/tag was created, try using this flag"
+            ],
+            [
+                "",
+                "ignore-missing-artifacts",
+                "don't throw an error when artifact files are missing. not recommended, unless you're sure the artifacts are in the remote"
+            ],
+            [
+                "",
+                "fork-lane-new-scope",
+                "allow exporting a forked lane into a different scope than the original scope"
+            ],
+            [
+                "",
+                "open-browser",
+                "open a browser once the export is completed in the cloud job url"
+            ],
+            [
+                "",
+                "verbose",
+                "per exported component, show the versions being exported"
+            ],
+            [
+                "j",
+                "json",
+                "show output in json format"
+            ]
+        ],
+        "description": "export components from the workspace to remote scopes",
+        "extendedDescription": "bit export => export all staged snaps/tags of components to their remote scope. if checked out to a lane, export the lane as well\n  `bit export [pattern...]` => export components included by the pattern to their remote scope (we recommend not using a pattern in\n    most scenarios so that all changes are exported simultaneously)\n  you can use a pattern for multiple ids, such as bit export \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
+        "group": "collaborate",
+        "private": false,
+        "remoteOp": true,
+        "arguments": [
+            {
+                "name": "component-patterns...",
+                "description": "(not recommended) component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+            }
+        ]
+    },
     {
         "name": "pack <componentId> [scopePath]",
         "alias": "",
@@ -2594,45 +2474,257 @@
         ]
     },
     {
-        "name": "deps <sub-command>",
-        "alias": "dependencies",
-        "options": [],
-        "description": "manage dependencies",
+        "name": "checkout <to> [component-pattern]",
+        "alias": "U",
+        "options": [
+            [
+                "i",
+                "interactive-merge",
+                "when a component is modified and the merge process found conflicts, display options to resolve them"
+            ],
+            [
+                "r",
+                "auto-merge-resolve <merge-strategy>",
+                "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
+            ],
+            [
+                "",
+                "manual",
+                "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
+            ],
+            [
+                "a",
+                "all",
+                "all components"
+            ],
+            [
+                "e",
+                "workspace-only",
+                "only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace"
+            ],
+            [
+                "v",
+                "verbose",
+                "showing verbose output for inspection"
+            ],
+            [
+                "x",
+                "skip-dependency-installation",
+                "do not auto-install dependencies of the imported components"
+            ],
+            [
+                "",
+                "force-ours",
+                "do not merge, preserve local files as is"
+            ],
+            [
+                "",
+                "force-theirs",
+                "do not merge, just overwrite with incoming files"
+            ]
+        ],
+        "description": "switch between component versions or remove local changes",
+        "extendedDescription": "\n`bit checkout <version> [component-pattern]` => checkout the specified ids (or all components when --all is used) to the specified version\n`bit checkout head [component-pattern]` => checkout to the last snap/tag (use --latest if you only want semver tags), omit [component-pattern] to checkout head for all\n`bit checkout head~x [component-pattern]` => go backward x generations from the head and checkout to that version\n`bit checkout latest [component-pattern]` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n`bit checkout reset [component-pattern]` => remove local modifications from the specified ids (or all components when --all is used). also, if a component dir is deleted from the filesystem, it'll be restored\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"",
+        "group": "development",
+        "private": false,
+        "arguments": [
+            {
+                "name": "to",
+                "description": "permitted values: [head, latest, reset, {specific-version}, {head~x}]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes"
+            },
+            {
+                "name": "component-pattern",
+                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+            }
+        ]
+    },
+    {
+        "name": "revert <component-pattern> <to>",
+        "alias": "",
+        "options": [
+            [
+                "v",
+                "verbose",
+                "showing verbose output for inspection"
+            ],
+            [
+                "x",
+                "skip-dependency-installation",
+                "do not install packages of the imported components"
+            ]
+        ],
+        "description": "replace the current component files by the specified version, leave the version intact",
         "extendedDescription": "",
-        "group": "info",
+        "group": "development",
         "private": false,
-        "commands": [
+        "arguments": [
             {
-                "name": "get <component-name>",
-                "alias": "",
-                "options": [
-                    [
-                        "",
-                        "scope",
-                        "get the data from the scope instead of the workspace"
-                    ],
-                    [
-                        "t",
-                        "tree",
-                        "render dependencies as a tree, similar to \"npm ls\""
-                    ]
-                ],
-                "description": "show direct and indirect dependencies of the given component",
-                "extendedDescription": "",
-                "group": "info",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "component-name",
-                        "description": "component name or component id"
-                    }
-                ]
+                "name": "component-pattern",
+                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
             },
             {
-                "name": "remove <component-pattern> <package...>",
-                "alias": "",
-                "options": [
-                    [
+                "name": "to",
+                "description": "permitted values: [main, specific-version]. 'main' - head version on main."
+            }
+        ]
+    },
+    {
+        "name": "test [component-pattern]",
+        "alias": "at",
+        "options": [
+            [
+                "w",
+                "watch",
+                "start the tester in watch mode."
+            ],
+            [
+                "d",
+                "debug",
+                "start the tester in debug mode."
+            ],
+            [
+                "a",
+                "all",
+                "DEPRECATED. (use --unmodified)"
+            ],
+            [
+                "u",
+                "unmodified",
+                "test all components, not only new and modified"
+            ],
+            [
+                "",
+                "junit <filepath>",
+                "write tests results as JUnit XML format into the specified file path"
+            ],
+            [
+                "",
+                "coverage",
+                "show code coverage data"
+            ],
+            [
+                "e",
+                "env <id>",
+                "test only components assigned the given env"
+            ],
+            [
+                "",
+                "update-snapshot",
+                "if supported by the tester, re-record every snapshot that fails during the test run"
+            ],
+            [
+                "s",
+                "scope <scope-name>",
+                "DEPRECATED. (use the pattern instead, e.g. \"scopeName/**\"). name of the scope to test"
+            ]
+        ],
+        "description": "test components in the workspace. by default only runs tests for new and modified components",
+        "extendedDescription": "",
+        "group": "development",
+        "private": false,
+        "arguments": [
+            {
+                "name": "component-pattern",
+                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+            }
+        ]
+    },
+    {
+        "name": "diff [component-pattern] [version] [to-version]",
+        "alias": "",
+        "options": [
+            [
+                "v",
+                "verbose",
+                "show a more verbose output where possible"
+            ],
+            [
+                "t",
+                "table",
+                "show tables instead of plain text for dependencies diff"
+            ]
+        ],
+        "description": "show the diff between the components' current source files and config, and their latest snapshot or tag",
+        "extendedDescription": "",
+        "group": "development",
+        "private": false,
+        "arguments": [
+            {
+                "name": "component-pattern",
+                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+            },
+            {
+                "name": "version",
+                "description": "specific version to compare against"
+            },
+            {
+                "name": "to-version",
+                "description": "specific version to compare to"
+            }
+        ],
+        "examples": [
+            {
+                "cmd": "diff",
+                "description": "show diff for all modified components"
+            },
+            {
+                "cmd": "diff foo",
+                "description": "show diff for a component \"foo\""
+            },
+            {
+                "cmd": "diff foo 0.0.1",
+                "description": "show diff for a component \"foo\" from the current state to version 0.0.1"
+            },
+            {
+                "cmd": "diff foo 0.0.1 0.0.2",
+                "description": "show diff for a component \"foo\" from version 0.0.1 to version 0.0.2"
+            },
+            {
+                "cmd": "diff '$codeModified' ",
+                "description": "show diff only for components with modified files. ignore config changes"
+            }
+        ]
+    },
+    {
+        "name": "deps <sub-command>",
+        "alias": "dependencies",
+        "options": [],
+        "description": "manage dependencies",
+        "extendedDescription": "",
+        "group": "info",
+        "private": false,
+        "commands": [
+            {
+                "name": "get <component-name>",
+                "alias": "",
+                "options": [
+                    [
+                        "",
+                        "scope",
+                        "get the data from the scope instead of the workspace"
+                    ],
+                    [
+                        "t",
+                        "tree",
+                        "render dependencies as a tree, similar to \"npm ls\""
+                    ]
+                ],
+                "description": "show direct and indirect dependencies of the given component",
+                "extendedDescription": "",
+                "group": "info",
+                "private": false,
+                "arguments": [
+                    {
+                        "name": "component-name",
+                        "description": "component name or component id"
+                    }
+                ]
+            },
+            {
+                "name": "remove <component-pattern> <package...>",
+                "alias": "",
+                "options": [
+                    [
                         "d",
                         "dev",
                         "remove from devDependencies"
@@ -2883,196 +2975,78 @@
         ]
     },
     {
-        "name": "eject <component-pattern>",
-        "alias": "E",
+        "name": "insights [names...]",
+        "alias": "",
         "options": [
             [
-                "f",
-                "force",
-                "ignore local changes/versions. eject component/s even when they are staged or modified. Note: unexported tags/snaps will be lost"
-            ],
-            [
-                "x",
-                "skip-dependency-installation",
-                "do not auto-install dependencies"
+                "l",
+                "list",
+                "list all insights"
             ],
             [
                 "j",
                 "json",
-                "print the results in JSON format"
+                "return the insights in json format"
             ],
             [
                 "",
-                "keep-files",
-                "keep the component files in the workspace intact"
+                "include-deps",
+                "include component dependencies that are not in this workspace"
             ]
         ],
-        "description": "remove component from the workspace and install it instead as a regular npm package.",
-        "extendedDescription": "By default the component files will be removed from the workspace",
+        "description": "Insights on component graph",
+        "extendedDescription": "",
         "group": "development",
-        "private": false,
-        "arguments": [
-            {
-                "name": "component-pattern",
-                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            }
-        ]
-    },
-    {
-        "name": "resume-export <export-id> <remotes...>",
-        "alias": "",
-        "options": [],
-        "description": "EXPERIMENTAL. resume failed export",
-        "extendedDescription": "resume failed export to persist the pending objects on the given remotes.\nthe export-id is the id the client received in the error message during the failure.\nalternatively, exporting to any one of the failed scopes, throws server-is-busy error with the export-id",
-        "group": "collaborate",
-        "private": true,
-        "remoteOp": true
+        "private": true
     },
     {
-        "name": "export [component-patterns...]",
-        "alias": "e",
+        "name": "tag [component-patterns...]",
+        "alias": "t",
         "options": [
             [
-                "e",
-                "eject",
-                "after export, remove the components from the workspace and install them as packages"
+                "m",
+                "message <message>",
+                "a log message describing latest changes"
             ],
             [
-                "a",
-                "all",
-                "export all components, including non-staged (useful when components in the remote scope are corrupted or missing)"
+                "u",
+                "unmodified",
+                "include unmodified components (by default, only new and modified components are tagged)"
             ],
             [
                 "",
-                "all-versions",
-                "export not only staged versions but all of them (useful when versions in the remote scope are corrupted or missing)"
+                "editor [editor]",
+                "open an editor to write a tag message for each component. optionally, specify the editor-name (defaults to vim)."
             ],
             [
-                "",
-                "origin-directly",
-                "avoid export to the central hub, instead, export directly to the original scopes. not recommended!"
+                "v",
+                "ver <version>",
+                "tag with the given version"
             ],
             [
-                "",
-                "resume <string>",
-                "in case the previous export failed and suggested to resume with an export-id, enter the id"
+                "l",
+                "increment <level>",
+                "options are: [major, premajor, minor, preminor, patch, prepatch, prerelease], default to patch"
             ],
             [
                 "",
-                "head-only",
-                "in case previous export failed and locally it shows exported and only one snap/tag was created, try using this flag"
+                "prerelease-id <id>",
+                "prerelease identifier (e.g. \"dev\" to get \"1.0.0-dev.1\")"
             ],
             [
-                "",
-                "ignore-missing-artifacts",
-                "don't throw an error when artifact files are missing. not recommended, unless you're sure the artifacts are in the remote"
+                "p",
+                "patch",
+                "syntactic sugar for \"--increment patch\""
             ],
             [
                 "",
-                "fork-lane-new-scope",
-                "allow exporting a forked lane into a different scope than the original scope"
+                "minor",
+                "syntactic sugar for \"--increment minor\""
             ],
             [
                 "",
-                "open-browser",
-                "open a browser once the export is completed in the cloud job url"
-            ],
-            [
-                "",
-                "verbose",
-                "per exported component, show the versions being exported"
-            ],
-            [
-                "j",
-                "json",
-                "show output in json format"
-            ]
-        ],
-        "description": "export components from the workspace to remote scopes",
-        "extendedDescription": "bit export => export all staged snaps/tags of components to their remote scope. if checked out to a lane, export the lane as well\n  `bit export [pattern...]` => export components included by the pattern to their remote scope (we recommend not using a pattern in\n    most scenarios so that all changes are exported simultaneously)\n  you can use a pattern for multiple ids, such as bit export \"utils/*\". (wrap the pattern with quotes to avoid collision with shell commands)",
-        "group": "collaborate",
-        "private": false,
-        "remoteOp": true,
-        "arguments": [
-            {
-                "name": "component-patterns...",
-                "description": "(not recommended) component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            }
-        ]
-    },
-    {
-        "name": "insights [names...]",
-        "alias": "",
-        "options": [
-            [
-                "l",
-                "list",
-                "list all insights"
-            ],
-            [
-                "j",
-                "json",
-                "return the insights in json format"
-            ],
-            [
-                "",
-                "include-deps",
-                "include component dependencies that are not in this workspace"
-            ]
-        ],
-        "description": "Insights on component graph",
-        "extendedDescription": "",
-        "group": "development",
-        "private": true
-    },
-    {
-        "name": "tag [component-patterns...]",
-        "alias": "t",
-        "options": [
-            [
-                "m",
-                "message <message>",
-                "a log message describing latest changes"
-            ],
-            [
-                "u",
-                "unmodified",
-                "include unmodified components (by default, only new and modified components are tagged)"
-            ],
-            [
-                "",
-                "editor [editor]",
-                "open an editor to write a tag message for each component. optionally, specify the editor-name (defaults to vim)."
-            ],
-            [
-                "v",
-                "ver <version>",
-                "tag with the given version"
-            ],
-            [
-                "l",
-                "increment <level>",
-                "options are: [major, premajor, minor, preminor, patch, prepatch, prerelease], default to patch"
-            ],
-            [
-                "",
-                "prerelease-id <id>",
-                "prerelease identifier (e.g. \"dev\" to get \"1.0.0-dev.1\")"
-            ],
-            [
-                "p",
-                "patch",
-                "syntactic sugar for \"--increment patch\""
-            ],
-            [
-                "",
-                "minor",
-                "syntactic sugar for \"--increment minor\""
-            ],
-            [
-                "",
-                "major",
-                "syntactic sugar for \"--increment major\""
+                "major",
+                "syntactic sugar for \"--increment major\""
             ],
             [
                 "",
@@ -3469,11 +3443,6 @@
                 "ignore-issues [issues]",
                 "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies, RemovedEnv, DeprecatedDependencies, SelfReference, ImportFromDirectory]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
             ],
-            [
-                "",
-                "update-dependents",
-                "when snapped on a lane, mark it as update-dependents so it will be skipped from the workspace"
-            ],
             [
                 "",
                 "tag",
@@ -3488,6 +3457,11 @@
                 "j",
                 "json",
                 "output as json format"
+            ],
+            [
+                "",
+                "update-dependents",
+                "when snapped on a lane, mark it as update-dependents so it will be skipped from the workspace"
             ]
         ],
         "description": "snap components from a bare-scope",
@@ -3505,18 +3479,18 @@
         "private": true
     },
     {
-        "name": "checkout <to> [component-pattern]",
-        "alias": "U",
+        "name": "merge [component-pattern]",
+        "alias": "",
         "options": [
             [
-                "i",
-                "interactive-merge",
-                "when a component is modified and the merge process found conflicts, display options to resolve them"
+                "",
+                "ours",
+                "DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification"
             ],
             [
-                "r",
-                "auto-merge-resolve <merge-strategy>",
-                "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
+                "",
+                "theirs",
+                "DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version"
             ],
             [
                 "",
@@ -3524,139 +3498,144 @@
                 "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
             ],
             [
-                "a",
-                "all",
-                "all components"
+                "r",
+                "auto-merge-resolve <merge-strategy>",
+                "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
             ],
             [
-                "e",
-                "workspace-only",
-                "only relevant for 'bit checkout head' when on a lane. don't import components from the remote lane that are not already in the workspace"
+                "",
+                "abort",
+                "in case of an unresolved merge, revert to pre-merge state"
             ],
             [
-                "v",
-                "verbose",
-                "showing verbose output for inspection"
+                "",
+                "resolve",
+                "mark an unresolved merge as resolved and create a new snap with the changes"
             ],
             [
-                "x",
-                "skip-dependency-installation",
-                "do not auto-install dependencies of the imported components"
+                "",
+                "no-snap",
+                "do not auto snap even if the merge completed without conflicts"
             ],
             [
                 "",
-                "force-ours",
-                "do not merge, preserve local files as is"
+                "build",
+                "in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
             ],
             [
                 "",
-                "force-theirs",
-                "do not merge, just overwrite with incoming files"
-            ]
-        ],
-        "description": "switch between component versions or remove local changes",
-        "extendedDescription": "\n`bit checkout <version> [component-pattern]` => checkout the specified ids (or all components when --all is used) to the specified version\n`bit checkout head [component-pattern]` => checkout to the last snap/tag (use --latest if you only want semver tags), omit [component-pattern] to checkout head for all\n`bit checkout head~x [component-pattern]` => go backward x generations from the head and checkout to that version\n`bit checkout latest [component-pattern]` => checkout to the latest satisfying semver tag, omit [component-pattern] to checkout latest for all\n`bit checkout reset [component-pattern]` => remove local modifications from the specified ids (or all components when --all is used). also, if a component dir is deleted from the filesystem, it'll be restored\nwhen on a lane, \"checkout head\" only checks out components on this lane. to update main components, run \"bit lane merge main\"",
-        "group": "development",
-        "private": false,
-        "arguments": [
-            {
-                "name": "to",
-                "description": "permitted values: [head, latest, reset, {specific-version}, {head~x}]. 'head' - last snap/tag. 'latest' - semver latest tag. 'reset' - removes local changes"
-            },
-            {
-                "name": "component-pattern",
-                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            }
-        ]
-    },
-    {
-        "name": "revert <component-pattern> <to>",
-        "alias": "",
-        "options": [
-            [
-                "v",
                 "verbose",
-                "showing verbose output for inspection"
+                "show details of components that were not merged successfully"
             ],
             [
                 "x",
                 "skip-dependency-installation",
-                "do not install packages of the imported components"
+                "do not install new dependencies resulting from the merge"
+            ],
+            [
+                "m",
+                "message <message>",
+                "override the default message for the auto snap"
             ]
         ],
-        "description": "replace the current component files by the specified version, leave the version intact",
-        "extendedDescription": "",
+        "description": "merge changes of the remote head into local - auto-snaps all merged components",
+        "extendedDescription": "merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.",
         "group": "development",
         "private": false,
         "arguments": [
             {
                 "name": "component-pattern",
                 "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            },
-            {
-                "name": "to",
-                "description": "permitted values: [main, specific-version]. 'main' - head version on main."
             }
         ]
     },
     {
-        "name": "stash <sub-command>",
-        "alias": "",
+        "name": "lane [sub-command]",
+        "alias": "l",
         "options": [
             [
-                "p",
-                "pattern",
-                "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                "d",
+                "details",
+                "show more details on the state of each component in each lane"
             ],
             [
-                "m",
-                "message <string>",
-                "message to be attached to the stashed components"
+                "j",
+                "json",
+                "show lanes details in json format"
+            ],
+            [
+                "r",
+                "remote <remote-scope-name>",
+                "show all remote lanes from the specified scope"
+            ],
+            [
+                "",
+                "merged",
+                "list only merged lanes"
+            ],
+            [
+                "",
+                "not-merged",
+                "list only lanes that haven't been merged"
             ]
         ],
-        "description": "stash modified components",
+        "description": "manage lanes - if no sub-command is used, runs \"bit lane list\"",
         "extendedDescription": "",
-        "group": "development",
+        "group": "collaborate",
         "private": false,
+        "remoteOp": true,
+        "skipWorkspace": true,
         "commands": [
             {
-                "name": "save",
-                "alias": "s",
+                "name": "list",
+                "alias": "",
                 "options": [
                     [
-                        "p",
-                        "pattern",
-                        "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                        "d",
+                        "details",
+                        "show more details on the state of each component in each lane"
+                    ],
+                    [
+                        "j",
+                        "json",
+                        "show lanes' details in a json format"
+                    ],
+                    [
+                        "r",
+                        "remote <remote-scope-name>",
+                        "show all remote lanes from the specified scope"
                     ],
                     [
                         "",
-                        "include-new",
-                        "EXPERIMENTAL. by default, only modified components are stashed. use this flag to include new components"
+                        "merged",
+                        "list only merged lanes"
                     ],
                     [
-                        "m",
-                        "message <string>",
-                        "message to be attached to the stashed components"
+                        "",
+                        "not-merged",
+                        "list only lanes that haven't been merged"
                     ]
                 ],
-                "description": "stash modified components",
+                "description": "list local or remote lanes",
                 "extendedDescription": "",
-                "group": "development",
-                "private": false
+                "group": "ungrouped",
+                "private": false,
+                "remoteOp": true,
+                "skipWorkspace": true
             },
             {
-                "name": "load [stash-id]",
-                "alias": "pop",
+                "name": "switch <lane>",
+                "alias": "",
                 "options": [
                     [
-                        "r",
-                        "auto-merge-resolve <merge-strategy>",
-                        "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
+                        "h",
+                        "head",
+                        "switch to the head of the lane/main (fetches the latest changes from the remote)"
                     ],
                     [
-                        "",
-                        "manual",
-                        "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
+                        "r",
+                        "auto-merge-resolve <merge-strategy>",
+                        "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
                     ],
                     [
                         "",
@@ -3667,1011 +3646,1112 @@
                         "",
                         "force-theirs",
                         "do not merge, just overwrite with incoming files"
+                    ],
+                    [
+                        "a",
+                        "get-all",
+                        "DEPRECATED. this is currently the default behavior"
+                    ],
+                    [
+                        "",
+                        "workspace-only",
+                        "checkout only the components in the workspace to the selected lane"
+                    ],
+                    [
+                        "x",
+                        "skip-dependency-installation",
+                        "do not install dependencies of the imported components"
+                    ],
+                    [
+                        "p",
+                        "pattern <component-pattern>",
+                        "switch only the lane components matching the specified component-pattern. only works when the workspace is empty\n\ncomponent name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                    ],
+                    [
+                        "n",
+                        "alias <string>",
+                        "relevant when the specified lane is a remote lane. create a local alias for the lane (doesnt affect the lane's name on the remote"
+                    ],
+                    [
+                        "j",
+                        "json",
+                        "return the output as JSON"
                     ]
                 ],
-                "description": "apply the changes according to the stash. if no stash-id provided, it loads the latest stash",
+                "description": "switch to the specified lane",
                 "extendedDescription": "",
-                "group": "development",
-                "private": false
+                "group": "ungrouped",
+                "private": true,
+                "arguments": [
+                    {
+                        "name": "lane",
+                        "description": "lane-name or lane-id (if lane is not local) to switch to"
+                    }
+                ]
             },
             {
-                "name": "list",
+                "name": "show [lane-name]",
                 "alias": "",
-                "options": [],
-                "description": "list stash",
+                "options": [
+                    [
+                        "j",
+                        "json",
+                        "show the lane details in json format"
+                    ],
+                    [
+                        "r",
+                        "remote",
+                        "show details of the remote head of the provided lane"
+                    ]
+                ],
+                "description": "show lane details. if no lane specified, show the current lane",
                 "extendedDescription": "",
-                "group": "development",
-                "private": false
-            }
-        ]
-    },
-    {
-        "name": "test [component-pattern]",
-        "alias": "at",
-        "options": [
-            [
-                "w",
-                "watch",
-                "start the tester in watch mode."
-            ],
-            [
-                "d",
-                "debug",
-                "start the tester in debug mode."
-            ],
-            [
-                "a",
-                "all",
-                "DEPRECATED. (use --unmodified)"
-            ],
-            [
-                "u",
-                "unmodified",
-                "test all components, not only new and modified"
-            ],
-            [
-                "",
-                "junit <filepath>",
-                "write tests results as JUnit XML format into the specified file path"
-            ],
-            [
-                "",
-                "coverage",
-                "show code coverage data"
-            ],
-            [
-                "e",
-                "env <id>",
-                "test only components assigned the given env"
-            ],
-            [
-                "",
-                "update-snapshot",
-                "if supported by the tester, re-record every snapshot that fails during the test run"
-            ],
-            [
-                "s",
-                "scope <scope-name>",
-                "DEPRECATED. (use the pattern instead, e.g. \"scopeName/**\"). name of the scope to test"
-            ]
-        ],
-        "description": "test components in the workspace. by default only runs tests for new and modified components",
-        "extendedDescription": "",
-        "group": "development",
-        "private": false,
-        "arguments": [
-            {
-                "name": "component-pattern",
-                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            }
-        ]
-    },
-    {
-        "name": "diff [component-pattern] [version] [to-version]",
-        "alias": "",
-        "options": [
-            [
-                "v",
-                "verbose",
-                "show a more verbose output where possible"
-            ],
-            [
-                "t",
-                "table",
-                "show tables instead of plain text for dependencies diff"
-            ]
-        ],
-        "description": "show the diff between the components' current source files and config, and their latest snapshot or tag",
-        "extendedDescription": "",
-        "group": "development",
-        "private": false,
-        "arguments": [
-            {
-                "name": "component-pattern",
-                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            },
-            {
-                "name": "version",
-                "description": "specific version to compare against"
+                "group": "ungrouped",
+                "private": false,
+                "remoteOp": true,
+                "skipWorkspace": true
             },
             {
-                "name": "to-version",
-                "description": "specific version to compare to"
-            }
-        ],
-        "examples": [
-            {
-                "cmd": "diff",
-                "description": "show diff for all modified components"
+                "name": "create <lane-name>",
+                "alias": "",
+                "options": [
+                    [
+                        "s",
+                        "scope <scope-name>",
+                        "remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")"
+                    ],
+                    [
+                        "",
+                        "remote-scope <scope-name>",
+                        "DEPRECATED. use --scope"
+                    ],
+                    [
+                        "",
+                        "alias <name>",
+                        "a local alias to refer to this lane, defaults to the `<lane-name>` (can be added later with \"bit lane alias\")"
+                    ],
+                    [
+                        "",
+                        "fork-lane-new-scope",
+                        "create the new lane in a different scope than its parent lane (if created from another lane)"
+                    ]
+                ],
+                "description": "creates a new lane and switches to it",
+                "extendedDescription": "a lane created from main (default-lane) is empty until components are snapped.\na lane created from another lane contains all the components of the original lane.",
+                "group": "ungrouped",
+                "private": false,
+                "arguments": [
+                    {
+                        "name": "lane-name",
+                        "description": "the name for the new lane"
+                    }
+                ]
             },
             {
-                "cmd": "diff foo",
-                "description": "show diff for a component \"foo\""
+                "name": "remove <lanes...>",
+                "alias": "",
+                "options": [
+                    [
+                        "r",
+                        "remote",
+                        "delete a remote lane. use remote/lane-id syntax e.g. bit lane remove owner.org/my-lane --remote. Delete is immediate, no export required"
+                    ],
+                    [
+                        "f",
+                        "force",
+                        "removes/deletes the lane even when the lane is not yet merged to main"
+                    ],
+                    [
+                        "s",
+                        "silent",
+                        "skip confirmation"
+                    ]
+                ],
+                "description": "remove or delete lanes",
+                "extendedDescription": "",
+                "group": "collaborate",
+                "private": false,
+                "arguments": [
+                    {
+                        "name": "lanes...",
+                        "description": "A list of lane names, separated by spaces"
+                    }
+                ]
             },
             {
-                "cmd": "diff foo 0.0.1",
-                "description": "show diff for a component \"foo\" from the current state to version 0.0.1"
-            },
-            {
-                "cmd": "diff foo 0.0.1 0.0.2",
-                "description": "show diff for a component \"foo\" from version 0.0.1 to version 0.0.2"
-            },
-            {
-                "cmd": "diff '$codeModified' ",
-                "description": "show diff only for components with modified files. ignore config changes"
-            }
-        ]
-    },
-    {
-        "name": "log <id>",
-        "alias": "",
-        "options": [
-            [
-                "r",
-                "remote",
-                "show log of a remote component"
-            ],
-            [
-                "",
-                "parents",
-                "show parents and lanes data"
-            ],
-            [
-                "o",
-                "one-line",
-                "show each log entry in one line"
-            ],
-            [
-                "f",
-                "full-hash",
-                "show full hash of the snap (default to the first 9 characters for --one-line/--parents flags)"
-            ],
-            [
-                "m",
-                "full-message",
-                "show full message of the snap (default to the first line for --one-line/--parents flags)"
-            ],
-            [
-                "",
-                "show-hidden",
-                "show hidden snaps (snaps are marked as hidden typically when the following tag has the same files/config)"
-            ],
-            [
-                "j",
-                "json",
-                "json format"
-            ]
-        ],
-        "description": "show components(s) version history",
-        "extendedDescription": "",
-        "group": "info",
-        "private": false,
-        "remoteOp": true,
-        "skipWorkspace": true,
-        "arguments": [
-            {
-                "name": "id",
-                "description": "component-id or component-name"
-            }
-        ]
-    },
-    {
-        "name": "log-file <filepath>",
-        "alias": "",
-        "options": [
-            [
-                "o",
-                "one-line",
-                "show each log entry in one line"
-            ]
-        ],
-        "description": "EXPERIMENTAL. show file history",
-        "extendedDescription": "",
-        "group": "info",
-        "private": false,
-        "arguments": [
-            {
-                "name": "filepath",
-                "description": "file path relative to the workspace"
-            }
-        ]
-    },
-    {
-        "name": "blame <filepath>",
-        "alias": "",
-        "options": [
-            [
-                "m",
-                "include-message",
-                "show the commit message"
-            ]
-        ],
-        "description": "EXPERIMENTAL. per line, show who and when was the last to modify it",
-        "extendedDescription": "",
-        "group": "info",
-        "private": false,
-        "arguments": [
-            {
-                "name": "filepath",
-                "description": "file path relative to the workspace"
-            }
-        ]
-    },
-    {
-        "name": "merge [component-pattern]",
-        "alias": "",
-        "options": [
-            [
-                "",
-                "ours",
-                "DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep the local modification"
-            ],
-            [
-                "",
-                "theirs",
-                "DEPRECATED. use --auto-merge-resolve. in case of a conflict, override the local modification with the specified version"
-            ],
-            [
-                "",
-                "manual",
-                "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
-            ],
-            [
-                "r",
-                "auto-merge-resolve <merge-strategy>",
-                "in case of a conflict, resolve according to the strategy: [ours, theirs, manual]"
-            ],
-            [
-                "",
-                "abort",
-                "in case of an unresolved merge, revert to pre-merge state"
-            ],
-            [
-                "",
-                "resolve",
-                "mark an unresolved merge as resolved and create a new snap with the changes"
-            ],
-            [
-                "",
-                "no-snap",
-                "do not auto snap even if the merge completed without conflicts"
-            ],
-            [
-                "",
-                "build",
-                "in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
-            ],
-            [
-                "",
-                "verbose",
-                "show details of components that were not merged successfully"
-            ],
-            [
-                "x",
-                "skip-dependency-installation",
-                "do not install new dependencies resulting from the merge"
-            ],
-            [
-                "m",
-                "message <message>",
-                "override the default message for the auto snap"
-            ]
-        ],
-        "description": "merge changes of the remote head into local - auto-snaps all merged components",
-        "extendedDescription": "merge changes of the remote head into local when they are diverged. when on a lane, merge the remote head of the lane into the local\nand creates snaps for merged components that have diverged, on the lane.\nif no ids are specified, all pending-merge components will be merged. (run \"bit status\" to list them).\noptionally use '--abort' to revert the last merge. to revert a lane merge, use \"bit lane merge-abort\" command.",
-        "group": "development",
-        "private": false,
-        "arguments": [
-            {
-                "name": "component-pattern",
-                "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-            }
-        ]
-    },
-    {
-        "name": "lane [sub-command]",
-        "alias": "l",
-        "options": [
-            [
-                "d",
-                "details",
-                "show more details on the state of each component in each lane"
-            ],
-            [
-                "j",
-                "json",
-                "show lanes details in json format"
-            ],
-            [
-                "r",
-                "remote <remote-scope-name>",
-                "show all remote lanes from the specified scope"
-            ],
-            [
-                "",
-                "merged",
-                "list only merged lanes"
-            ],
-            [
-                "",
-                "not-merged",
-                "list only lanes that haven't been merged"
-            ]
-        ],
-        "description": "manage lanes - if no sub-command is used, runs \"bit lane list\"",
-        "extendedDescription": "",
-        "group": "collaborate",
-        "private": false,
-        "remoteOp": true,
-        "skipWorkspace": true,
-        "commands": [
-            {
-                "name": "list",
+                "name": "change-scope <remote-scope-name>",
                 "alias": "",
                 "options": [
                     [
-                        "d",
-                        "details",
-                        "show more details on the state of each component in each lane"
-                    ],
-                    [
-                        "j",
-                        "json",
-                        "show lanes' details in a json format"
-                    ],
-                    [
-                        "r",
-                        "remote <remote-scope-name>",
-                        "show all remote lanes from the specified scope"
-                    ],
-                    [
-                        "",
-                        "merged",
-                        "list only merged lanes"
-                    ],
-                    [
-                        "",
-                        "not-merged",
-                        "list only lanes that haven't been merged"
+                        "l",
+                        "lane-name <lane-name>",
+                        "the name of the lane to change its remote scope. if not specified, the current lane is used"
                     ]
                 ],
-                "description": "list local or remote lanes",
-                "extendedDescription": "",
+                "description": "changes the remote scope of a lane",
+                "extendedDescription": "NOTE: available only before the lane is exported to the remote",
                 "group": "ungrouped",
-                "private": false,
-                "remoteOp": true,
-                "skipWorkspace": true
+                "private": false
             },
             {
-                "name": "switch <lane>",
+                "name": "alias <lane-name> <alias>",
                 "alias": "",
-                "options": [
-                    [
-                        "h",
-                        "head",
-                        "switch to the head of the lane/main (fetches the latest changes from the remote)"
-                    ],
-                    [
-                        "r",
-                        "auto-merge-resolve <merge-strategy>",
-                        "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
-                    ],
-                    [
-                        "",
-                        "force-ours",
-                        "do not merge, preserve local files as is"
-                    ],
-                    [
-                        "",
-                        "force-theirs",
-                        "do not merge, just overwrite with incoming files"
-                    ],
+                "options": [],
+                "description": "adds an alias to a lane",
+                "extendedDescription": "an alias is a name that can be used locally to refer to a lane. it is saved locally and never reaches the remote.\nit is useful e.g. when having multiple lanes with the same name, but with different remote scopes.",
+                "group": "ungrouped",
+                "private": false
+            },
+            {
+                "name": "rename <new-name>",
+                "alias": "",
+                "options": [
                     [
-                        "a",
-                        "get-all",
-                        "DEPRECATED. this is currently the default behavior"
-                    ],
+                        "l",
+                        "lane-name <lane-name>",
+                        "the name of the lane to rename. if not specified, the current lane is used"
+                    ]
+                ],
+                "description": "change the lane-name locally",
+                "extendedDescription": "the remote will be updated after the next \"bit export\" command",
+                "group": "ungrouped",
+                "private": false
+            },
+            {
+                "name": "diff [values...]",
+                "alias": "",
+                "options": [
                     [
                         "",
-                        "workspace-only",
-                        "checkout only the components in the workspace to the selected lane"
-                    ],
-                    [
-                        "x",
-                        "skip-dependency-installation",
-                        "do not install dependencies of the imported components"
-                    ],
-                    [
-                        "p",
                         "pattern <component-pattern>",
-                        "switch only the lane components matching the specified component-pattern. only works when the workspace is empty\n\ncomponent name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    ],
-                    [
-                        "n",
-                        "alias <string>",
-                        "relevant when the specified lane is a remote lane. create a local alias for the lane (doesnt affect the lane's name on the remote"
-                    ],
-                    [
-                        "j",
-                        "json",
-                        "return the output as JSON"
+                        "show lane-diff for components conforming to the specified component-pattern only\ncomponent-pattern format: component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
                     ]
                 ],
-                "description": "switch to the specified lane",
-                "extendedDescription": "",
+                "description": "show diff between lanes",
+                "extendedDescription": "bit lane diff => diff between the current lane and default lane. (only inside workspace).\nbit lane diff to => diff between the current lane (or default-lane when in scope) and \"to\" lane.\nbit lane diff from to => diff between \"from\" lane and \"to\" lane.",
                 "group": "ungrouped",
                 "private": true,
+                "remoteOp": true,
+                "skipWorkspace": true,
                 "arguments": [
                     {
-                        "name": "lane",
-                        "description": "lane-name or lane-id (if lane is not local) to switch to"
+                        "name": "from",
+                        "description": "base lane for comparison"
+                    },
+                    {
+                        "name": "to",
+                        "description": "lane being compared to base lane"
                     }
                 ]
             },
             {
-                "name": "show [lane-name]",
+                "name": "remove-readme [laneName]",
                 "alias": "",
-                "options": [
-                    [
-                        "j",
-                        "json",
-                        "show the lane details in json format"
-                    ],
-                    [
-                        "r",
-                        "remote",
-                        "show details of the remote head of the provided lane"
-                    ]
-                ],
-                "description": "show lane details. if no lane specified, show the current lane",
+                "options": [],
+                "description": "DEPRECATED (only use it if you have used add-readme and want to undo it). remove lane readme component",
                 "extendedDescription": "",
                 "group": "ungrouped",
                 "private": false,
-                "remoteOp": true,
-                "skipWorkspace": true
+                "skipWorkspace": false
             },
             {
-                "name": "create <lane-name>",
+                "name": "import <lane>",
                 "alias": "",
                 "options": [
                     [
-                        "s",
-                        "scope <scope-name>",
-                        "remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")"
-                    ],
-                    [
-                        "",
-                        "remote-scope <scope-name>",
-                        "DEPRECATED. use --scope"
-                    ],
-                    [
-                        "",
-                        "alias <name>",
-                        "a local alias to refer to this lane, defaults to the `<lane-name>` (can be added later with \"bit lane alias\")"
+                        "x",
+                        "skip-dependency-installation",
+                        "do not install dependencies of the imported components"
                     ],
                     [
-                        "",
-                        "fork-lane-new-scope",
-                        "create the new lane in a different scope than its parent lane (if created from another lane)"
+                        "p",
+                        "pattern <component-pattern>",
+                        "import only components from the lane that fit the specified component-pattern to the workspace. works only when the workspace is empty"
                     ]
                 ],
-                "description": "creates a new lane and switches to it",
-                "extendedDescription": "a lane created from main (default-lane) is empty until components are snapped.\na lane created from another lane contains all the components of the original lane.",
+                "description": "import a remote lane to your workspace and switch to that lane",
+                "extendedDescription": "",
                 "group": "ungrouped",
                 "private": false,
                 "arguments": [
                     {
-                        "name": "lane-name",
-                        "description": "the name for the new lane"
+                        "name": "lane",
+                        "description": "the remote lane name"
                     }
                 ]
             },
             {
-                "name": "remove <lanes...>",
-                "alias": "",
+                "name": "remove-comp <component-pattern>",
+                "alias": "rc",
                 "options": [
                     [
-                        "r",
-                        "remote",
-                        "delete a remote lane. use remote/lane-id syntax e.g. bit lane remove owner.org/my-lane --remote. Delete is immediate, no export required"
-                    ],
-                    [
-                        "f",
-                        "force",
-                        "removes/deletes the lane even when the lane is not yet merged to main"
+                        "",
+                        "workspace-only",
+                        "do not mark the components as removed from the lane. instead, remove them from the workspace only"
                     ],
                     [
-                        "s",
-                        "silent",
-                        "skip confirmation"
+                        "",
+                        "update-main",
+                        "EXPERIMENTAL. remove, i.e. delete, component/s on the main lane after merging this lane into main"
                     ]
                 ],
-                "description": "remove or delete lanes",
+                "description": "DEPRECATED. remove components when on a lane",
                 "extendedDescription": "",
                 "group": "collaborate",
                 "private": false,
                 "arguments": [
                     {
-                        "name": "lanes...",
-                        "description": "A list of lane names, separated by spaces"
+                        "name": "component-pattern",
+                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
                     }
                 ]
             },
             {
-                "name": "change-scope <remote-scope-name>",
+                "name": "fetch [lane-id]",
                 "alias": "",
                 "options": [
                     [
-                        "l",
-                        "lane-name <lane-name>",
-                        "the name of the lane to change its remote scope. if not specified, the current lane is used"
+                        "a",
+                        "all",
+                        "fetch all remote lanes"
                     ]
                 ],
-                "description": "changes the remote scope of a lane",
-                "extendedDescription": "NOTE: available only before the lane is exported to the remote",
+                "description": "fetch component objects from lanes. if no lane-id is provided, it fetches from the current lane",
+                "extendedDescription": "note, it does not save the remote lanes objects locally, only the refs",
                 "group": "ungrouped",
                 "private": false
             },
             {
-                "name": "alias <lane-name> <alias>",
+                "name": "eject <component-pattern>",
                 "alias": "",
                 "options": [],
-                "description": "adds an alias to a lane",
-                "extendedDescription": "an alias is a name that can be used locally to refer to a lane. it is saved locally and never reaches the remote.\nit is useful e.g. when having multiple lanes with the same name, but with different remote scopes.",
+                "description": "delete a component from the lane and install it as a package from main",
+                "extendedDescription": "NOTE: unlike \"bit eject\" on main, this command doesn't only remove the component from the\nworkspace, but also mark it as deleted from the lane, so it won't be merged later on.",
                 "group": "ungrouped",
-                "private": false
+                "private": false,
+                "arguments": [
+                    {
+                        "name": "component-pattern",
+                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                    }
+                ]
             },
             {
-                "name": "rename <new-name>",
+                "name": "history [lane-name]",
                 "alias": "",
                 "options": [
                     [
-                        "l",
-                        "lane-name <lane-name>",
-                        "the name of the lane to rename. if not specified, the current lane is used"
+                        "",
+                        "id <string>",
+                        "show a specific history item"
                     ]
                 ],
-                "description": "change the lane-name locally",
-                "extendedDescription": "the remote will be updated after the next \"bit export\" command",
+                "description": "EXPERIMENTAL. show lane history, default to the current lane",
+                "extendedDescription": "",
                 "group": "ungrouped",
                 "private": false
             },
             {
-                "name": "diff [values...]",
+                "name": "history-diff <from-history-id> <to-history-id>",
                 "alias": "",
                 "options": [
+                    [
+                        "l",
+                        "lane <lane-name>",
+                        "the name of the lane to diff. if not specified, the current lane is used"
+                    ],
                     [
                         "",
                         "pattern <component-pattern>",
                         "show lane-diff for components conforming to the specified component-pattern only\ncomponent-pattern format: component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
                     ]
                 ],
-                "description": "show diff between lanes",
-                "extendedDescription": "bit lane diff => diff between the current lane and default lane. (only inside workspace).\nbit lane diff to => diff between the current lane (or default-lane when in scope) and \"to\" lane.\nbit lane diff from to => diff between \"from\" lane and \"to\" lane.",
+                "description": "EXPERIMENTAL. show diff between two lane-history ids",
+                "extendedDescription": "run \"bit lane history\" to find these history-ids",
                 "group": "ungrouped",
-                "private": true,
-                "remoteOp": true,
-                "skipWorkspace": true,
+                "private": false
+            },
+            {
+                "name": "checkout <history-id>",
+                "alias": "",
+                "options": [
+                    [
+                        "x",
+                        "skip-dependency-installation",
+                        "do not install dependencies of the checked out components"
+                    ]
+                ],
+                "description": "EXPERIMENTAL. checkout to a previous history of the current lane. see also \"bit lane revert\"",
+                "extendedDescription": "",
+                "group": "ungrouped",
+                "private": false,
                 "arguments": [
                     {
-                        "name": "from",
-                        "description": "base lane for comparison"
-                    },
-                    {
-                        "name": "to",
-                        "description": "lane being compared to base lane"
+                        "name": "history-id",
+                        "description": "the history-id to checkout to. run \"bit lane history\" to list the ids"
                     }
                 ]
             },
             {
-                "name": "remove-readme [laneName]",
+                "name": "revert <history-id>",
                 "alias": "",
-                "options": [],
-                "description": "DEPRECATED (only use it if you have used add-readme and want to undo it). remove lane readme component",
-                "extendedDescription": "",
+                "options": [
+                    [
+                        "x",
+                        "skip-dependency-installation",
+                        "do not install dependencies of the checked out components"
+                    ]
+                ],
+                "description": "EXPERIMENTAL. revert to a previous history of the current lane. see also \"bit lane checkout\"",
+                "extendedDescription": "revert is similar to \"lane checkout\", but it keeps the versions and only change the files.\nchoose one or the other based on your needs.\nif you want to continue working on this lane and needs the changes from the history to be the head, then use \"lane revert\".\nif you want to fork the lane from a certain point in history, use \"lane checkout\" and create a new lane from it.",
                 "group": "ungrouped",
                 "private": false,
-                "skipWorkspace": false
-            },
+                "arguments": [
+                    {
+                        "name": "history-id",
+                        "description": "the history-id to checkout to. run \"bit lane history\" to list the ids"
+                    }
+                ]
+            },
+            {
+                "name": "merge <lane> [pattern]",
+                "alias": "",
+                "options": [
+                    [
+                        "",
+                        "manual",
+                        "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
+                    ],
+                    [
+                        "r",
+                        "auto-merge-resolve <merge-strategy>",
+                        "in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
+                    ],
+                    [
+                        "",
+                        "ours",
+                        "DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications"
+                    ],
+                    [
+                        "",
+                        "theirs",
+                        "DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes"
+                    ],
+                    [
+                        "",
+                        "workspace",
+                        "merge only lane components that are in the current workspace"
+                    ],
+                    [
+                        "",
+                        "no-auto-snap",
+                        "do not auto snap after merge completed without conflicts of diverged components (see command description)"
+                    ],
+                    [
+                        "",
+                        "no-snap",
+                        "do not pass snaps from the other lane even for non-diverged components (see command description)"
+                    ],
+                    [
+                        "",
+                        "tag",
+                        "auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)"
+                    ],
+                    [
+                        "",
+                        "build",
+                        "in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
+                    ],
+                    [
+                        "m",
+                        "message <message>",
+                        "override the default message for the auto snap"
+                    ],
+                    [
+                        "",
+                        "keep-readme",
+                        "skip deleting the lane readme component after merging"
+                    ],
+                    [
+                        "",
+                        "no-squash",
+                        "relevant for merging lanes into main, which by default squashes all lane snaps"
+                    ],
+                    [
+                        "",
+                        "squash",
+                        "relevant for merging a lane into another non-main lane, which by default does not squash"
+                    ],
+                    [
+                        "",
+                        "ignore-config-changes",
+                        "allow merging when components are modified due to config changes (such as dependencies) only and not files"
+                    ],
+                    [
+                        "",
+                        "verbose",
+                        "show details of components that were not merged successfully"
+                    ],
+                    [
+                        "x",
+                        "skip-dependency-installation",
+                        "do not install dependencies of the imported components"
+                    ],
+                    [
+                        "",
+                        "skip-fetch",
+                        "use the local state of target-lane if exits locally, without updating it from the remote"
+                    ],
+                    [
+                        "",
+                        "include-deps",
+                        "relevant for \"pattern\" and \"--workspace\". merge also dependencies of the specified components"
+                    ],
+                    [
+                        "",
+                        "resolve-unrelated [merge-strategy]",
+                        "relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
+                    ],
+                    [
+                        "",
+                        "include-non-lane-comps",
+                        "DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
+                    ],
+                    [
+                        "",
+                        "exclude-non-lane-comps",
+                        "when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)"
+                    ]
+                ],
+                "description": "merge a local or a remote lane to the current lane",
+                "extendedDescription": "by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n",
+                "private": true,
+                "remoteOp": true,
+                "arguments": [
+                    {
+                        "name": "lane",
+                        "description": "lane-name or full lane-id (if remote) to merge to the current lane"
+                    },
+                    {
+                        "name": "pattern",
+                        "description": "partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                    }
+                ]
+            },
+            {
+                "name": "merge-abort",
+                "alias": "",
+                "options": [
+                    [
+                        "",
+                        "verbose",
+                        "show details of components that didn't need to be merged"
+                    ],
+                    [
+                        "s",
+                        "silent",
+                        "skip confirmation"
+                    ],
+                    [
+                        "x",
+                        "skip-dependency-installation",
+                        "do not install packages of the imported components"
+                    ]
+                ],
+                "description": "abort the recent lane-merge. revert the lane object and checkout accordingly",
+                "extendedDescription": "restore the lane-object to its state before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane state",
+                "private": true,
+                "remoteOp": true
+            },
+            {
+                "name": "merge-move <new-lane-name>",
+                "alias": "",
+                "options": [
+                    [
+                        "s",
+                        "scope <scope-name>",
+                        "remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")"
+                    ]
+                ],
+                "description": "EXPERIMENT. move the current merge state into a new lane. the current lane will be reset",
+                "extendedDescription": "this command is useful when you got a messy merge state that from one hand you don't want\nto loose the changes, but on the other hand, you want to keep your lane without those changes.\nthis command does the following:\n1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)\n2. reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.",
+                "remoteOp": true
+            }
+        ]
+    },
+    {
+        "name": "switch <lane>",
+        "alias": "",
+        "options": [
+            [
+                "h",
+                "head",
+                "switch to the head of the lane/main (fetches the latest changes from the remote)"
+            ],
+            [
+                "r",
+                "auto-merge-resolve <merge-strategy>",
+                "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
+            ],
+            [
+                "",
+                "force-ours",
+                "do not merge, preserve local files as is"
+            ],
+            [
+                "",
+                "force-theirs",
+                "do not merge, just overwrite with incoming files"
+            ],
+            [
+                "a",
+                "get-all",
+                "DEPRECATED. this is currently the default behavior"
+            ],
+            [
+                "",
+                "workspace-only",
+                "checkout only the components in the workspace to the selected lane"
+            ],
+            [
+                "x",
+                "skip-dependency-installation",
+                "do not install dependencies of the imported components"
+            ],
+            [
+                "p",
+                "pattern <component-pattern>",
+                "switch only the lane components matching the specified component-pattern. only works when the workspace is empty\n\ncomponent name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+            ],
+            [
+                "n",
+                "alias <string>",
+                "relevant when the specified lane is a remote lane. create a local alias for the lane (doesnt affect the lane's name on the remote"
+            ],
+            [
+                "j",
+                "json",
+                "return the output as JSON"
+            ]
+        ],
+        "description": "switch to the specified lane",
+        "extendedDescription": "",
+        "group": "ungrouped",
+        "private": true,
+        "arguments": [
+            {
+                "name": "lane",
+                "description": "lane-name or lane-id (if lane is not local) to switch to"
+            }
+        ]
+    },
+    {
+        "name": "cat-lane-history <lane-name>",
+        "alias": "clh",
+        "options": [],
+        "description": "cat lane-history object by lane-name",
+        "extendedDescription": "",
+        "group": "ungrouped",
+        "private": true
+    },
+    {
+        "name": "apply <data>",
+        "alias": "",
+        "options": [
+            [
+                "",
+                "push",
+                "export the updated objects to the original scopes once done"
+            ],
+            [
+                "m",
+                "message <message>",
+                "log message describing the latest changes"
+            ],
+            [
+                "",
+                "lane <lane-id>",
+                "fetch the components from the given lane"
+            ],
+            [
+                "",
+                "build",
+                "run the build pipeline"
+            ],
+            [
+                "",
+                "skip-tests",
+                "skip running component tests during snap process"
+            ],
+            [
+                "",
+                "disable-snap-pipeline",
+                "skip the snap pipeline"
+            ],
+            [
+                "",
+                "ignore-build-errors",
+                "run the snap pipeline although the build pipeline failed"
+            ],
+            [
+                "",
+                "rebuild-deps-graph",
+                "do not reuse the saved dependencies graph, instead build it from scratch"
+            ],
+            [
+                "i",
+                "ignore-issues [issues]",
+                "ignore component issues (shown in \"bit status\" as \"issues found\"), issues to ignore:\n[MissingPackagesDependenciesOnFs, MissingManuallyConfiguredPackages, UntrackedDependencies, ResolveErrors, RelativeComponents, RelativeComponentsAuthored, ParseErrors, MissingDists, LegacyInsideHarmony, MissingDependenciesOnFs, ImportNonMainFiles, MultipleEnvs, MissingLinksFromNodeModulesToSrc, CircularDependencies, DuplicateComponentAndPackage, MergeConfigHasConflict, NonLoadedEnv, ExternalEnvWithoutVersion, RemovedDependencies, RemovedEnv, DeprecatedDependencies, SelfReference, ImportFromDirectory]\nto ignore multiple issues, separate them by a comma and wrap with quotes. to ignore all issues, specify \"*\"."
+            ],
+            [
+                "",
+                "tag",
+                "make a tag instead of a snap"
+            ],
+            [
+                "",
+                "stream",
+                "relevant for --json only. stream loader as json strings"
+            ],
+            [
+                "j",
+                "json",
+                "output as json format"
+            ],
+            [
+                "",
+                "snap",
+                "snap the components. default to keep them new"
+            ],
+            [
+                "",
+                "stream",
+                "relevant for --json only. stream loader as json strings"
+            ]
+        ],
+        "description": "apply files/config to components",
+        "extendedDescription": "the input data is a stringified JSON of an array of the following object.\n{\n  componentId: string;     // ids always have scope, so it's safe to parse them from string\n  dependencies?: string[]; // dependencies include versions. for components use component-id. e.g. [teambit.compilation/compiler@1.0.0, lodash@4.17.21]\n  aspects?: Record<string,any> // e.g. { \"teambit.react/react\": {}, \"teambit.envs/envs\": { \"env\": \"teambit.react/react\" } }\n  message?: string;       // tag-message.\n  files?: Array<{path: string, content: string}>; // replace content of specified source-files. the content is base64 encoded.\n  isNew?: boolean;        // if it's new, it'll be generated from the given files. otherwise, it'll be fetched from the scope and updated.\n  mainFile?: string;      // relevant when isNew is true. default to \"index.ts\".\n  newDependencies?: Array<{  // new dependencies (components and packages) to add.\n    id: string;              // component-id or package-name. e.g. \"teambit.react/react\" or \"lodash\".\n    version?: string;        // version of the package. e.g. \"2.0.3\". for packages, it is mandatory.\n    isComponent?: boolean;   // default true. if false, it's a package dependency\n    type?: 'runtime' | 'dev' | 'peer'; // default \"runtime\".\n  }>;\n  removeDependencies?: string[]; // component-id (for components) or package-name (for packages) to remove from the dependencies.\n  forkFrom?: string;      // origin id to fork from. the componentId is the new id. (no need to populate isNew prop).\n  version?: string; // relevant when passing \"--tag\". optionally, specify the semver to tag. default to \"patch\".\n}\nan example of the final data: '[{\"componentId\":\"ci.remote2/comp-b\",\"message\": \"first snap\"}]'",
+        "group": "ungrouped",
+        "private": true
+    },
+    {
+        "name": "doctor [diagnosis-name]",
+        "alias": "",
+        "options": [
+            [
+                "j",
+                "json",
+                "return diagnoses in json format"
+            ],
+            [
+                "",
+                "list",
+                "list all available diagnoses"
+            ],
+            [
+                "s",
+                "save [filePath]",
+                "save diagnoses to a file"
+            ],
+            [
+                "a",
+                "archive [filePath]",
+                "archive the workspace including diagnosis info (by default exclude node-modules and include .bit)"
+            ],
+            [
+                "n",
+                "include-node-modules",
+                "relevant for --archive. include node_modules in the archive file"
+            ],
+            [
+                "p",
+                "include-public",
+                "relevant for --archive. include public folder in the archive file"
+            ],
+            [
+                "e",
+                "exclude-local-scope",
+                "relevant for --archive. exclude .bit or .git/bit from the archive file"
+            ]
+        ],
+        "description": "diagnose a bit workspace",
+        "extendedDescription": "",
+        "group": "general",
+        "private": false
+    },
+    {
+        "name": "init [path]",
+        "alias": "",
+        "options": [
+            [
+                "n",
+                "name <workspace-name>",
+                "name of the workspace"
+            ],
+            [
+                "",
+                "generator <env-id>",
+                "for multiple, separate by a comma. add env-ids into the generators field in the workspace config for future \"bit create\" templates"
+            ],
+            [
+                "T",
+                "standalone",
+                "do not nest component store within .git directory and do not write config data inside package.json"
+            ],
+            [
+                "",
+                "no-package-json",
+                "do not generate package.json"
+            ],
+            [
+                "r",
+                "reset",
+                "write missing or damaged Bit files"
+            ],
+            [
+                "",
+                "reset-new",
+                "reset .bitmap file as if the components were newly added and remove all model data (objects)"
+            ],
+            [
+                "",
+                "reset-lane-new",
+                "same as reset-new, but it only resets components belong to lanes. main components are left intact"
+            ],
+            [
+                "",
+                "reset-hard",
+                "delete all Bit files and directories, including Bit configuration, tracking and model data. Useful for re-starting workspace from scratch"
+            ],
+            [
+                "",
+                "reset-scope",
+                "removes local scope (.bit or .git/bit). tags/snaps that have not been exported will be lost. workspace is left intact"
+            ],
+            [
+                "d",
+                "default-directory <default-directory>",
+                "set the default directory pattern to import/create components into"
+            ],
+            [
+                "",
+                "default-scope <default-scope>",
+                "set the default scope for components in the workspace"
+            ],
+            [
+                "f",
+                "force",
+                "force workspace initialization without clearing local objects"
+            ],
+            [
+                "b",
+                "bare [name]",
+                "initialize an empty bit bare scope"
+            ],
+            [
+                "s",
+                "shared <groupname>",
+                "add group write permissions to a scope properly"
+            ]
+        ],
+        "description": "create or reinitialize an empty workspace",
+        "extendedDescription": "if the current directory is already a workspace, it validates that bit files are correct and rewrite them if needed.",
+        "group": "start",
+        "private": false,
+        "skipWorkspace": true
+    },
+    {
+        "name": "version-history <sub-command>",
+        "alias": "vh",
+        "options": [],
+        "description": "manage the version-history of components",
+        "extendedDescription": "",
+        "group": "info",
+        "private": false,
+        "commands": [
             {
-                "name": "import <lane>",
+                "name": "graph <component-id>",
                 "alias": "",
                 "options": [
                     [
-                        "x",
-                        "skip-dependency-installation",
-                        "do not install dependencies of the imported components"
+                        "s",
+                        "short-hash",
+                        "show only 9 chars of the hash"
                     ],
                     [
-                        "p",
-                        "pattern <component-pattern>",
-                        "import only components from the lane that fit the specified component-pattern to the workspace. works only when the workspace is empty"
-                    ]
-                ],
-                "description": "import a remote lane to your workspace and switch to that lane",
-                "extendedDescription": "",
-                "group": "ungrouped",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "lane",
-                        "description": "the remote lane name"
-                    }
-                ]
-            },
-            {
-                "name": "remove-comp <component-pattern>",
-                "alias": "rc",
-                "options": [
-                    [
-                        "",
-                        "workspace-only",
-                        "do not mark the components as removed from the lane. instead, remove them from the workspace only"
+                        "m",
+                        "mark <string>",
+                        "paint the given node-ids in the graph in red color, for multiple, separate by commas"
                     ],
                     [
                         "",
-                        "update-main",
-                        "EXPERIMENTAL. remove, i.e. delete, component/s on the main lane after merging this lane into main"
-                    ]
-                ],
-                "description": "DEPRECATED. remove components when on a lane",
-                "extendedDescription": "",
-                "group": "collaborate",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "component-pattern",
-                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    }
-                ]
-            },
-            {
-                "name": "fetch [lane-id]",
-                "alias": "",
-                "options": [
-                    [
-                        "a",
-                        "all",
-                        "fetch all remote lanes"
-                    ]
-                ],
-                "description": "fetch component objects from lanes. if no lane-id is provided, it fetches from the current lane",
-                "extendedDescription": "note, it does not save the remote lanes objects locally, only the refs",
-                "group": "ungrouped",
-                "private": false
-            },
-            {
-                "name": "eject <component-pattern>",
-                "alias": "",
-                "options": [],
-                "description": "delete a component from the lane and install it as a package from main",
-                "extendedDescription": "NOTE: unlike \"bit eject\" on main, this command doesn't only remove the component from the\nworkspace, but also mark it as deleted from the lane, so it won't be merged later on.",
-                "group": "ungrouped",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "component-pattern",
-                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    }
-                ]
-            },
-            {
-                "name": "history [lane-name]",
-                "alias": "",
-                "options": [
+                        "png",
+                        "save the graph as a png file instead of svg. requires \"graphviz\" to be installed"
+                    ],
                     [
-                        "",
-                        "id <string>",
-                        "show a specific history item"
+                        "l",
+                        "layout <name>",
+                        "GraphVis layout. default to \"dot\". options are [circo, dot, fdp, neato, osage, patchwork, sfdp, twopi]"
                     ]
                 ],
-                "description": "EXPERIMENTAL. show lane history, default to the current lane",
+                "description": "generate a graph of the version history of a component and save as an SVG file",
                 "extendedDescription": "",
-                "group": "ungrouped",
+                "group": "info",
                 "private": false
             },
             {
-                "name": "history-diff <from-history-id> <to-history-id>",
-                "alias": "",
+                "name": "show <component-id>",
+                "alias": "vh",
                 "options": [
                     [
-                        "l",
-                        "lane <lane-name>",
-                        "the name of the lane to diff. if not specified, the current lane is used"
+                        "s",
+                        "short-hash",
+                        "show only 9 chars of the hash"
                     ],
                     [
-                        "",
-                        "pattern <component-pattern>",
-                        "show lane-diff for components conforming to the specified component-pattern only\ncomponent-pattern format: component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
-                    ]
-                ],
-                "description": "EXPERIMENTAL. show diff between two lane-history ids",
-                "extendedDescription": "run \"bit lane history\" to find these history-ids",
-                "group": "ungrouped",
-                "private": false
-            },
-            {
-                "name": "checkout <history-id>",
-                "alias": "",
-                "options": [
-                    [
-                        "x",
-                        "skip-dependency-installation",
-                        "do not install dependencies of the checked out components"
+                        "j",
+                        "json",
+                        "json format"
                     ]
                 ],
-                "description": "EXPERIMENTAL. checkout to a previous history of the current lane. see also \"bit lane revert\"",
+                "description": "show the version-history of a component",
                 "extendedDescription": "",
-                "group": "ungrouped",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "history-id",
-                        "description": "the history-id to checkout to. run \"bit lane history\" to list the ids"
-                    }
-                ]
-            },
-            {
-                "name": "revert <history-id>",
-                "alias": "",
-                "options": [
-                    [
-                        "x",
-                        "skip-dependency-installation",
-                        "do not install dependencies of the checked out components"
-                    ]
-                ],
-                "description": "EXPERIMENTAL. revert to a previous history of the current lane. see also \"bit lane checkout\"",
-                "extendedDescription": "revert is similar to \"lane checkout\", but it keeps the versions and only change the files.\nchoose one or the other based on your needs.\nif you want to continue working on this lane and needs the changes from the history to be the head, then use \"lane revert\".\nif you want to fork the lane from a certain point in history, use \"lane checkout\" and create a new lane from it.",
-                "group": "ungrouped",
-                "private": false,
-                "arguments": [
-                    {
-                        "name": "history-id",
-                        "description": "the history-id to checkout to. run \"bit lane history\" to list the ids"
-                    }
-                ]
-            },
-            {
-                "name": "merge <lane> [pattern]",
-                "alias": "",
-                "options": [
-                    [
-                        "",
-                        "manual",
-                        "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
-                    ],
-                    [
-                        "r",
-                        "auto-merge-resolve <merge-strategy>",
-                        "in case of a merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
-                    ],
-                    [
-                        "",
-                        "ours",
-                        "DEPRECATED. use --auto-merge-resolve. in case of a conflict, keep local modifications"
-                    ],
-                    [
-                        "",
-                        "theirs",
-                        "DEPRECATED. use --auto-merge-resolve. in case of a conflict, override local with incoming changes"
-                    ],
-                    [
-                        "",
-                        "workspace",
-                        "merge only lane components that are in the current workspace"
-                    ],
-                    [
-                        "",
-                        "no-auto-snap",
-                        "do not auto snap after merge completed without conflicts of diverged components (see command description)"
-                    ],
-                    [
-                        "",
-                        "no-snap",
-                        "do not pass snaps from the other lane even for non-diverged components (see command description)"
-                    ],
-                    [
-                        "",
-                        "tag",
-                        "auto-tag all lane components after merging into main (or tag-merge in case of snap-merge)"
-                    ],
-                    [
-                        "",
-                        "build",
-                        "in case of snap during the merge, run the build-pipeline (similar to bit snap --build)"
-                    ],
-                    [
-                        "m",
-                        "message <message>",
-                        "override the default message for the auto snap"
-                    ],
-                    [
-                        "",
-                        "keep-readme",
-                        "skip deleting the lane readme component after merging"
-                    ],
-                    [
-                        "",
-                        "no-squash",
-                        "relevant for merging lanes into main, which by default squashes all lane snaps"
-                    ],
-                    [
-                        "",
-                        "squash",
-                        "relevant for merging a lane into another non-main lane, which by default does not squash"
-                    ],
-                    [
-                        "",
-                        "ignore-config-changes",
-                        "allow merging when components are modified due to config changes (such as dependencies) only and not files"
-                    ],
-                    [
-                        "",
-                        "verbose",
-                        "show details of components that were not merged successfully"
-                    ],
-                    [
-                        "x",
-                        "skip-dependency-installation",
-                        "do not install dependencies of the imported components"
-                    ],
-                    [
-                        "",
-                        "skip-fetch",
-                        "use the local state of target-lane if exits locally, without updating it from the remote"
-                    ],
+                "group": "info",
+                "private": false
+            },
+            {
+                "name": "build <component-pattern>",
+                "alias": "",
+                "options": [
                     [
                         "",
-                        "include-deps",
-                        "relevant for \"pattern\" and \"--workspace\". merge also dependencies of the specified components"
+                        "from-snap <snap>",
+                        "build the version history from a specific snap. the pattern must be a single component-id"
                     ],
                     [
                         "",
-                        "resolve-unrelated [merge-strategy]",
-                        "relevant when a component on a lane and the component on main have nothing in common. merge-strategy can be \"ours\" (default) or \"theirs\""
+                        "from-all-lanes",
+                        "build the version history from the heads of all lanes that include this component"
                     ],
                     [
                         "",
-                        "include-non-lane-comps",
-                        "DEPRECATED (this is now the default). when merging main, include workspace components that are not on the lane (by default only lane components are merged)"
+                        "delete-existing",
+                        "delete the existing version history before building it"
                     ],
                     [
                         "",
-                        "exclude-non-lane-comps",
-                        "when merging main into a lane, exclude workspace components that are not on the lane (by default all workspace components are merged)"
+                        "remote <scope>",
+                        "make the change on the remote scope"
                     ]
                 ],
-                "description": "merge a local or a remote lane to the current lane",
-                "extendedDescription": "by default, the provided lane will be fetched from the remote before merging.\nto merge the lane from the local scope without updating it first, use \"--skip-fetch\" flag.\n\nwhen the current and merge candidate lanes are diverged in history and the files could be merged with no conflicts,\nthese components will be snap-merged to complete the merge. use \"no-auto-snap\" to opt-out, or \"tag\" to tag instead.\n\nwhen the components are not diverged in history, and the current lane is behind the merge candidate, the merge will\nsimply update the components and the heads according to the merge candidate.\nto opt-out, use \"--no-snap\", the components will be written as the merge candidate, and will be left as modified.\n\nin case a component in both ends don't share history (no snap is found in common), the merge will require \"--resolve-unrelated\" flag.\nthis flag keeps the history of one end and saves a reference to the other end. the decision of which end to keep is determined by the following:\n1. if the component exists on main, then the history linked to main will be kept.\nin this case, the strategy of \"--resolve-unrelated\" only determines which source-code to keep. it's not about the history.\n2. if the component doesn't exist on main, then by default, the history of the current lane will be kept.\nunless \"--resolve-unrelated\" is set to \"theirs\", in which case the history of the other lane will be kept.\n2. a. an edge case: if the component is deleted on the current lane, the strategy will always be \"theirs\".\nso then the history (and the source-code) of the other lane will be kept.\n",
-                "private": true,
-                "remoteOp": true,
+                "description": "rebuild the version history of a component. helpful when it got corrupted for some reason",
+                "extendedDescription": "",
+                "group": "info",
+                "private": false,
                 "arguments": [
                     {
-                        "name": "lane",
-                        "description": "lane-name or full lane-id (if remote) to merge to the current lane"
-                    },
-                    {
-                        "name": "pattern",
-                        "description": "partially merge the lane - only components that match the specified component-pattern\nComponent pattern format: component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                        "name": "component-pattern",
+                        "description": "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
                     }
                 ]
-            },
+            }
+        ]
+    },
+    {
+        "name": "cat-version-history <id>",
+        "alias": "cvh",
+        "options": [
+            [
+                "j",
+                "json",
+                "json format"
+            ]
+        ],
+        "description": "cat version-history object by component-id",
+        "extendedDescription": "",
+        "group": "ungrouped",
+        "private": true
+    },
+    {
+        "name": "stash <sub-command>",
+        "alias": "",
+        "options": [
+            [
+                "p",
+                "pattern",
+                "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+            ],
+            [
+                "m",
+                "message <string>",
+                "message to be attached to the stashed components"
+            ]
+        ],
+        "description": "stash modified components",
+        "extendedDescription": "",
+        "group": "development",
+        "private": false,
+        "commands": [
             {
-                "name": "merge-abort",
-                "alias": "",
+                "name": "save",
+                "alias": "s",
                 "options": [
                     [
-                        "",
-                        "verbose",
-                        "show details of components that didn't need to be merged"
+                        "p",
+                        "pattern",
+                        "component name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
                     ],
                     [
-                        "s",
-                        "silent",
-                        "skip confirmation"
+                        "",
+                        "include-new",
+                        "EXPERIMENTAL. by default, only modified components are stashed. use this flag to include new components"
                     ],
                     [
-                        "x",
-                        "skip-dependency-installation",
-                        "do not install packages of the imported components"
+                        "m",
+                        "message <string>",
+                        "message to be attached to the stashed components"
                     ]
                 ],
-                "description": "abort the recent lane-merge. revert the lane object and checkout accordingly",
-                "extendedDescription": "restore the lane-object to its state before the last \"bit lane merge\" command.\nalso, checkout the workspace components according to the restored lane state",
-                "private": true,
-                "remoteOp": true
+                "description": "stash modified components",
+                "extendedDescription": "",
+                "group": "development",
+                "private": false
             },
             {
-                "name": "merge-move <new-lane-name>",
-                "alias": "",
+                "name": "load [stash-id]",
+                "alias": "pop",
                 "options": [
                     [
-                        "s",
-                        "scope <scope-name>",
-                        "remote scope to which this lane will be exported, default to the workspace.json's defaultScope (can be changed up to first export of the lane with \"bit lane change-scope\")"
+                        "r",
+                        "auto-merge-resolve <merge-strategy>",
+                        "in case of merge conflict, resolve according to the provided strategy: [ours, theirs, manual]"
+                    ],
+                    [
+                        "",
+                        "manual",
+                        "same as \"--auto-merge-resolve manual\". in case of merge conflict, write the files with the conflict markers"
+                    ],
+                    [
+                        "",
+                        "force-ours",
+                        "do not merge, preserve local files as is"
+                    ],
+                    [
+                        "",
+                        "force-theirs",
+                        "do not merge, just overwrite with incoming files"
                     ]
                 ],
-                "description": "EXPERIMENT. move the current merge state into a new lane. the current lane will be reset",
-                "extendedDescription": "this command is useful when you got a messy merge state that from one hand you don't want\nto loose the changes, but on the other hand, you want to keep your lane without those changes.\nthis command does the following:\n1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact)\n2. reset the current lane to the state before the merge. so then once done with the new lane, you can switch to the current lane and it'll be clean.",
-                "remoteOp": true
+                "description": "apply the changes according to the stash. if no stash-id provided, it loads the latest stash",
+                "extendedDescription": "",
+                "group": "development",
+                "private": false
+            },
+            {
+                "name": "list",
+                "alias": "",
+                "options": [],
+                "description": "list stash",
+                "extendedDescription": "",
+                "group": "development",
+                "private": false
             }
         ]
     },
     {
-        "name": "switch <lane>",
+        "name": "log <id>",
         "alias": "",
         "options": [
-            [
-                "h",
-                "head",
-                "switch to the head of the lane/main (fetches the latest changes from the remote)"
-            ],
             [
                 "r",
-                "auto-merge-resolve <merge-strategy>",
-                "merge local changes with the checked out version. strategy should be \"theirs\", \"ours\" or \"manual\""
-            ],
-            [
-                "",
-                "force-ours",
-                "do not merge, preserve local files as is"
+                "remote",
+                "show log of a remote component"
             ],
             [
                 "",
-                "force-theirs",
-                "do not merge, just overwrite with incoming files"
-            ],
-            [
-                "a",
-                "get-all",
-                "DEPRECATED. this is currently the default behavior"
+                "parents",
+                "show parents and lanes data"
             ],
             [
-                "",
-                "workspace-only",
-                "checkout only the components in the workspace to the selected lane"
+                "o",
+                "one-line",
+                "show each log entry in one line"
             ],
             [
-                "x",
-                "skip-dependency-installation",
-                "do not install dependencies of the imported components"
+                "f",
+                "full-hash",
+                "show full hash of the snap (default to the first 9 characters for --one-line/--parents flags)"
             ],
             [
-                "p",
-                "pattern <component-pattern>",
-                "switch only the lane components matching the specified component-pattern. only works when the workspace is empty\n\ncomponent name, component id, or component pattern. use component pattern to select multiple components.\nwrap the pattern with quotes. use comma to separate patterns and \"!\" to exclude. e.g. \"ui/**, !ui/button\".\nuse '$' prefix to filter by states/attributes, e.g. '$deprecated', '$modified' or '$env:teambit.react/react'.\nuse `bit pattern --help` to understand patterns better and `bit pattern <pattern>` to validate the pattern."
+                "m",
+                "full-message",
+                "show full message of the snap (default to the first line for --one-line/--parents flags)"
             ],
             [
-                "n",
-                "alias <string>",
-                "relevant when the specified lane is a remote lane. create a local alias for the lane (doesnt affect the lane's name on the remote"
+                "",
+                "show-hidden",
+                "show hidden snaps (snaps are marked as hidden typically when the following tag has the same files/config)"
             ],
             [
                 "j",
                 "json",
-                "return the output as JSON"
+                "json format"
             ]
         ],
-        "description": "switch to the specified lane",
+        "description": "show components(s) version history",
         "extendedDescription": "",
-        "group": "ungrouped",
-        "private": true,
+        "group": "info",
+        "private": false,
+        "remoteOp": true,
+        "skipWorkspace": true,
         "arguments": [
             {
-                "name": "lane",
-                "description": "lane-name or lane-id (if lane is not local) to switch to"
+                "name": "id",
+                "description": "component-id or component-name"
             }
         ]
     },
     {
-        "name": "cat-lane-history <lane-name>",
-        "alias": "clh",
-        "options": [],
-        "description": "cat lane-history object by lane-name",
+        "name": "log-file <filepath>",
+        "alias": "",
+        "options": [
+            [
+                "o",
+                "one-line",
+                "show each log entry in one line"
+            ]
+        ],
+        "description": "EXPERIMENTAL. show file history",
         "extendedDescription": "",
-        "group": "ungrouped",
-        "private": true
+        "group": "info",
+        "private": false,
+        "arguments": [
+            {
+                "name": "filepath",
+                "description": "file path relative to the workspace"
+            }
+        ]
+    },
+    {
+        "name": "blame <filepath>",
+        "alias": "",
+        "options": [
+            [
+                "m",
+                "include-message",
+                "show the commit message"
+            ]
+        ],
+        "description": "EXPERIMENTAL. per line, show who and when was the last to modify it",
+        "extendedDescription": "",
+        "group": "info",
+        "private": false,
+        "arguments": [
+            {
+                "name": "filepath",
+                "description": "file path relative to the workspace"
+            }
+        ]
     },
     {
         "name": "server",