diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index efc448d..1786300 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,14 +4,17 @@ on:
   push:
     tags:
       - 'v*'
+    branches:
+      - develop
 
 permissions:
   id-token: write  # Required for OIDC
-  contents: read
+  contents: write  # Required for GitHub pre-releases
 
 jobs:
-  publish:
-    name: Publish to npm
+  publish-release:
+    name: Release (tag)
+    if: startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
 
     steps:
@@ -40,4 +43,71 @@ jobs:
         run: pnpm run test
 
       - name: Publish to npm
-        run: npm publish
+        run: npm publish --access public
+
+  publish-prerelease:
+    name: Pre-release (develop)
+    if: github.ref == 'refs/heads/develop'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.28.0
+
+      - name: Use Node.js 24
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Configure Git
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Generate pre-release version
+        run: |
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          TIMESTAMP=$(date +%Y%m%d%H%M%S)
+          PRE_RELEASE_VERSION="${CURRENT_VERSION}-beta.${TIMESTAMP}.${SHORT_SHA}"
+          echo "Pre-release version: $PRE_RELEASE_VERSION"
+          echo "PRE_RELEASE_VERSION=$PRE_RELEASE_VERSION" >> "$GITHUB_ENV"
+          npm version "$PRE_RELEASE_VERSION" --no-git-tag-version
+
+      - name: Build project
+        run: pnpm run build
+
+      - name: Run tests
+        run: pnpm run test
+
+      - name: Publish pre-release to npm
+        run: npm publish --tag beta --access public
+
+      - name: Create GitHub pre-release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release create "v${PRE_RELEASE_VERSION}" \
+            --title "Pre-release v${PRE_RELEASE_VERSION}" \
+            --notes "Pre-release from develop branch.
+
+          - Commit: ${{ github.sha }}
+          - Branch: ${{ github.ref_name }}
+
+          Install with:
+          \`\`\`bash
+          npm install -g @hackmd/hackmd-cli@beta
+          \`\`\`" \
+            --prerelease
diff --git a/.gitignore b/.gitignore
index fa25531..c74c0ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+package-lock.json
 *-debug.log
 *-error.log
 /.nyc_output
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 342fd3d..7d9937d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 All notable changes to HackMD-CLI will be documented in this file.
 
+## 2.5.0
+
+### Added
+
+- Personal folder commands: `folders`, `folders create`, `folders update`, `folders delete`, and `folders order`
+- Team folder commands: `team-folders`, `team-folders create`, `team-folders update`, `team-folders delete`, and `team-folders order`
+- Agent skill (`hackmd-cli/SKILL.md`) with auto-packaging scripts for Cursor and other AI tooling
+
+### Changed
+
+- Upgraded `@hackmd/api` to v2.6.0
+
+### Fixed
+
+- Folder update command now returns silently on success
+- Folder command examples use hex color codes
+
 ## 2.4.0
 
 ### Added
diff --git a/README.md b/README.md
index c43264b..8ac1e55 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,13 @@
 
 ## v2 notice
 
-`hackmd-cli` v2 now only supports the official HackMD instance([hackmd.io](https://hackmd.io)) and HackMD EE instances after version `1.38.1`. CodiMD is not supported anymore. If you want to use the CLI tools with CodiMD, please check out the [`v1.x` README](https://github.com/hackmdio/hackmd-cli/tree/v1.2.0) and follow the instruction there.
+`hackmd-cli` v2 now only supports the official HackMD instance ([hackmd.io](https://hackmd.io)) and HackMD EE instances after version `1.38.1`. CodiMD is not supported in this package.
+
+**CodiMD users:** A dedicated standalone CLI is now available at [hackmdio/codimd-cli](https://github.com/hackmdio/codimd-cli). Please refer to that repository for installation and usage instructions.
 
 ### Migrating from v1.x
 
-1. If you are using the CLI with CodiMD, please follow the [`v1.x` README](https://github.com/hackmdio/hackmd-cli/tree/v1.2.0)
+1. If you are using the CLI with CodiMD, please use the standalone [codimd-cli](https://github.com/hackmdio/codimd-cli) instead.
 2. If you are using the CLI with HackMD([hackmd.io](https://hackmd.io)) or HackMD EE(Enterprise Edition) instances:
     * **You're using the JSON file-based config**: Remove `~/.hackmd/config.json` and start over again. You can start with [configuration](#configuration) section.
     * **You're using environment variable based config**: `HMD_CLI_SERVER_URL` has been replaced with `HMD_API_ENDPOINT_URL`. And `HMD_API_ENDPOINT_URL` may vary depending on your instance. Please check contact your instance admin to get the correct `HMD_API_ENDPOINT_URL`. For generating access token, please check the [configuration](#configuration) section. You'll need to set the `HMD_API_ACCESS_TOKEN` environment variable.
@@ -29,7 +31,7 @@ $ npm install -g @hackmd/hackmd-cli
 $ hackmd-cli COMMAND
 running command...
 $ hackmd-cli (--version|-v)
-@hackmd/hackmd-cli/2.4.0 darwin-arm64 node-v24.13.0
+@hackmd/hackmd-cli/2.5.0 darwin-arm64 node-v26.0.0
 $ hackmd-cli --help [COMMAND]
 USAGE
   $ hackmd-cli COMMAND
@@ -100,6 +102,11 @@ All available configurations are listed in the table below.
 <!-- commands -->
 * [`hackmd-cli autocomplete [SHELL]`](#hackmd-cli-autocomplete-shell)
 * [`hackmd-cli export`](#hackmd-cli-export)
+* [`hackmd-cli folders`](#hackmd-cli-folders)
+* [`hackmd-cli folders create`](#hackmd-cli-folders-create)
+* [`hackmd-cli folders delete`](#hackmd-cli-folders-delete)
+* [`hackmd-cli folders order`](#hackmd-cli-folders-order)
+* [`hackmd-cli folders update`](#hackmd-cli-folders-update)
 * [`hackmd-cli help [COMMANDS]`](#hackmd-cli-help-commands)
 * [`hackmd-cli history`](#hackmd-cli-history)
 * [`hackmd-cli login`](#hackmd-cli-login)
@@ -108,6 +115,11 @@ All available configurations are listed in the table below.
 * [`hackmd-cli notes create`](#hackmd-cli-notes-create)
 * [`hackmd-cli notes delete`](#hackmd-cli-notes-delete)
 * [`hackmd-cli notes update`](#hackmd-cli-notes-update)
+* [`hackmd-cli team-folders`](#hackmd-cli-team-folders)
+* [`hackmd-cli team-folders create`](#hackmd-cli-team-folders-create)
+* [`hackmd-cli team-folders delete`](#hackmd-cli-team-folders-delete)
+* [`hackmd-cli team-folders order`](#hackmd-cli-team-folders-order)
+* [`hackmd-cli team-folders update`](#hackmd-cli-team-folders-update)
 * [`hackmd-cli team-notes`](#hackmd-cli-team-notes)
 * [`hackmd-cli team-notes create`](#hackmd-cli-team-notes-create)
 * [`hackmd-cli team-notes delete`](#hackmd-cli-team-notes-delete)
@@ -167,7 +179,143 @@ EXAMPLES
   # A note to be exported
 ```
 
-_See code: [src/commands/export.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/export.ts)_
+_See code: [src/commands/export.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/export.ts)_
+
+## `hackmd-cli folders`
+
+HackMD folders commands
+
+```
+USAGE
+  $ hackmd-cli folders [--folderId <value>] [-h] [--columns <value> | -x] [--sort <value>] [--filter <value>]
+    [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+
+FLAGS
+  -h, --help          Show CLI help.
+  -x, --extended      show extra columns
+  --columns=<value>   only show provided columns (comma-separated)
+  --csv               output is csv format [alias: --output=csv]
+  --filter=<value>    filter property by partial string matching, ex: name=foo
+  --folderId=<value>  HackMD folder id
+  --no-header         hide table header from output
+  --no-truncate       do not truncate output to fit screen
+  --output=<option>   output in a more machine friendly format
+                      <options: csv|json|yaml>
+  --sort=<value>      property to sort by (prepend '-' for descending)
+
+DESCRIPTION
+  HackMD folders commands
+
+EXAMPLES
+  $ hackmd-cli folders
+  ID                                   Color   Description           Icon  Name        Parent Folder ID
+  ──────────────────────────────────── ─────── ───────────────────── ───── ─────────── ────────────────────────────────────
+  91722050-bf47-4334-9e5d-87125a724c29 #4F46E5 Project documentation 1F600 engineering fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c
+```
+
+_See code: [src/commands/folders/index.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/folders/index.ts)_
+
+## `hackmd-cli folders create`
+
+Create a folder
+
+```
+USAGE
+  $ hackmd-cli folders create [--color <value>] [--description <value>] [-h] [--icon <value>] [--name <value>]
+    [--parentFolderId <value>] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  |
+    [--csv | --no-truncate]] [--no-header | ]
+
+FLAGS
+  -h, --help                Show CLI help.
+  -x, --extended            show extra columns
+  --color=<value>           folder color
+  --columns=<value>         only show provided columns (comma-separated)
+  --csv                     output is csv format [alias: --output=csv]
+  --description=<value>     folder description
+  --filter=<value>          filter property by partial string matching, ex: name=foo
+  --icon=<value>            folder icon
+  --name=<value>            folder name
+  --no-header               hide table header from output
+  --no-truncate             do not truncate output to fit screen
+  --output=<option>         output in a more machine friendly format
+                            <options: csv|json|yaml>
+  --parentFolderId=<value>  parent folder id
+  --sort=<value>            property to sort by (prepend '-' for descending)
+
+DESCRIPTION
+  Create a folder
+
+EXAMPLES
+  $ hackmd-cli folders create --name='docs' --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --description='Docs' --icon=1F600 --color=#4F46E5
+  ID                                   Name Parent Folder ID                     Color   Description Icon
+  ──────────────────────────────────── ──── ──────────────────────────────────── ─────── ─────────── ─────
+  a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d docs fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c #4F46E5 Docs        1F600
+```
+
+## `hackmd-cli folders delete`
+
+Delete a folder
+
+```
+USAGE
+  $ hackmd-cli folders delete [--folderId <value>] [-h]
+
+FLAGS
+  -h, --help          Show CLI help.
+  --folderId=<value>  HackMD folder id
+
+DESCRIPTION
+  Delete a folder
+
+EXAMPLES
+  $ hackmd-cli folders delete --folderId=a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d
+```
+
+## `hackmd-cli folders order`
+
+Get or update folder order
+
+```
+USAGE
+  $ hackmd-cli folders order [-h] [--order <value>]
+
+FLAGS
+  -h, --help       Show CLI help.
+  --order=<value>  folder order JSON, e.g. {"root":["folder-id"]}
+
+DESCRIPTION
+  Get or update folder order
+
+EXAMPLES
+  $ hackmd-cli folders order
+
+  $ hackmd-cli folders order --order='{"root":["91722050-bf47-4334-9e5d-87125a724c29","fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c"]}'
+```
+
+## `hackmd-cli folders update`
+
+Update folder
+
+```
+USAGE
+  $ hackmd-cli folders update [--color <value>] [--description <value>] [--folderId <value>] [-h] [--icon <value>]
+    [--name <value>] [--parentFolderId <value>]
+
+FLAGS
+  -h, --help                Show CLI help.
+  --color=<value>           folder color
+  --description=<value>     folder description
+  --folderId=<value>        HackMD folder id
+  --icon=<value>            folder icon
+  --name=<value>            folder name
+  --parentFolderId=<value>  parent folder id
+
+DESCRIPTION
+  Update folder
+
+EXAMPLES
+  $ hackmd-cli folders update --folderId=a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d --name='docs' --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --description='Docs' --icon=1F600 --color=#4F46E5
+```
 
 ## `hackmd-cli help [COMMANDS]`
 
@@ -221,7 +369,7 @@ EXAMPLES
   BnC6gN0_TfStV2KKmPPXeg Welcome to your team's workspace null                   CLI-test
 ```
 
-_See code: [src/commands/history.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/history.ts)_
+_See code: [src/commands/history.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/history.ts)_
 
 ## `hackmd-cli login`
 
@@ -243,7 +391,7 @@ EXAMPLES
   Login successfully
 ```
 
-_See code: [src/commands/login.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/login.ts)_
 
 ## `hackmd-cli logout`
 
@@ -264,7 +412,7 @@ EXAMPLES
   You've logged out successfully
 ```
 
-_See code: [src/commands/logout.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/logout.ts)_
+_See code: [src/commands/logout.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/logout.ts)_
 
 ## `hackmd-cli notes`
 
@@ -298,7 +446,7 @@ EXAMPLES
   raUuSTetT5uQbqQfLnz9lA CLI test note                    gvfz2UB5THiKABQJQnLs6Q null
 ```
 
-_See code: [src/commands/notes/index.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/notes/index.ts)_
+_See code: [src/commands/notes/index.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/notes/index.ts)_
 
 ## `hackmd-cli notes create`
 
@@ -306,9 +454,9 @@ Create a note
 
 ```
 USAGE
-  $ hackmd-cli notes create [--commentPermission <value>] [--content <value>] [-e] [-h] [--readPermission <value>]
-    [--title <value>] [--writePermission <value>] [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output
-    csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+  $ hackmd-cli notes create [--commentPermission <value>] [--content <value>] [-e] [-h] [--parentFolderId <value>]
+    [--readPermission <value>] [--tags <value>] [--title <value>] [--writePermission <value>] [--columns <value> | -x]
+    [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
 
 FLAGS
   -e, --editor                 create note with $EDITOR
@@ -323,8 +471,10 @@ FLAGS
   --no-truncate                do not truncate output to fit screen
   --output=<option>            output in a more machine friendly format
                                <options: csv|json|yaml>
+  --parentFolderId=<value>     parent folder id
   --readPermission=<value>     set note permission: owner, signed_in, guest
   --sort=<value>               property to sort by (prepend '-' for descending)
+  --tags=<value>               set note tags, comma-separated (e.g. tag1,tag2)
   --title=<value>              new note title
   --writePermission=<value>    set note permission: owner, signed_in, guest
 
@@ -332,11 +482,15 @@ DESCRIPTION
   Create a note
 
 EXAMPLES
-  notes create --content='# A new note' --readPermission=owner --writePermission=owner --commentPermission=disabled
+  $ hackmd-cli notes create --content='# A new note' --readPermission=owner --writePermission=owner --commentPermission=disabled
+  ID                     Title                            User Path               Team Path
+  ────────────────────── ──────────────────────────────── ────────────────────── ────────
+  raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q null     
 
+  $ hackmd-cli notes create --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --content='# A new note' --readPermission=owner --writePermission=owner --commentPermission=disabled
   ID                     Title                            User Path               Team Path
-  ────────────────────── ──────────────────────────────── ──────────────────────  ────────
-  raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q  null
+  ────────────────────── ──────────────────────────────── ────────────────────── ────────
+  raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q null     
 
   Or you can pipe content via Unix pipeline:
 
@@ -364,22 +518,175 @@ EXAMPLES
 
 ## `hackmd-cli notes update`
 
-Update note content
+Update note
 
 ```
 USAGE
-  $ hackmd-cli notes update [--content <value>] [-h] [--noteId <value>]
+  $ hackmd-cli notes update [--content <value>] [-h] [--noteId <value>] [--parentFolderId <value>] [--permalink <value>]
+    [--readPermission <value>] [--tags <value>] [--writePermission <value>]
 
 FLAGS
-  -h, --help         Show CLI help.
-  --content=<value>  new note content
-  --noteId=<value>   HackMD note id
+  -h, --help                    Show CLI help.
+  --content=<value>             new note content
+  --noteId=<value>              HackMD note id
+  --parentFolderId=<value>      parent folder id
+  --permalink=<value>           note permalink
+  --readPermission=<value>      set note permission: owner, signed_in, guest
+  --tags=<value>                set note tags, comma-separated (e.g. tag1,tag2)
+  --writePermission=<value>     set note permission: owner, signed_in, guest
 
 DESCRIPTION
-  Update note content
+  Update note
 
 EXAMPLES
   $ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --content='# A new title'
+
+  $ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --content='# A new title'
+
+  $ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --readPermission=owner --writePermission=owner
+
+  $ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --tags=tag1,tag2
+```
+
+## `hackmd-cli team-folders`
+
+HackMD team folders commands
+
+```
+USAGE
+  $ hackmd-cli team-folders [--folderId <value>] [-h] [--teamPath <value>] [--columns <value> | -x] [--sort
+    <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+
+FLAGS
+  -h, --help          Show CLI help.
+  -x, --extended      show extra columns
+  --columns=<value>   only show provided columns (comma-separated)
+  --csv               output is csv format [alias: --output=csv]
+  --filter=<value>    filter property by partial string matching, ex: name=foo
+  --folderId=<value>  HackMD folder id
+  --no-header         hide table header from output
+  --no-truncate       do not truncate output to fit screen
+  --output=<option>   output in a more machine friendly format
+                      <options: csv|json|yaml>
+  --sort=<value>      property to sort by (prepend '-' for descending)
+  --teamPath=<value>  HackMD team path
+
+DESCRIPTION
+  HackMD team folders commands
+
+EXAMPLES
+  $ hackmd-cli team-folders --teamPath engineering
+  ID                                   Color   Description     Icon  Name       Parent Folder ID
+  ──────────────────────────────────── ─────── ─────────────── ───── ────────── ────────────────────────────────────
+  91722050-bf47-4334-9e5d-87125a724c29 #4F46E5 Team handbook    1F600 team-docs fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c
+```
+
+_See code: [src/commands/team-folders/index.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/team-folders/index.ts)_
+
+## `hackmd-cli team-folders create`
+
+Create a team folder
+
+```
+USAGE
+  $ hackmd-cli team-folders create [--color <value>] [--description <value>] [-h] [--icon <value>] [--name <value>]
+    [--parentFolderId <value>] [--teamPath <value>] [--columns <value> | -x] [--sort <value>] [--filter <value>]
+    [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+
+FLAGS
+  -h, --help                Show CLI help.
+  -x, --extended            show extra columns
+  --color=<value>           folder color
+  --columns=<value>         only show provided columns (comma-separated)
+  --csv                     output is csv format [alias: --output=csv]
+  --description=<value>     folder description
+  --filter=<value>          filter property by partial string matching, ex: name=foo
+  --icon=<value>            folder icon
+  --name=<value>            folder name
+  --no-header               hide table header from output
+  --no-truncate             do not truncate output to fit screen
+  --output=<option>         output in a more machine friendly format
+                            <options: csv|json|yaml>
+  --parentFolderId=<value>  parent folder id
+  --sort=<value>            property to sort by (prepend '-' for descending)
+  --teamPath=<value>        HackMD team path
+
+DESCRIPTION
+  Create a team folder
+
+EXAMPLES
+  $ hackmd-cli team-folders create --teamPath=CLI-test --name='team-docs' --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --description='Docs' --icon=1F600 --color=#4F46E5
+  ID                                   Name      Parent Folder ID                     Color   Description Icon
+  ──────────────────────────────────── ───────── ──────────────────────────────────── ─────── ─────────── ─────
+  a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d team-docs fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c #4F46E5 Docs        1F600
+```
+
+## `hackmd-cli team-folders delete`
+
+Delete a team folder
+
+```
+USAGE
+  $ hackmd-cli team-folders delete [--folderId <value>] [-h] [--teamPath <value>]
+
+FLAGS
+  -h, --help          Show CLI help.
+  --folderId=<value>  HackMD folder id
+  --teamPath=<value>  HackMD team path
+
+DESCRIPTION
+  Delete a team folder
+
+EXAMPLES
+  $ hackmd-cli team-folders delete --teamPath=CLI-test --folderId=a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d
+```
+
+## `hackmd-cli team-folders order`
+
+Get or update team folder order
+
+```
+USAGE
+  $ hackmd-cli team-folders order [-h] [--order <value>] [--teamPath <value>]
+
+FLAGS
+  -h, --help          Show CLI help.
+  --order=<value>     folder order JSON, e.g. {"root":["folder-id"]}
+  --teamPath=<value>  HackMD team path
+
+DESCRIPTION
+  Get or update team folder order
+
+EXAMPLES
+  $ hackmd-cli team-folders order --teamPath=CLI-test
+
+  $ hackmd-cli team-folders order --teamPath=CLI-test --order='{"root":["91722050-bf47-4334-9e5d-87125a724c29","fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c"]}'
+```
+
+## `hackmd-cli team-folders update`
+
+Update team folder
+
+```
+USAGE
+  $ hackmd-cli team-folders update [--color <value>] [--description <value>] [--folderId <value>] [-h] [--icon <value>]
+    [--name <value>] [--parentFolderId <value>] [--teamPath <value>]
+
+FLAGS
+  -h, --help                Show CLI help.
+  --color=<value>           folder color
+  --description=<value>     folder description
+  --folderId=<value>        HackMD folder id
+  --icon=<value>            folder icon
+  --name=<value>            folder name
+  --parentFolderId=<value>  parent folder id
+  --teamPath=<value>        HackMD team path
+
+DESCRIPTION
+  Update team folder
+
+EXAMPLES
+  $ hackmd-cli team-folders update --teamPath=CLI-test --folderId=a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d --name='team-docs' --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --description='Docs' --icon=1F600 --color=#4F46E5
 ```
 
 ## `hackmd-cli team-notes`
@@ -415,7 +722,7 @@ EXAMPLES
   BnC6gN0_TfStV2KKmPPXeg Welcome to your team's workspace null     CLI-test
 ```
 
-_See code: [src/commands/team-notes/index.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/team-notes/index.ts)_
+_See code: [src/commands/team-notes/index.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/team-notes/index.ts)_
 
 ## `hackmd-cli team-notes create`
 
@@ -423,9 +730,10 @@ Create a team note
 
 ```
 USAGE
-  $ hackmd-cli team-notes create [--commentPermission <value>] [--content <value>] [-e] [-h] [--readPermission <value>]
-    [--teamPath <value>] [--title <value>] [--writePermission <value>] [--columns <value> | -x] [--sort <value>]
-    [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]] [--no-header | ]
+  $ hackmd-cli team-notes create [--commentPermission <value>] [--content <value>] [-e] [-h] [--parentFolderId <value>]
+    [--readPermission <value>] [--tags <value>] [--teamPath <value>] [--title <value>] [--writePermission <value>]
+    [--columns <value> | -x] [--sort <value>] [--filter <value>] [--output csv|json|yaml |  | [--csv | --no-truncate]]
+    [--no-header | ]
 
 FLAGS
   -e, --editor                 create note with $EDITOR
@@ -440,8 +748,10 @@ FLAGS
   --no-truncate                do not truncate output to fit screen
   --output=<option>            output in a more machine friendly format
                                <options: csv|json|yaml>
+  --parentFolderId=<value>     parent folder id
   --readPermission=<value>     set note permission: owner, signed_in, guest
   --sort=<value>               property to sort by (prepend '-' for descending)
+  --tags=<value>               set note tags, comma-separated (e.g. tag1,tag2)
   --teamPath=<value>           HackMD team path
   --title=<value>              new note title
   --writePermission=<value>    set note permission: owner, signed_in, guest
@@ -450,14 +760,19 @@ DESCRIPTION
   Create a team note
 
 EXAMPLES
-  team-notes:create --teamPath=CLI-test --content='# A new note' --readPermission=owner --writePermission=owner --commentPermission=disabled
+  $ hackmd-cli team-notes create --teamPath=CLI-test --content='# A new note' --readPermission=owner --writePermission=owner --commentPermission=disabled
+  ID                     Title                            User Path              Team Path
+  ────────────────────── ──────────────────────────────── ────────────────────── ────────
+  raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q null     
+
+  $ hackmd-cli team-notes create --teamPath=CLI-test --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --content='# A new note' --readPermission=owner --writePermission=owner --commentPermission=disabled
   ID                     Title                            User Path              Team Path
   ────────────────────── ──────────────────────────────── ────────────────────── ────────
   raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q null     
 
   Or you can pipe content via Unix pipeline:
 
-  cat README.md | hackmd-cli notes create --teamPath=CLI-test
+  cat README.md | hackmd-cli team-notes create --teamPath=CLI-test
 ```
 
 ## `hackmd-cli team-notes delete`
@@ -482,23 +797,35 @@ EXAMPLES
 
 ## `hackmd-cli team-notes update`
 
-Update team note content
+Update team note
 
 ```
 USAGE
-  $ hackmd-cli team-notes update [--content <value>] [-h] [--noteId <value>] [--teamPath <value>]
+  $ hackmd-cli team-notes update [--content <value>] [-h] [--noteId <value>] [--parentFolderId <value>]
+    [--permalink <value>] [--readPermission <value>] [--tags <value>] [--teamPath <value>] [--writePermission <value>]
 
 FLAGS
-  -h, --help          Show CLI help.
-  --content=<value>   new note content
-  --noteId=<value>    HackMD note id
-  --teamPath=<value>  HackMD team path
+  -h, --help                    Show CLI help.
+  --content=<value>             new note content
+  --noteId=<value>              HackMD note id
+  --parentFolderId=<value>      parent folder id
+  --permalink=<value>           note permalink
+  --readPermission=<value>      set note permission: owner, signed_in, guest
+  --tags=<value>                set note tags, comma-separated (e.g. tag1,tag2)
+  --teamPath=<value>            HackMD team path
+  --writePermission=<value>     set note permission: owner, signed_in, guest
 
 DESCRIPTION
-  Update team note content
+  Update team note
 
 EXAMPLES
   $ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --content='# A new title'
+
+  $ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --content='# A new title'
+
+  $ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --readPermission=owner --writePermission=owner
+
+  $ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --tags=tag1,tag2
 ```
 
 ## `hackmd-cli teams`
@@ -532,7 +859,7 @@ EXAMPLES
   f76308a6-d77a-41f6-86d0-8ada426a6fb4 CLI test team CLI-test 82f7f3d9-4079-4c78-8a00-14094272ece9
 ```
 
-_See code: [src/commands/teams.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/teams.ts)_
+_See code: [src/commands/teams.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/teams.ts)_
 
 ## `hackmd-cli version`
 
@@ -585,7 +912,7 @@ EXAMPLES
   82f7f3d9-4079-4c78-8a00-14094272ece9 Ming-Hsiu Tsai null  gvfz2UB5THiKABQJQnLs6Q
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.4.0/src/commands/whoami.ts)_
+_See code: [src/commands/whoami.ts](https://github.com/hackmdio/hackmd-cli/blob/v2.5.0/src/commands/whoami.ts)_
 <!-- commandsstop -->
 
 ## License
diff --git a/hackmd-cli.skill b/hackmd-cli.skill
index e1d62cc..c3147ea 100644
Binary files a/hackmd-cli.skill and b/hackmd-cli.skill differ
diff --git a/hackmd-cli/SKILL.md b/hackmd-cli/SKILL.md
index 72f8fff..b56962f 100644
--- a/hackmd-cli/SKILL.md
+++ b/hackmd-cli/SKILL.md
@@ -210,11 +210,14 @@ All list commands support:
 ### Sync local file to HackMD
 
 ```bash
-# Create new note from file
+# Create new note from file and verify
 cat doc.md | hackmd-cli notes create --title="My Doc"
+# Confirm creation by retrieving the note
+hackmd-cli notes --filter=title="My Doc"
 
-# Update existing note from file
+# Update existing note from file and verify
 cat doc.md | hackmd-cli notes update --noteId=<id>
+hackmd-cli export --noteId=<id> | head -5
 ```
 
 ### Create a folder and put a note inside it
@@ -261,3 +264,13 @@ hackmd-cli notes --output=json | jq '.[] | .id'
 ```bash
 hackmd-cli notes --filter=title=README
 ```
+
+## Error Handling
+
+Common errors and fixes:
+
+| Error | Cause | Fix |
+|-------|-------|-----|
+| `Unauthorized` | Invalid or expired token | Re-run `hackmd-cli login` or update `HMD_API_ACCESS_TOKEN` |
+| `Not Found` | Wrong `noteId` or `teamPath` | Verify the ID with `hackmd-cli notes` or `hackmd-cli teams` |
+| `Forbidden` | Insufficient permissions | Check note permissions with `hackmd-cli notes --noteId=<id> -x` |
diff --git a/package.json b/package.json
index f0bd956..132229c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hackmd/hackmd-cli",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "HackMD Team",
   "bin": {
     "hackmd-cli": "./bin/run"
diff --git a/src/commands/notes/create.ts b/src/commands/notes/create.ts
index d0e9e91..f81f065 100644
--- a/src/commands/notes/create.ts
+++ b/src/commands/notes/create.ts
@@ -13,6 +13,7 @@ import {
   editor,
   noteContent,
   notePermission,
+  noteTags,
   noteTitle,
   parentFolderId,
 } from '../../flags'
@@ -47,6 +48,7 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
     help: Flags.help({char: 'h'}),
     parentFolderId,
     readPermission: notePermission,
+    tags: noteTags,
     title: noteTitle,
     writePermission: notePermission,
     ...ux.table.flags(),
@@ -56,7 +58,7 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
     const {flags} = await this.parse(CreateCommand)
     const pipeString = safeStdinRead()
 
-    const options: CreateNoteOptions = {
+    const options: CreateNoteOptions & {tags?: string[]} = {
       commentPermission: flags.commentPermission as CommentPermissionType,
       content: pipeString || flags.content,
       parentFolderId: flags.parentFolderId,
@@ -65,6 +67,10 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
       writePermission: flags.writePermission as NotePermissionRole,
     }
 
+    if (flags.tags !== undefined) {
+      options.tags = flags.tags.split(',').map((t: string) => t.trim()).filter(Boolean)
+    }
+
     if (flags.editor) {
       try {
         const mdFile = temporaryMD()
@@ -78,7 +84,7 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
 
     try {
       const APIClient = await this.getAPIClient()
-      const note = await APIClient.createNote(options)
+      const note = await APIClient.createNote(options as CreateNoteOptions)
 
       ux.table(
         [note],
@@ -86,6 +92,9 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
           id: {
             header: 'ID',
           },
+          tags: {
+            get: row => (row.tags ?? []).join(', '),
+          },
           teamPath: {
             header: 'Team path',
           },
diff --git a/src/commands/notes/index.ts b/src/commands/notes/index.ts
index e719c83..d42cc1f 100644
--- a/src/commands/notes/index.ts
+++ b/src/commands/notes/index.ts
@@ -28,6 +28,9 @@ raUuSTetT5uQbqQfLnz9lA CLI test note                    gvfz2UB5THiKABQJQnLs6Q n
         id: {
           header: 'ID',
         },
+        tags: {
+          get: row => (row.tags ?? []).join(', '),
+        },
         teamPath: {
           header: 'Team Path',
         },
diff --git a/src/commands/notes/update.ts b/src/commands/notes/update.ts
index 17a30aa..e5b73e1 100644
--- a/src/commands/notes/update.ts
+++ b/src/commands/notes/update.ts
@@ -1,41 +1,53 @@
-import type {UpdateNoteOptions} from '@hackmd/api'
+import type {NotePermissionRole, UpdateNoteOptions} from '@hackmd/api'
 
 import {Flags} from '@oclif/core'
 
 import HackMDCommand from '../../command'
-import {noteContent, noteId, parentFolderId} from '../../flags'
+import {
+  noteContent, noteId, notePermission, noteTags, parentFolderId, permalink,
+} from '../../flags'
 
 export default class Update extends HackMDCommand {
-  static description = 'Update note content'
+  static description = 'Update note'
   static examples = [
     "$ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --content='# A new title'",
     "$ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --content='# A new title'",
+    '$ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --readPermission=owner --writePermission=owner',
+    '$ hackmd-cli notes update --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --tags=tag1,tag2',
   ]
   static flags = {
     content: noteContent,
     help: Flags.help({char: 'h'}),
     noteId,
     parentFolderId,
+    permalink,
+    readPermission: notePermission,
+    tags: noteTags,
+    writePermission: notePermission,
   }
 
   async run() {
     const {flags} = await this.parse(Update)
-    const {content, noteId, parentFolderId} = flags
+    const {content, noteId, parentFolderId, permalink, readPermission, tags, writePermission} = flags
 
     if (!noteId) {
       this.error('Flag noteId could not be empty')
     }
 
-    const payload: UpdateNoteOptions = {
-      content,
-      parentFolderId,
-    }
+    const payload: UpdateNoteOptions & {tags?: string[]} = {}
+
+    if (content !== undefined) payload.content = content
+    if (parentFolderId !== undefined) payload.parentFolderId = parentFolderId
+    if (readPermission !== undefined) payload.readPermission = readPermission as NotePermissionRole
+    if (writePermission !== undefined) payload.writePermission = writePermission as NotePermissionRole
+    if (permalink !== undefined) payload.permalink = permalink
+    if (tags !== undefined) payload.tags = tags.split(',').map((t: string) => t.trim()).filter(Boolean)
 
     try {
       const APIClient = await this.getAPIClient()
-      await APIClient.updateNote(noteId, payload)
+      await APIClient.updateNote(noteId, payload as UpdateNoteOptions)
     } catch (error) {
-      this.log('Update note content failed')
+      this.log('Update note failed')
       this.error(error as Error)
     }
   }
diff --git a/src/commands/team-notes/create.ts b/src/commands/team-notes/create.ts
index 8178927..d0a76bd 100644
--- a/src/commands/team-notes/create.ts
+++ b/src/commands/team-notes/create.ts
@@ -5,7 +5,7 @@ import fs from 'node:fs'
 
 import HackMDCommand from '../../command'
 import {
-  commentPermission, editor, noteContent, notePermission, noteTitle, parentFolderId, teamPath,
+  commentPermission, editor, noteContent, notePermission, noteTags, noteTitle, parentFolderId, teamPath,
 } from '../../flags'
 import {openEditor} from '../../open-editor'
 import {safeStdinRead, temporaryMD} from '../../utils'
@@ -38,6 +38,7 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
     help: Flags.help({char: 'h'}),
     parentFolderId,
     readPermission: notePermission,
+    tags: noteTags,
     teamPath,
     title: noteTitle,
     writePermission: notePermission,
@@ -48,8 +49,8 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
     const {flags} = await this.parse(Create)
     const pipeString = safeStdinRead()
 
-    const {commentPermission, content, parentFolderId, readPermission, teamPath, title, writePermission} = flags
-    const options: CreateNoteOptions = {
+    const {commentPermission, content, parentFolderId, readPermission, tags, teamPath, title, writePermission} = flags
+    const options: CreateNoteOptions & {tags?: string[]} = {
       commentPermission: commentPermission as CommentPermissionType,
       content: pipeString || content,
       parentFolderId,
@@ -58,6 +59,10 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
       writePermission: writePermission as NotePermissionRole,
     }
 
+    if (tags !== undefined) {
+      options.tags = tags.split(',').map((t: string) => t.trim()).filter(Boolean)
+    }
+
     if (!teamPath) {
       this.error('Flag teamPath could not be empty')
     }
@@ -75,12 +80,15 @@ raUuSTetT5uQbqQfLnz9lA A new note                       gvfz2UB5THiKABQJQnLs6Q n
 
     try {
       const APIClient = await this.getAPIClient()
-      const note = await APIClient.createTeamNote(teamPath, options)
+      const note = await APIClient.createTeamNote(teamPath, options as CreateNoteOptions)
 
       ux.table([note], {
         id: {
           header: 'ID',
         },
+        tags: {
+          get: row => (row.tags ?? []).join(', '),
+        },
         teamPath: {
           header: 'Team path',
         },
diff --git a/src/commands/team-notes/index.ts b/src/commands/team-notes/index.ts
index 34c9e82..fb8e7c9 100644
--- a/src/commands/team-notes/index.ts
+++ b/src/commands/team-notes/index.ts
@@ -33,6 +33,9 @@ BnC6gN0_TfStV2KKmPPXeg Welcome to your team's workspace null     CLI-test`,
         id: {
           header: 'ID',
         },
+        tags: {
+          get: row => (row.tags ?? []).join(', '),
+        },
         teamPath: {
           header: 'Team path',
         },
diff --git a/src/commands/team-notes/update.ts b/src/commands/team-notes/update.ts
index 9683772..fa2d686 100644
--- a/src/commands/team-notes/update.ts
+++ b/src/commands/team-notes/update.ts
@@ -1,29 +1,35 @@
-import type {UpdateNoteOptions} from '@hackmd/api'
+import type {NotePermissionRole, UpdateNoteOptions} from '@hackmd/api'
 
 import {Flags} from '@oclif/core'
 
 import HackMDCommand from '../../command'
 import {
-  noteContent, noteId, parentFolderId, teamPath,
+  noteContent, noteId, notePermission, noteTags, parentFolderId, permalink, teamPath,
 } from '../../flags'
 
 export default class Update extends HackMDCommand {
-  static description = 'Update team note content'
+  static description = 'Update team note'
   static examples = [
     "$ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --content='# A new title'",
     "$ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --parentFolderId=fc7a3d48-4a07-4cbf-bf4f-e65dd896e01c --content='# A new title'",
+    '$ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --readPermission=owner --writePermission=owner',
+    '$ hackmd-cli team-notes update --teamPath=CLI-test --noteId=WNkLM6gkS0Cg2cQ8rv7bYA --tags=tag1,tag2',
   ]
   static flags = {
     content: noteContent,
     help: Flags.help({char: 'h'}),
     noteId,
     parentFolderId,
+    permalink,
+    readPermission: notePermission,
+    tags: noteTags,
     teamPath,
+    writePermission: notePermission,
   }
 
   async run() {
     const {flags} = await this.parse(Update)
-    const {content, noteId, parentFolderId, teamPath} = flags
+    const {content, noteId, parentFolderId, permalink, readPermission, tags, teamPath, writePermission} = flags
 
     if (!teamPath) {
       this.error('Flag teamPath could not be empty')
@@ -33,16 +39,20 @@ export default class Update extends HackMDCommand {
       this.error('Flag noteId could not be empty')
     }
 
-    const payload: UpdateNoteOptions = {
-      content,
-      parentFolderId,
-    }
+    const payload: UpdateNoteOptions & {tags?: string[]} = {}
+
+    if (content !== undefined) payload.content = content
+    if (parentFolderId !== undefined) payload.parentFolderId = parentFolderId
+    if (readPermission !== undefined) payload.readPermission = readPermission as NotePermissionRole
+    if (writePermission !== undefined) payload.writePermission = writePermission as NotePermissionRole
+    if (permalink !== undefined) payload.permalink = permalink
+    if (tags !== undefined) payload.tags = tags.split(',').map((t: string) => t.trim()).filter(Boolean)
 
     try {
       const APIClient = await this.getAPIClient()
-      await APIClient.updateTeamNote(teamPath, noteId, payload)
+      await APIClient.updateTeamNote(teamPath, noteId, payload as UpdateNoteOptions)
     } catch (error) {
-      this.log('Update team note content failed')
+      this.log('Update team note failed')
       this.error(error as Error)
     }
   }
diff --git a/src/flags.ts b/src/flags.ts
index 6915942..07382f6 100644
--- a/src/flags.ts
+++ b/src/flags.ts
@@ -51,6 +51,14 @@ export const commentPermission = Flags.string({
   description: 'set comment permission: disabled, forbidden, owners, signed_in_users, everyone',
 })
 
+export const permalink = Flags.string({
+  description: 'note permalink',
+})
+
+export const noteTags = Flags.string({
+  description: 'set note tags, comma-separated (e.g. tag1,tag2)',
+})
+
 export const editor = Flags.boolean({
   char: 'e',
   description: 'create note with $EDITOR',