Expand list unwrap to also resolve forum channels to thread posts

Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/674ba90d-1778-4427-b50a-30bc50195319 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Fix export JSON detection to use numeric check; rename GuildIds to ServerIds in GetChannelsCommand
2026-07-07 14:44:39 +02:00 · 2026-04-04 20:49:33 +00:00 · 2026-04-04 11:33:13 +00:00 · 2026-04-04 11:28:04 +00:00 · 2026-04-04 11:23:45 +00:00 · 2026-04-04 14:16:43 +03:00
223 changed files with 1391 additions and 941 deletions
@@ -23,84 +23,104 @@ Now we're ready to run the commands.
 Type the following command in your terminal of choice, then press ENTER to run it. This will list all available subcommands and options.

 ```console
-./DiscordChatExporter.Cli
+./dce
 ```

 > **Note**:
-> On Windows, if you're using the default Command Prompt (`cmd`), omit the leading `./` at the start of the command.
+> On Windows, use `dce` instead of `./dce`.

 > **Docker** users, please refer to the [Docker usage instructions](Docker.md).

 ## CLI commands

-| Command     | Description                                          |
-| ----------- | ---------------------------------------------------- |
-| export      | Exports a channel                                    |
-| exportdm    | Exports all direct message channels                  |
-| exportguild | Exports all channels within the specified server     |
-| exportall   | Exports all accessible channels                      |
-| channels    | Outputs the list of channels in the given server     |
-| dm          | Outputs the list of direct message channels          |
-| guilds      | Outputs the list of accessible servers               |
-| guide       | Explains how to obtain token, server, and channel ID |
+| Command           | Description                                                          |
+| ----------------- | -------------------------------------------------------------------- |
+| export            | Exports one or more channels                                         |
+| list channels     | Outputs the list of channels in the given server(s)                  |
+| list channels dm  | Outputs the list of direct message channels                          |
+| list servers      | Outputs the list of accessible servers                               |
+| list unwrap       | Resolves categories and forums in a channel list to their child channels and threads |
+| guide             | Explains how to obtain token, server, and channel ID                 |

-To use the commands, you'll need a token. For the instructions on how to get a token, please refer to [this page](Token-and-IDs.md), or run `./DiscordChatExporter.Cli guide`.
+To use the commands, you'll need a token. For the instructions on how to get a token, please refer to [this page](Token-and-IDs.md), or run `./dce guide`.
+
+To pass the token, use the `-t|--token` option:
+
+```console
+./dce export 53555 -t "mfa.Ifrn"
+```
+
+Alternatively, you can set the `DISCORD_TOKEN` environment variable and omit `-t`:
+
+**Linux/macOS:**
+
+```console
+export DISCORD_TOKEN="mfa.Ifrn"
+```
+
+**Windows:**
+
+```console
+set DISCORD_TOKEN=mfa.Ifrn
+```
+
+The pipeline examples in this guide assume `DISCORD_TOKEN` is already set.

 To get help with a specific command, run:

 ```console
-./DiscordChatExporter.Cli command --help
+./dce command --help
 ```

 For example, to figure out how to use the `export` command, run:

 ```console
-./DiscordChatExporter.Cli export --help
+./dce export --help
 ```

 ## Export a specific channel

-You can quickly export with DCE's default settings by using just `-t token` and `-c channelid`.
+You can quickly export with DCE's default settings by providing the channel ID as a positional argument and `-t|--token`.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555
+./dce export 53555 -t "mfa.Ifrn"
 ```

 #### Changing the format

-You can change the export format to `HtmlDark`, `HtmlLight`, `PlainText` `Json` or `Csv` with `-f format`. The default
+You can change the export format to `HtmlDark`, `HtmlLight`, `PlainText` `Json` or `Csv` with `-f|--format`. The default
 format is `HtmlDark`.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -f Json
+./dce export 53555 -t "mfa.Ifrn" -f Json
 ```

 #### Changing the output filename

-You can change the filename by using `-o name.ext`. e.g. for the `HTML` format:
+You can change the filename by using `-o|--output`. e.g. for the `HTML` format:

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o myserver.html
+./dce export 53555 -t "mfa.Ifrn" -o myserver.html
 ```

 #### Changing the output directory

-You can change the export directory by using `-o` and providing a path that ends with a slash or does not have a file
+You can change the export directory by using `-o|--output` and providing a path that ends with a slash or does not have a file
 extension.
 If any of the folders in the path have a space in its name, escape them with quotes (").

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports"
+./dce export 53555 -t "mfa.Ifrn" -o "C:\Discord Exports"
 ```

 #### Changing the filename and output directory

-You can change both the filename and export directory by using `-o directory\name.ext`.
+You can change both the filename and export directory by using `-o|--output`.
 Note that the filename must have an extension, otherwise it will be considered a directory name.
 If any of the folders in the path have a space in its name, escape them with quotes (").

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports\myserver.html"
+./dce export 53555 -t "mfa.Ifrn" -o "C:\Discord Exports\myserver.html"
 ```

 #### Generating the filename and output directory dynamically
@@ -108,7 +128,7 @@ If any of the folders in the path have a space in its name, escape them with quo
 You can use template tokens to generate the output file path based on the server and channel metadata.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o "C:\Discord Exports\%G\%T\%C.html"
+./dce export 53555 -t "mfa.Ifrn" -o "C:\Discord Exports\%G\%T\%C.html"
 ```

 Assuming you are exporting a channel named `"my-channel"` in the `"Text channels"` category from a server
@@ -136,13 +156,13 @@ You can use partitioning to split files after a given number of messages or file
 For example, a channel with 36 messages set to be partitioned every 10 messages will output 4 files.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -p 10
+./dce export 53555 -t "mfa.Ifrn" -p 10
 ```

 A 45 MB channel set to be partitioned every 20 MB will output 3 files.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -p 20mb
+./dce export 53555 -t "mfa.Ifrn" -p 20mb
 ```

 #### Downloading assets
@@ -153,7 +173,7 @@ downloaded when using the plain text (TXT) export format.
 A folder containing the assets will be created along with the exported chat. They must be kept together.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media
+./dce export 53555 -t "mfa.Ifrn" --media
 ```

 #### Reusing assets
@@ -162,7 +182,7 @@ Previously downloaded assets can be reused to skip redundant downloads as long a
 same folder. Using this option can speed up future exports. This option requires the `--media` option.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media --reuse-media
+./dce export 53555 -t "mfa.Ifrn" --media --reuse-media
 ```

 #### Changing the media directory
@@ -171,7 +191,7 @@ By default, the media directory is created alongside the exported chat. You can
 providing a path that ends with a slash. All of the exported media will be stored in this directory.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --media --media-dir "C:\Discord Media"
+./dce export 53555 -t "mfa.Ifrn" --media --media-dir "C:\Discord Media"
 ```

 #### Changing the date format
@@ -180,7 +200,7 @@ You can customize how dates are formatted in the exported files by using `--loca
 locales. The default locale is `en-US`.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --locale "de-DE"
+./dce export 53555 -t "mfa.Ifrn" --locale "de-DE"
 ```

 #### Date ranges
@@ -189,14 +209,14 @@ locales. The default locale is `en-US`.
 Use `--before` to export messages sent before the provided date. E.g. messages sent before September 18th, 2019:

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --before 2019-09-18
+./dce export 53555 -t "mfa.Ifrn" --before 2019-09-18
 ```

 **Messages sent after a date**
 Use `--after` to export messages sent after the provided date. E.g. messages sent after September 17th, 2019 11:34 PM:

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34"
+./dce export 53555 -t "mfa.Ifrn" --after "2019-09-17 23:34"
 ```

 **Messages sent in a date range**
@@ -204,7 +224,7 @@ Use `--before` and `--after` to export messages sent during the provided date ra
 September 17th, 2019 11:34 PM and September 18th:

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34" --before "2019-09-18"
+./dce export 53555 -t "mfa.Ifrn" --after "2019-09-17 23:34" --before "2019-09-18"
 ```

 You can try different formats like `17-SEP-2019 11:34 PM` or even refine your ranges down to
@@ -218,75 +238,111 @@ formats [here](https://docs.microsoft.com/en-us/dotnet/standard/base-types/custo
 Use `--filter` to filter what messages are included in the export.

 ```console
-./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --filter "from:Tyrrrz has:image"
+./dce export 53555 -t "mfa.Ifrn" --filter "from:Tyrrrz has:image"
 ```

 Documentation on message filter syntax can be found [here](https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs/Message-filters.md).

 ### Export channels from a specific server

-To export all channels in a specific server, use the `exportguild` command and provide the server ID through the `-g|--guild` option:
+> [!IMPORTANT]
+> The following examples assume `DISCORD_TOKEN` is already set. See [CLI commands](#cli-commands) for instructions.
+
+To export all channels in a specific server, use `list channels` to list channels and pipe the result to `export`.
+
+**Linux/macOS:**

 ```console
-./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814
+./dce list channels 21814 | ./dce export
+```
+
+**Windows:**
+
+```console
+dce list channels 21814 | dce export
+```
+
+You can also list channels for multiple servers at once:
+
+```console
+./dce list channels 21814 35930 | ./dce export
 ```

 #### Including threads

-By default, threads are not included in the export. You can change this behavior by using `--include-threads` and
-specifying which threads should be included. It has possible values of `none`, `active`, or `all`, indicating which
-threads should be included. To include both active and archived threads, use `--include-threads all`.
+By default, threads are not included. You can change this behavior by passing `--include-threads` to the `list channels` command. It has possible values of `none`, `active`, or `all`, indicating which threads should be included. To include both active and archived threads, use `--include-threads all`.

 ```console
-./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814 --include-threads all
+./dce list channels 21814 --include-threads all | ./dce export
 ```

 #### Including voice channels

-By default, voice channels are included in the export. You can change this behavior by using `--include-vc` and
-specifying whether to include voice channels in the export. It has possible values of `true` or `false`, to exclude
-voice channels, use `--include-vc false`.
+By default, voice channels are included. You can change this behavior by passing `--include-vc false` to the `list channels` command.

 ```console
-./DiscordChatExporter.Cli exportguild -t "mfa.Ifrn" -g 21814 --include-vc false
+./dce list channels 21814 --include-vc false | ./dce export
 ```

-### Export all channels
+### Export all DMs

-To export all accessible channels, use the `exportall` command:
+> [!IMPORTANT]
+> The following examples assume `DISCORD_TOKEN` is already set. See [CLI commands](#cli-commands) for instructions.
+
+To export all DMs:
+
+**Linux/macOS:**

 ```console
-./DiscordChatExporter.Cli exportall -t "mfa.Ifrn"
+./dce list channels dm | ./dce export
 ```

-#### Excluding DMs
-
-To exclude DMs, add the `--include-dm false` option.
+**Windows:**

 ```console
-./DiscordChatExporter.Cli exportall -t "mfa.Ifrn" --include-dm false
+dce list channels dm | dce export
 ```

 ### List channels in a server

-To list the channels available in a specific server, use the `channels` command and provide the server ID through the `-g|--guild` option:
+To list the channels available in a specific server, use the `list channels` command and provide the server ID as an argument:

 ```console
-./DiscordChatExporter.Cli channels -t "mfa.Ifrn" -g 21814
+./dce list channels 21814 -t "mfa.Ifrn"
+```
+
+The `list channels` command outputs a JSON array of channel objects. You can pipe this directly to the `export` command:
+
+```console
+./dce list channels 21814 | ./dce export
 ```

 ### List direct message channels

-To list all DM channels accessible to the current account, use the `dm` command:
+To list all DM channels accessible to the current account, use the `list channels dm` command:

 ```console
-./DiscordChatExporter.Cli dm -t "mfa.Ifrn"
+./dce list channels dm -t "mfa.Ifrn"
+```
+
+The `list channels dm` command outputs a JSON array of channel objects. You can pipe this directly to the `export` command:
+
+```console
+./dce list channels dm | ./dce export
+```
+
+### Unwrap categories and forums
+
+To resolve category and forum channels in a list to their child channels and thread posts, use the `list unwrap` command:
+
+```console
+./dce list channels 21814 | ./dce list unwrap | ./dce export
 ```

 ### List servers

-To list all servers accessible by the current account, use the `guilds` command:
+To list all servers accessible by the current account, use the `list servers` command:

 ```console
-./DiscordChatExporter.Cli guilds -t "mfa.Ifrn" > C:\path\to\output.txt
+./dce list servers -t "mfa.Ifrn" > C:\path\to\output.txt
 ```
@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
  - name: ⚠ Feature request
    url: https://github.com/Tyrrrz/.github/blob/prime/docs/project-status.md
-    about: Sorry, but this project is in maintenance mode and currently doesn't accept new feature requests.
+    about: Sorry, but this project is in maintenance mode and no longer accepts new feature requests.
  - name: 📖 Documentation
    url: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs
    about: Find usage guides and frequently asked questions.
@@ -1,18 +0,0 @@
-changelog:
-  exclude:
-    authors:
-      - dependabot
-      - dependabot[bot]
-
-  categories:
-    - title: Enhancements
-      labels:
-        - enhancement
-
-    - title: Bugs
-      labels:
-        - bug
-
-    - title: Other
-      labels:
-        - "*"
@@ -26,7 +26,7 @@ jobs:
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Build image
        run: >
@@ -37,7 +37,7 @@ jobs:
          --output type=tar,dest=DiscordChatExporter.Cli.Docker.tar

      - name: Upload image
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
        with:
          name: DiscordChatExporter.Cli.Docker
          path: DiscordChatExporter.Cli.Docker.tar
@@ -58,7 +58,7 @@ jobs:
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Login to DockerHub
        run: >
@@ -29,7 +29,7 @@ jobs:
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Install .NET
-        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0

      # Build the project separately to discern between build and format errors
      - name: Build
@@ -65,7 +65,7 @@ jobs:
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Install .NET
-        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0

      - name: Run tests
        env:
@@ -81,7 +81,7 @@ jobs:
          DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover

      - name: Upload coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
        with:
          token: ${{ secrets.CODECOV_TOKEN }}

@@ -120,7 +120,7 @@ jobs:
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

      - name: Install .NET
-        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0

      - name: Publish app
        run: >
@@ -135,7 +135,7 @@ jobs:
          --self-contained

      - name: Upload app binaries
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
        with:
          name: ${{ matrix.asset }}.${{ matrix.rid }}
          path: ${{ matrix.app }}/bin/publish/
@@ -236,7 +236,7 @@ jobs:

    steps:
      - name: Notify Discord
-        uses: tyrrrz/action-http-request@110f1a0f0f7e91c3b2de349539249f4573c243fa # 1.1.5
+        uses: tyrrrz/action-http-request@25f132e48dea89c0f6b7955398270b506e1d51cb # 1.1.4
        with:
          url: ${{ secrets.DISCORD_WEBHOOK }}
          method: POST
@@ -4,6 +4,7 @@
    <Version>999.9.9-dev</Version>
    <Company>Tyrrrz</Company>
    <Copyright>Copyright (c) Oleksii Holub</Copyright>
+    <LangVersion>preview</LangVersion>
    <Nullable>enable</Nullable>
    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -5,42 +5,42 @@

  <ItemGroup>
    <PackageVersion Include="AngleSharp" Version="1.4.0" />
-    <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.8.0" />
+    <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.7.0" />
    <PackageVersion Include="AsyncKeyedLock" Version="8.0.2" />
-    <PackageVersion Include="Avalonia" Version="12.0.4" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
+    <PackageVersion Include="Avalonia" Version="11.3.13" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
    <PackageVersion Include="CliFx" Version="3.0.0" />
    <PackageVersion Include="Cogwheel" Version="2.1.1" />
    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageVersion Include="coverlet.collector" Version="10.0.1" />
+    <PackageVersion Include="coverlet.collector" Version="8.0.1" />
    <PackageVersion Include="CSharpier.MsBuild" Version="1.2.6" />
    <PackageVersion Include="Deorcify" Version="1.1.0" />
-    <PackageVersion Include="DialogHost.Avalonia" Version="0.12.2" />
-    <PackageVersion Include="FluentAssertions" Version="8.10.0" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
-    <PackageVersion Include="Gress" Version="2.2.0" />
+    <PackageVersion Include="ThisAssembly.Project" Version="2.1.2" />
+    <PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" />
+    <PackageVersion Include="FluentAssertions" Version="8.9.0" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.3" />
+    <PackageVersion Include="Gress" Version="2.1.1" />
    <PackageVersion Include="JsonExtensions" Version="1.2.0" />
-    <PackageVersion Include="Markdig" Version="1.2.0" />
-    <PackageVersion Include="Material.Avalonia" Version="3.16.1" />
-    <PackageVersion Include="Material.Icons.Avalonia" Version="3.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
+    <PackageVersion Include="Markdig" Version="1.1.2" />
+    <PackageVersion Include="Material.Avalonia" Version="3.9.2" />
+    <PackageVersion Include="Material.Icons.Avalonia" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
    <PackageVersion
      Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
-      Version="10.0.8"
+      Version="10.0.5"
    />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
    <PackageVersion Include="Onova" Version="2.6.13" />
    <PackageVersion Include="Polly" Version="8.6.6" />
-    <PackageVersion Include="PowerKit" Version="1.2.0" />
-    <PackageVersion Include="RazorBlade" Version="1.0.0" />
-    <PackageVersion Include="Spectre.Console" Version="0.55.2" />
+    <PackageVersion Include="RazorBlade" Version="0.11.0" />
+    <PackageVersion Include="Spectre.Console" Version="0.54.0" />
    <PackageVersion Include="Superpower" Version="3.1.0" />
-    <PackageVersion Include="ThisAssembly.Project" Version="2.1.2" />
    <PackageVersion Include="WebMarkupMin.Core" Version="2.21.0" />
    <PackageVersion Include="xunit" Version="2.9.3" />
    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
-    <PackageVersion Include="YoutubeExplode" Version="6.6.0" />
+    <PackageVersion Include="YoutubeExplode" Version="6.5.7" />
  </ItemGroup>
 </Project>
@@ -20,12 +20,11 @@
    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="PowerKit" PrivateAssets="all" />
    <PackageReference Include="xunit" />
    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="../DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj" />
+    <ProjectReference Include="..\DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj" />
  </ItemGroup>
 </Project>
@@ -1,4 +1,4 @@
-using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord;

 namespace DiscordChatExporter.Cli.Tests.Infra;

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using Microsoft.Extensions.Configuration;

@@ -1,4 +1,4 @@
-# DiscordChatExporter Tests
+# DiscordChatExporter Tests

 This test suite runs against a real Discord server, specifically created to exercise different behaviors required by the test scenarios.
 In order to run these tests locally, you need to join the test server and configure your authentication token.
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using FluentAssertions;
 using Xunit;
@@ -1,15 +1,15 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using JsonExtensions;
-using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,15 +1,15 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using FluentAssertions;
 using JsonExtensions;
-using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
@@ -8,7 +8,6 @@ using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
-using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils.Extensions;
 using FluentAssertions;
-using PowerKit.Extensions;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
-using PowerKit.Extensions;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -22,7 +22,7 @@ public class HtmlForwardSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace(' ')
+            .ReplaceWhiteSpace()
            .Should()
            .ContainAll("Forwarded", @"¯\_(ツ)_/¯", "12/29/2025 2:14 PM");
    }
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
@@ -8,7 +8,6 @@ using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
-using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
-using PowerKit.Extensions;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -22,14 +22,11 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace(' ')
+            .ReplaceWhiteSpace()
            .Should()
            .Contain("Default timestamp: 2/12/2023 1:36 PM");

-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -42,11 +39,8 @@ public class HtmlMarkdownSpecs
        );

        // Assert
-        message.Text().ReplaceWhiteSpace(' ').Should().Contain("Short time timestamp: 1:36 PM");
-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.Text().ReplaceWhiteSpace().Should().Contain("Short time timestamp: 1:36 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -59,11 +53,8 @@ public class HtmlMarkdownSpecs
        );

        // Assert
-        message.Text().ReplaceWhiteSpace(' ').Should().Contain("Long time timestamp: 1:36:12 PM");
-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.Text().ReplaceWhiteSpace().Should().Contain("Long time timestamp: 1:36:12 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -76,11 +67,8 @@ public class HtmlMarkdownSpecs
        );

        // Assert
-        message.Text().ReplaceWhiteSpace(' ').Should().Contain("Short date timestamp: 2/12/2023");
-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.Text().ReplaceWhiteSpace().Should().Contain("Short date timestamp: 2/12/2023");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -95,14 +83,11 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace(' ')
+            .ReplaceWhiteSpace()
            .Should()
            .Contain("Long date timestamp: Sunday, February 12, 2023");

-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -117,14 +102,11 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace(' ')
+            .ReplaceWhiteSpace()
            .Should()
            .Contain("Full timestamp: Sunday, February 12, 2023 1:36 PM");

-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -139,14 +121,11 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace(' ')
+            .ReplaceWhiteSpace()
            .Should()
            .Contain("Full long timestamp: Sunday, February 12, 2023 1:36:12 PM");

-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -161,14 +140,11 @@ public class HtmlMarkdownSpecs
        // Assert
        message
            .Text()
-            .ReplaceWhiteSpace(' ')
+            .ReplaceWhiteSpace()
            .Should()
            .Contain("Relative timestamp: 2/12/2023 1:36 PM");

-        message
-            .InnerHtml.ReplaceWhiteSpace(' ')
-            .Should()
-            .Contain("Sunday, February 12, 2023 1:36 PM");
+        message.InnerHtml.ReplaceWhiteSpace().Should().Contain("Sunday, February 12, 2023 1:36 PM");
    }

    [Fact]
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using AngleSharp.Dom;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,13 +1,13 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using JsonExtensions;
-using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Core.Discord;
@@ -1,12 +1,12 @@
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Partitioning;
 using FluentAssertions;
-using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -17,7 +17,7 @@ public class PartitioningSpecs
    public async Task I_can_export_a_channel_with_partitioning_based_on_message_count()
    {
        // Arrange
-        using var dir = TempDirectory.Create();
+        using var dir = TempDir.Create();
        var filePath = Path.Combine(dir.Path, "output.html");

        // Act
@@ -38,7 +38,7 @@ public class PartitioningSpecs
    public async Task I_can_export_a_channel_with_partitioning_based_on_file_size()
    {
        // Arrange
-        using var dir = TempDirectory.Create();
+        using var dir = TempDir.Create();
        var filePath = Path.Combine(dir.Path, "output.html");

        // Act
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
 using FluentAssertions;
 using Xunit;
@@ -1,7 +1,7 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using DiscordChatExporter.Cli.Tests.Infra;
+using DiscordChatExporter.Cli.Tests.Utils.Extensions;
 using FluentAssertions;
-using PowerKit.Extensions;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -16,7 +16,7 @@ public class PlainTextForwardSpecs

        // Assert
        document
-            .ReplaceWhiteSpace(' ')
+            .ReplaceWhiteSpace()
            .Should()
            .ContainAll("{Forwarded Message}", @"¯\_(ツ)_/¯", "12/28/2025 10:52 PM");
    }
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
@@ -7,7 +7,6 @@ using DiscordChatExporter.Cli.Tests.Infra;
 using DiscordChatExporter.Cli.Tests.Utils;
 using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
-using PowerKit;
 using Xunit;

 namespace DiscordChatExporter.Cli.Tests.Specs;
@@ -18,7 +17,7 @@ public class SelfContainedSpecs
    public async Task I_can_export_a_channel_and_download_all_referenced_assets()
    {
        // Arrange
-        using var dir = TempDirectory.Create();
+        using var dir = TempDir.Create();
        var filePath = Path.Combine(dir.Path, "output.html");

        // Act
@@ -0,0 +1,19 @@
+using System.Text;
+
+namespace DiscordChatExporter.Cli.Tests.Utils.Extensions;
+
+internal static class StringExtensions
+{
+    extension(string str)
+    {
+        public string ReplaceWhiteSpace(string replacement = " ")
+        {
+            var buffer = new StringBuilder(str.Length);
+
+            foreach (var ch in str)
+                buffer.Append(char.IsWhiteSpace(ch) ? replacement : ch);
+
+            return buffer.ToString();
+        }
+    }
+}
@@ -1,4 +1,4 @@
-using AngleSharp.Html.Dom;
+using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;

 namespace DiscordChatExporter.Cli.Tests.Utils;
@@ -0,0 +1,36 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace DiscordChatExporter.Cli.Tests.Utils;
+
+internal partial class TempDir(string path) : IDisposable
+{
+    public string Path { get; } = path;
+
+    public void Dispose()
+    {
+        try
+        {
+            Directory.Delete(Path, true);
+        }
+        catch (DirectoryNotFoundException) { }
+    }
+}
+
+internal partial class TempDir
+{
+    public static TempDir Create()
+    {
+        var dirPath = System.IO.Path.Combine(
+            System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+                ?? Directory.GetCurrentDirectory(),
+            "Temp",
+            Guid.NewGuid().ToString()
+        );
+
+        Directory.CreateDirectory(dirPath);
+
+        return new TempDir(dirPath);
+    }
+}
@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace DiscordChatExporter.Cli.Tests.Utils;
+
+internal partial class TempFile(string path) : IDisposable
+{
+    public string Path { get; } = path;
+
+    public void Dispose()
+    {
+        try
+        {
+            File.Delete(Path);
+        }
+        catch (FileNotFoundException) { }
+    }
+}
+
+internal partial class TempFile
+{
+    public static TempFile Create()
+    {
+        var dirPath = System.IO.Path.Combine(
+            System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+                ?? Directory.GetCurrentDirectory(),
+            "Temp"
+        );
+
+        Directory.CreateDirectory(dirPath);
+
+        var filePath = System.IO.Path.Combine(dirPath, Guid.NewGuid() + ".tmp");
+
+        return new TempFile(filePath);
+    }
+}
@@ -1,4 +1,4 @@
-{
+{
  "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
  "methodDisplayOptions": "all",
  "methodDisplay": "method"
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using CliFx;
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -1,4 +1,4 @@
-using System;
+using System;
 using CliFx.Activation;
 using DiscordChatExporter.Cli.Commands.Shared;

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using CliFx.Activation;

 namespace DiscordChatExporter.Cli.Commands.Converters;
@@ -1,156 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CliFx.Binding;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Cli.Utils.Extensions;
-using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Discord.Dump;
-using DiscordChatExporter.Core.Exceptions;
-using Spectre.Console;
-
-namespace DiscordChatExporter.Cli.Commands;
-
-[Command("exportall", Description = "Exports all accessible channels.")]
-public partial class ExportAllCommand : ExportCommandBase
-{
-    [CommandOption("include-dm", Description = "Include direct message channels.")]
-    public bool IncludeDirectChannels { get; set; } = true;
-
-    [CommandOption("include-guilds", Description = "Include server channels.")]
-    public bool IncludeGuildChannels { get; set; } = true;
-
-    [CommandOption("include-vc", Description = "Include voice channels.")]
-    public bool IncludeVoiceChannels { get; set; } = true;
-
-    [CommandOption(
-        "data-package",
-        Description = "Path to the personal data package (ZIP file) requested from Discord. "
-            + "If provided, only channels referenced in the dump will be exported."
-    )]
-    public string? DataPackageFilePath { get; set; }
-
-    public override async ValueTask ExecuteAsync(IConsole console)
-    {
-        await base.ExecuteAsync(console);
-
-        var cancellationToken = console.RegisterCancellationHandler();
-        var channels = new List<Channel>();
-
-        // Pull from the API
-        if (string.IsNullOrWhiteSpace(DataPackageFilePath))
-        {
-            await foreach (var guild in Discord.GetUserGuildsAsync(cancellationToken))
-            {
-                // Regular channels
-                await console.Output.WriteLineAsync(
-                    $"Fetching channels for server '{guild.Name}'..."
-                );
-
-                var fetchedChannelsCount = 0;
-                await console
-                    .CreateStatusTicker()
-                    .StartAsync(
-                        "...",
-                        async ctx =>
-                        {
-                            await foreach (
-                                var channel in Discord.GetGuildChannelsAsync(
-                                    guild.Id,
-                                    cancellationToken
-                                )
-                            )
-                            {
-                                if (channel.IsCategory)
-                                    continue;
-
-                                if (!IncludeVoiceChannels && channel.IsVoice)
-                                    continue;
-
-                                channels.Add(channel);
-
-                                ctx.Status(
-                                    Markup.Escape($"Fetched '{channel.GetHierarchicalName()}'.")
-                                );
-
-                                fetchedChannelsCount++;
-                            }
-                        }
-                    );
-
-                await console.Output.WriteLineAsync($"Fetched {fetchedChannelsCount} channel(s).");
-            }
-        }
-        // Pull from the data package
-        else
-        {
-            await console.Output.WriteLineAsync("Extracting channels...");
-
-            var dump = await DataDump.LoadAsync(DataPackageFilePath, cancellationToken);
-            var inaccessibleChannels = new List<DataDumpChannel>();
-
-            await console
-                .CreateStatusTicker()
-                .StartAsync(
-                    "...",
-                    async ctx =>
-                    {
-                        foreach (var dumpChannel in dump.Channels)
-                        {
-                            ctx.Status(
-                                Markup.Escape(
-                                    $"Fetching '{dumpChannel.Name}' ({dumpChannel.Id})..."
-                                )
-                            );
-
-                            try
-                            {
-                                var channel = await Discord.GetChannelAsync(
-                                    dumpChannel.Id,
-                                    cancellationToken
-                                );
-
-                                channels.Add(channel);
-                            }
-                            catch (DiscordChatExporterException)
-                            {
-                                inaccessibleChannels.Add(dumpChannel);
-                            }
-                        }
-                    }
-                );
-
-            await console.Output.WriteLineAsync($"Fetched {channels} channel(s).");
-
-            // Print inaccessible channels
-            if (inaccessibleChannels.Any())
-            {
-                await console.Output.WriteLineAsync();
-
-                using (console.WithForegroundColor(ConsoleColor.Red))
-                {
-                    await console.Error.WriteLineAsync(
-                        "Failed to access the following channel(s):"
-                    );
-                }
-
-                foreach (var dumpChannel in inaccessibleChannels)
-                    await console.Error.WriteLineAsync($"{dumpChannel.Name} ({dumpChannel.Id})");
-
-                await console.Error.WriteLineAsync();
-            }
-        }
-
-        // Filter out unwanted channels
-        if (!IncludeDirectChannels)
-            channels.RemoveAll(c => c.IsDirect);
-        if (!IncludeGuildChannels)
-            channels.RemoveAll(c => c.IsGuild);
-        if (!IncludeVoiceChannels)
-            channels.RemoveAll(c => c.IsVoice);
-
-        await ExportAsync(console, channels);
-    }
-}
@@ -1,25 +1,27 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Text.Json;
 using System.Threading.Tasks;
+using CliFx;
 using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Cli.Utils.Extensions;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

 [Command("export", Description = "Exports one or multiple channels.")]
 public partial class ExportChannelsCommand : ExportCommandBase
 {
-    // TODO: change this to plural (breaking change)
-    [CommandOption(
-        "channel",
-        'c',
+    [CommandParameter(
+        0,
+        Name = "channel-ids",
        Description = "Channel ID(s). "
-            + "If provided with category ID(s), all channels inside those categories will be exported."
+            + "If not provided, channel IDs are read from standard input (one per line or as a JSON array), "
+            + "enabling piping from the 'list channels' or 'list channels dm' commands."
    )]
-    public required IReadOnlyList<Snowflake> ChannelIds { get; set; }
+    public IReadOnlyList<Snowflake> ChannelIds { get; set; } = [];

    public override async ValueTask ExecuteAsync(IConsole console)
    {
@@ -27,35 +29,46 @@ public partial class ExportChannelsCommand : ExportCommandBase

        var cancellationToken = console.RegisterCancellationHandler();

+        // If no channel IDs were specified, read them from stdin
+        var channelIds = new List<Snowflake>(ChannelIds);
+        if (channelIds.Count == 0 && console.IsInputRedirected)
+        {
+            await foreach (var line in console.Input.ReadLinesAsync(cancellationToken))
+            {
+                var trimmed = line.Trim();
+                if (string.IsNullOrEmpty(trimmed))
+                    continue;
+
+                // Snowflake IDs are numeric; non-numeric input is treated as a JSON array
+                if (!char.IsAsciiDigit(trimmed[0]))
+                {
+                    using var doc = JsonDocument.Parse(trimmed);
+                    foreach (var element in doc.RootElement.EnumerateArray())
+                        channelIds.Add(Snowflake.Parse(element.GetProperty("id").GetString()!));
+                }
+                else
+                {
+                    channelIds.Add(Snowflake.Parse(trimmed));
+                }
+            }
+        }
+
+        if (channelIds.Count == 0)
+        {
+            throw new CommandException(
+                "No channel IDs provided. "
+                    + "Specify channel IDs as arguments or pipe them from the 'list channels' or 'list channels dm' commands."
+            );
+        }
+
        await console.Output.WriteLineAsync("Resolving channel(s)...");

        var channels = new List<Channel>();
-        var channelsByGuild = new Dictionary<Snowflake, IReadOnlyList<Channel>>();

-        foreach (var channelId in ChannelIds)
+        foreach (var channelId in channelIds)
        {
            var channel = await Discord.GetChannelAsync(channelId, cancellationToken);
-
-            // Unwrap categories
-            if (channel.IsCategory)
-            {
-                var guildChannels =
-                    channelsByGuild.GetValueOrDefault(channel.GuildId)
-                    ?? await Discord.GetGuildChannelsAsync(channel.GuildId, cancellationToken);
-
-                foreach (var guildChannel in guildChannels)
-                {
-                    if (guildChannel.Parent?.Id == channel.Id)
-                        channels.Add(guildChannel);
-                }
-
-                // Cache the guild channels to avoid redundant work
-                channelsByGuild[channel.GuildId] = guildChannels;
-            }
-            else
-            {
-                channels.Add(channel);
-            }
+            channels.Add(channel);
        }

        await ExportAsync(console, channels);
@@ -1,27 +0,0 @@
-using System.Threading.Tasks;
-using CliFx.Binding;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Core.Discord.Data;
-using PowerKit.Extensions;
-
-namespace DiscordChatExporter.Cli.Commands;
-
-[Command("exportdm", Description = "Exports all direct message channels.")]
-public partial class ExportDirectMessagesCommand : ExportCommandBase
-{
-    public override async ValueTask ExecuteAsync(IConsole console)
-    {
-        await base.ExecuteAsync(console);
-
-        var cancellationToken = console.RegisterCancellationHandler();
-
-        await console.Output.WriteLineAsync("Fetching channels...");
-        var channels = await Discord.GetGuildChannelsAsync(
-            Guild.DirectMessages.Id,
-            cancellationToken
-        );
-
-        await ExportAsync(console, channels);
-    }
-}
@@ -1,61 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using CliFx.Binding;
-using CliFx.Infrastructure;
-using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Cli.Utils.Extensions;
-using DiscordChatExporter.Core.Discord;
-using DiscordChatExporter.Core.Discord.Data;
-using Spectre.Console;
-
-namespace DiscordChatExporter.Cli.Commands;
-
-[Command("exportguild", Description = "Exports all channels within the specified server.")]
-public partial class ExportGuildCommand : ExportCommandBase
-{
-    [CommandOption("guild", 'g', Description = "Server ID.")]
-    public required Snowflake GuildId { get; set; }
-
-    [CommandOption("include-vc", Description = "Include voice channels.")]
-    public bool IncludeVoiceChannels { get; set; } = true;
-
-    public override async ValueTask ExecuteAsync(IConsole console)
-    {
-        await base.ExecuteAsync(console);
-
-        var cancellationToken = console.RegisterCancellationHandler();
-        var channels = new List<Channel>();
-
-        await console.Output.WriteLineAsync("Fetching channels...");
-
-        var fetchedChannelsCount = 0;
-        await console
-            .CreateStatusTicker()
-            .StartAsync(
-                "...",
-                async ctx =>
-                {
-                    await foreach (
-                        var channel in Discord.GetGuildChannelsAsync(GuildId, cancellationToken)
-                    )
-                    {
-                        if (channel.IsCategory)
-                            continue;
-
-                        if (!IncludeVoiceChannels && channel.IsVoice)
-                            continue;
-
-                        channels.Add(channel);
-
-                        ctx.Status(Markup.Escape($"Fetched '{channel.GetHierarchicalName()}'."));
-
-                        fetchedChannelsCount++;
-                    }
-                }
-            );
-
-        await console.Output.WriteLineAsync($"Fetched {fetchedChannelsCount} channel(s).");
-
-        await ExportAsync(console, channels);
-    }
-}
@@ -1,21 +1,24 @@
-using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Cli.Commands.Converters;
 using DiscordChatExporter.Cli.Commands.Shared;
+using DiscordChatExporter.Cli.Utils.Json;
 using DiscordChatExporter.Core.Discord;
-using PowerKit.Extensions;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

-[Command("channels", Description = "Get the list of channels in a server.")]
+[Command("list channels", Description = "Gets the list of channels in one or more servers.")]
 public partial class GetChannelsCommand : DiscordCommandBase
 {
-    [CommandOption("guild", 'g', Description = "Server ID.")]
-    public required Snowflake GuildId { get; set; }
+    [CommandParameter(0, Name = "server-ids", Description = "Server ID(s).")]
+    public required IReadOnlyList<Snowflake> ServerIds { get; set; }

    [CommandOption("include-vc", Description = "Include voice channels.")]
    public bool IncludeVoiceChannels { get; set; } = true;
@@ -33,82 +36,44 @@ public partial class GetChannelsCommand : DiscordCommandBase

        var cancellationToken = console.RegisterCancellationHandler();

-        var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
-            .Where(c => !c.IsCategory)
-            .Where(c => IncludeVoiceChannels || !c.IsVoice)
-            .OrderBy(c => c.Parent?.Position)
-            .ThenBy(c => c.Name)
-            .ToArray();
+        var allChannels = new List<Channel>();

-        var channelIdMaxLength = channels
-            .Select(c => c.Id.ToString().Length)
-            .OrderDescending()
-            .FirstOrDefault();
-
-        var threads =
-            ThreadInclusionMode != ThreadInclusionMode.None
-                ? (
-                    await Discord.GetGuildThreadsAsync(
-                        GuildId,
-                        ThreadInclusionMode == ThreadInclusionMode.All,
-                        null,
-                        null,
-                        cancellationToken
-                    )
-                )
-                    .OrderBy(c => c.Name)
-                    .ToArray()
-                : [];
-
-        foreach (var channel in channels)
+        foreach (var serverId in ServerIds)
        {
-            // Channel ID
-            await console.Output.WriteAsync(
-                channel.Id.ToString().PadRight(channelIdMaxLength, ' ')
-            );
+            var channels = (await Discord.GetGuildChannelsAsync(serverId, cancellationToken))
+                .Where(c => !c.IsCategory)
+                .Where(c => IncludeVoiceChannels || !c.IsVoice)
+                .OrderBy(c => c.Parent?.Position)
+                .ThenBy(c => c.Name)
+                .ToArray();

-            // Separator
-            using (console.WithForegroundColor(ConsoleColor.DarkGray))
-                await console.Output.WriteAsync(" | ");
+            var threads =
+                ThreadInclusionMode != ThreadInclusionMode.None
+                    ? (
+                        await Discord.GetGuildThreadsAsync(
+                            serverId,
+                            ThreadInclusionMode == ThreadInclusionMode.All,
+                            null,
+                            null,
+                            cancellationToken
+                        )
+                    )
+                        .OrderBy(c => c.Name)
+                        .ToArray()
+                    : [];

-            // Channel name
-            using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync(channel.GetHierarchicalName());
-
-            var channelThreads = threads.Where(t => t.Parent?.Id == channel.Id).ToArray();
-            var channelThreadIdMaxLength = channelThreads
-                .Select(t => t.Id.ToString().Length)
-                .OrderDescending()
-                .FirstOrDefault();
-
-            foreach (var channelThread in channelThreads)
+            foreach (var channel in channels)
            {
-                // Indent
-                await console.Output.WriteAsync(" * ");
-
-                // Thread ID
-                await console.Output.WriteAsync(
-                    channelThread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
-                );
-
-                // Separator
-                using (console.WithForegroundColor(ConsoleColor.DarkGray))
-                    await console.Output.WriteAsync(" | ");
-
-                // Thread name
-                using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteAsync($"Thread / {channelThread.Name}");
-
-                // Separator
-                using (console.WithForegroundColor(ConsoleColor.DarkGray))
-                    await console.Output.WriteAsync(" | ");
-
-                // Thread status
-                using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteLineAsync(
-                        channelThread.IsArchived ? "Archived" : "Active"
-                    );
+                allChannels.Add(channel);
+                allChannels.AddRange(threads.Where(t => t.Parent?.Id == channel.Id));
            }
        }
+
+        await console.Output.WriteLineAsync(
+            JsonSerializer.Serialize(
+                allChannels.ToArray(),
+                CliJsonSerializerContext.Instance.ChannelArray
+            )
+        );
    }
 }
@@ -1,15 +1,16 @@
-using System;
-using System.Linq;
+using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Cli.Utils.Json;
 using DiscordChatExporter.Core.Discord.Data;
-using PowerKit.Extensions;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

-[Command("dm", Description = "Gets the list of all direct message channels.")]
+[Command("list channels dm", Description = "Gets the list of direct message channels.")]
 public partial class GetDirectChannelsCommand : DiscordCommandBase
 {
    public override async ValueTask ExecuteAsync(IConsole console)
@@ -25,25 +26,8 @@ public partial class GetDirectChannelsCommand : DiscordCommandBase
            .ThenBy(c => c.Name)
            .ToArray();

-        var channelIdMaxLength = channels
-            .Select(c => c.Id.ToString().Length)
-            .OrderDescending()
-            .FirstOrDefault();
-
-        foreach (var channel in channels)
-        {
-            // Channel ID
-            await console.Output.WriteAsync(
-                channel.Id.ToString().PadRight(channelIdMaxLength, ' ')
-            );
-
-            // Separator
-            using (console.WithForegroundColor(ConsoleColor.DarkGray))
-                await console.Output.WriteAsync(" | ");
-
-            // Channel name
-            using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync(channel.GetHierarchicalName());
-        }
+        await console.Output.WriteLineAsync(
+            JsonSerializer.Serialize(channels, CliJsonSerializerContext.Instance.ChannelArray)
+        );
    }
 }
@@ -1,15 +1,16 @@
-using System;
-using System.Linq;
+using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using CliFx.Binding;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Cli.Utils.Json;
 using DiscordChatExporter.Core.Discord.Data;
-using PowerKit.Extensions;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands;

-[Command("guilds", Description = "Gets the list of accessible servers.")]
+[Command("list servers", Description = "Gets the list of accessible servers.")]
 public partial class GetGuildsCommand : DiscordCommandBase
 {
    public override async ValueTask ExecuteAsync(IConsole console)
@@ -24,23 +25,8 @@ public partial class GetGuildsCommand : DiscordCommandBase
            .ThenBy(g => g.Name)
            .ToArray();

-        var guildIdMaxLength = guilds
-            .Select(g => g.Id.ToString().Length)
-            .OrderDescending()
-            .FirstOrDefault();
-
-        foreach (var guild in guilds)
-        {
-            // Guild ID
-            await console.Output.WriteAsync(guild.Id.ToString().PadRight(guildIdMaxLength, ' '));
-
-            // Separator
-            using (console.WithForegroundColor(ConsoleColor.DarkGray))
-                await console.Output.WriteAsync(" | ");
-
-            // Guild name
-            using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync(guild.Name);
-        }
+        await console.Output.WriteLineAsync(
+            JsonSerializer.Serialize(guilds, CliJsonSerializerContext.Instance.GuildArray)
+        );
    }
 }
@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Binding;
+using CliFx.Infrastructure;
+
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command("list", Description = "Lists channels, DMs, or servers.")]
+public partial class ListCommand : ICommand
+{
+    public ValueTask ExecuteAsync(IConsole console) =>
+        throw new CommandException("Use one of the named commands listed below.", showHelp: true);
+}
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Cli.Commands.Shared;
+namespace DiscordChatExporter.Cli.Commands.Shared;

 public enum ThreadInclusionMode
 {
@@ -0,0 +1,95 @@
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using CliFx;
+using CliFx.Binding;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Cli.Utils.Extensions;
+using DiscordChatExporter.Cli.Utils.Json;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;
+
+namespace DiscordChatExporter.Cli.Commands;
+
+[Command(
+    "list unwrap",
+    Description = "Resolves categories and forums in a channel list to their child channels and threads."
+)]
+public partial class UnwrapChannelsCommand : DiscordCommandBase
+{
+    public override async ValueTask ExecuteAsync(IConsole console)
+    {
+        await base.ExecuteAsync(console);
+
+        var cancellationToken = console.RegisterCancellationHandler();
+
+        // Read all JSON from stdin (produced by 'list channels' or 'list channels dm')
+        var sb = new StringBuilder();
+        await foreach (var line in console.Input.ReadLinesAsync(cancellationToken))
+            sb.Append(line);
+
+        Channel[] channels;
+        try
+        {
+            channels =
+                JsonSerializer.Deserialize(
+                    sb.ToString().Trim(),
+                    CliJsonSerializerContext.Instance.ChannelArray
+                ) ?? [];
+        }
+        catch (JsonException)
+        {
+            throw new CommandException(
+                "Failed to parse input as a JSON channel array. "
+                    + "Pipe the output of 'list channels' or 'list channels dm' to this command."
+            );
+        }
+
+        var result = new List<Channel>();
+        var channelsByGuild = new Dictionary<Snowflake, IReadOnlyList<Channel>>();
+
+        foreach (var channel in channels)
+        {
+            if (channel.IsCategory)
+            {
+                // Expand category to its child channels
+                var guildChannels =
+                    channelsByGuild.GetValueOrDefault(channel.GuildId)
+                    ?? await Discord.GetGuildChannelsAsync(channel.GuildId, cancellationToken);
+
+                foreach (var guildChannel in guildChannels)
+                {
+                    if (guildChannel.Parent?.Id == channel.Id)
+                        result.Add(guildChannel);
+                }
+
+                channelsByGuild[channel.GuildId] = guildChannels;
+            }
+            else if (channel.Kind == ChannelKind.GuildForum)
+            {
+                // Expand forum to its thread posts
+                await foreach (
+                    var thread in Discord.GetChannelThreadsAsync(
+                        [channel],
+                        cancellationToken: cancellationToken
+                    )
+                )
+                    result.Add(thread);
+            }
+            else
+            {
+                result.Add(channel);
+            }
+        }
+
+        await console.Output.WriteLineAsync(
+            JsonSerializer.Serialize(
+                result.ToArray(),
+                CliJsonSerializerContext.Instance.ChannelArray
+            )
+        );
+    }
+}
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <ApplicationIcon>../favicon.ico</ApplicationIcon>
+    <ApplicationIcon>..\favicon.ico</ApplicationIcon>
    <PublishTrimmed>true</PublishTrimmed>
    <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
  </PropertyGroup>
@@ -11,11 +11,23 @@
    <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
    <PackageReference Include="Deorcify" PrivateAssets="all" />
    <PackageReference Include="Gress" />
-    <PackageReference Include="PowerKit" PrivateAssets="all" />
    <PackageReference Include="Spectre.Console" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="../DiscordChatExporter.Core/DiscordChatExporter.Core.csproj" />
+    <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None
+      Include="dce"
+      CopyToOutputDirectory="PreserveNewest"
+      CopyToPublishDirectory="PreserveNewest"
+    />
+    <None
+      Include="dce.bat"
+      CopyToOutputDirectory="PreserveNewest"
+      CopyToPublishDirectory="PreserveNewest"
+    />
  </ItemGroup>
 </Project>
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using CliFx;

 namespace DiscordChatExporter.Cli;
@@ -1,4 +1,8 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using Spectre.Console;
@@ -61,4 +65,15 @@ internal static class ConsoleExtensions
            progressTask.StopTask();
        }
    }
+
+    public static async IAsyncEnumerable<string> ReadLinesAsync(
+        this TextReader reader,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default
+    )
+    {
+        while (await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false) is { } line)
+        {
+            yield return line;
+        }
+    }
 }
@@ -0,0 +1,26 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Cli.Utils.Json;
+
+[JsonSourceGenerationOptions(
+    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
+    GenerationMode = JsonSourceGenerationMode.Metadata
+)]
+[JsonSerializable(typeof(Channel[]))]
+[JsonSerializable(typeof(Guild[]))]
+internal partial class CliJsonSerializerContext : JsonSerializerContext
+{
+    // Instance pre-configured with converters for Snowflake (serialised as a string)
+    // and all enum types (serialised as their name).  Defined here so the Core types
+    // are never touched.
+    public static CliJsonSerializerContext Instance { get; } =
+        new(
+            new JsonSerializerOptions
+            {
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                Converters = { new SnowflakeJsonConverter(), new JsonStringEnumConverter() },
+            }
+        );
+}
@@ -0,0 +1,21 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using DiscordChatExporter.Core.Discord;
+
+namespace DiscordChatExporter.Cli.Utils.Json;
+
+internal class SnowflakeJsonConverter : JsonConverter<Snowflake>
+{
+    public override Snowflake Read(
+        ref Utf8JsonReader reader,
+        Type typeToConvert,
+        JsonSerializerOptions options
+    ) => Snowflake.Parse(reader.GetString()!);
+
+    public override void Write(
+        Utf8JsonWriter writer,
+        Snowflake value,
+        JsonSerializerOptions options
+    ) => writer.WriteStringValue(value.ToString());
+}
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exec "$(dirname "$0")/DiscordChatExporter.Cli" "$@"
@@ -0,0 +1,2 @@
+@echo off
+"%~dp0DiscordChatExporter.Cli.exe" %*
@@ -1,6 +1,6 @@
-using System.Text.Json;
+using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.IO;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;

 namespace DiscordChatExporter.Core.Discord.Data;
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data;
+namespace DiscordChatExporter.Core.Discord.Data;

 // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 public enum ChannelKind
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data.Common;
+namespace DiscordChatExporter.Core.Discord.Data.Common;

 public interface IHasId
 {
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Linq;

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data.Embeds;

@@ -47,7 +47,9 @@ public partial record Embed
        var kind =
            json.GetPropertyOrNull("type")
                ?.GetStringOrNull()
-                .Pipe(s => Enum.ParseOrNull<EmbedKind>(s, true))
+                ?.Pipe(s =>
+                    Enum.TryParse<EmbedKind>(s, true, out var result) ? result : (EmbedKind?)null
+                )
            ?? EmbedKind.Rich;

        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
@@ -56,7 +58,7 @@ public partial record Embed
        var color = json.GetPropertyOrNull("color")
            ?.GetInt32OrNull()
            ?.Pipe(System.Drawing.Color.FromArgb)
-            .WithFullAlpha();
+            .ResetAlpha();

        var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
        var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;

 namespace DiscordChatExporter.Core.Discord.Data.Embeds;

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;

 namespace DiscordChatExporter.Core.Discord.Data.Embeds;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;

 public partial record YouTubeVideoEmbedProjection(string VideoId)
 {
@@ -1,8 +1,8 @@
-using System.Text.Json;
+using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

@@ -1,7 +1,7 @@
-using System.Text.Json;
+using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,6 +1,6 @@
-using System.Text.Json;
+using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,7 +1,7 @@
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.RegularExpressions;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data;
+namespace DiscordChatExporter.Core.Discord.Data;

 // https://discord.com/developers/docs/resources/channel#message-object-message-types
 public enum MessageKind
@@ -1,6 +1,6 @@
 using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,5 +1,5 @@
-using System.Text.Json;
-using PowerKit.Extensions;
+using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,8 +1,8 @@
-using System.Drawing;
+using System.Drawing;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -18,7 +18,7 @@ public record Role(Snowflake Id, string Name, int Position, Color? Color) : IHas
        var color = json.GetPropertyOrNull("color")
            ?.GetInt32OrNull()
            ?.Pipe(System.Drawing.Color.FromArgb)
-            .WithFullAlpha()
+            .ResetAlpha()
            .NullIf(c => c.ToRgb() <= 0);

        return new Role(id, name, position, color);
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord.Data;
+namespace DiscordChatExporter.Core.Discord.Data;

 public enum StickerFormat
 {
@@ -1,7 +1,7 @@
-using System.Text.Json;
+using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord.Data;

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -11,10 +11,10 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Utils;
+using DiscordChatExporter.Core.Utils.Extensions;
 using Gress;
 using JsonExtensions.Http;
 using JsonExtensions.Reading;
-using PowerKit.Extensions;

 namespace DiscordChatExporter.Core.Discord;

@@ -59,12 +59,12 @@ public class DiscordClient(
                {
                    var remainingRequestCount = response
                        .Headers.TryGetValue("X-RateLimit-Remaining")
-                        ?.Pipe(s => int.ParseOrNull(s, CultureInfo.InvariantCulture));
+                        ?.Pipe(s => int.Parse(s, CultureInfo.InvariantCulture));

                    var resetAfterDelay = response
                        .Headers.TryGetValue("X-RateLimit-Reset-After")
-                        ?.Pipe(s => double.ParseOrNull(s, CultureInfo.InvariantCulture))
-                        ?.Pipe(TimeSpan.FromSeconds);
+                        ?.Pipe(s => double.Parse(s, CultureInfo.InvariantCulture))
+                        .Pipe(TimeSpan.FromSeconds);

                    // If this was the last request available before hitting the rate limit,
                    // wait out the reset time so that future requests can succeed.
@@ -161,7 +161,7 @@ public class DiscordClient(
                    $"""
                    Request to '{url}' failed: {response
                        .StatusCode.ToString()
-                        .SeparateWords(' ')
+                        .ToSpaceSeparatedWords()
                        .ToLowerInvariant()}.
                    Response content: {await response.Content.ReadAsStringAsync(
                        cancellationToken
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO.Compression;
 using System.Linq;
@@ -1,3 +1,3 @@
-namespace DiscordChatExporter.Core.Discord.Dump;
+namespace DiscordChatExporter.Core.Discord.Dump;

 public record DataDumpChannel(Snowflake Id, string Name);
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace DiscordChatExporter.Core.Discord;

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Core.Discord;
+namespace DiscordChatExporter.Core.Discord;

 public enum TokenKind
 {
@@ -6,7 +6,6 @@
    <PackageReference Include="Gress" />
    <PackageReference Include="JsonExtensions" />
    <PackageReference Include="Polly" />
-    <PackageReference Include="PowerKit" PrivateAssets="all" />
    <PackageReference Include="RazorBlade" />
    <PackageReference Include="Superpower" />
    <PackageReference Include="WebMarkupMin.Core" />
@@ -1,4 +1,4 @@
-using System;
+using System;

 namespace DiscordChatExporter.Core.Exceptions;

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord;
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
-using PowerKit.Extensions;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Core.Exporting;

@@ -1,15 +1,15 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using AsyncKeyedLock;
 using DiscordChatExporter.Core.Utils;
-using PowerKit.Extensions;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Core.Exporting;

@@ -65,14 +65,7 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
            async innerCancellationToken =>
            {
                // Download the file
-                using var response = await Http.Client.GetAsync(
-                    url,
-                    HttpCompletionOption.ResponseHeadersRead,
-                    innerCancellationToken
-                );
-
-                response.EnsureSuccessStatusCode();
-
+                using var response = await Http.Client.GetAsync(url, innerCancellationToken);
                await using var output = File.Create(filePath);
                await response.Content.CopyToAsync(output, innerCancellationToken);
            },
@@ -103,7 +96,7 @@ internal partial class ExportAssetDownloader
    private static string GetFileNameFromUrl(string url, string urlHash)
    {
        // Try to extract the file name from URL
-        var fileName = new Uri(url, UriKind.RelativeOrAbsolute).TryGetFileName();
+        var fileName = Regex.Match(url, @".+/([^?]*)").Groups[1].Value;

        // If it's not there, just use the URL hash as the file name
        if (string.IsNullOrWhiteSpace(fileName))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
copilot-swe-agent[bot]	ea0b47f26d	Expand list unwrap to also resolve forum channels to thread posts Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/674ba90d-1778-4427-b50a-30bc50195319 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 20:49:33 +00:00
copilot-swe-agent[bot]	f6e710909c	Fix export JSON detection to use numeric check; rename GuildIds to ServerIds in GetChannelsCommand Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/ab01ba49-ad07-42ba-b382-27f4d105a92b Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 11:33:13 +00:00
copilot-swe-agent[bot]	1835af12d5	Fix: catch JsonException in list unwrap; improve export error message Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/d2a03a38-0ed4-45c7-b8e7-615ffb35c971 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 11:28:04 +00:00
copilot-swe-agent[bot]	f8ab926074	Add 'list unwrap' command; remove category unwrapping from export; add [!IMPORTANT] callouts to pipeline doc sections Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/d2a03a38-0ed4-45c7-b8e7-615ffb35c971 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 11:23:45 +00:00
Oleksii Holub	7f08641974	Update error message for missing channel IDs	2026-04-04 14:16:43 +03:00
copilot-swe-agent[bot]	948ceba8cc	docs: use -short\|--long convention for option names in prose text Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/aa0b1344-6eb9-4853-9b48-afd06e94c970 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 11:14:19 +00:00
copilot-swe-agent[bot]	b0ee4ba646	list commands always output JSON; add CliJsonSerializerContext + SnowflakeJsonConverter in CLI Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/58698f45-e22e-4bd4-aec4-31f801051467 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 09:50:29 +00:00
copilot-swe-agent[bot]	89407c121f	Add .ConfigureAwait(false) to ReadLinesAsync; remove IsNullOrWhiteSpace guard Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/e94c999b-5241-4e2e-9af1-01f6be95e72c Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 09:14:41 +00:00
copilot-swe-agent[bot]	4ec8faef93	Rename 'list guilds' to 'list servers'; use 'servers' in all user-facing text; simplify token setup in docs Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/688f7e3c-af04-410d-93e7-18d7c0620672 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 09:10:11 +00:00
copilot-swe-agent[bot]	245b368396	Move Trim() from ReadLinesAsync to call site in ExportChannelsCommand Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/6c8dcb73-6a93-428b-93e5-7bbfcfd2e252 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 08:52:02 +00:00
copilot-swe-agent[bot]	cbf74ba6a8	Use `using System.Runtime.CompilerServices` instead of fully-qualified attribute Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/a1231ba4-d235-4e2d-98b2-a5bef602a85c Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-04 08:50:06 +00:00
copilot-swe-agent[bot]	f656234c38	Refine ReadLinesAsync: pattern matching, rename, cancellation token Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/e4a61491-645a-418c-91cd-74e835baaf44 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 22:26:56 +00:00
copilot-swe-agent[bot]	316e8c6ea8	Simplify stdin reading: use ReadAllLinesAsync extension and Snowflake.Parse Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/59c1113d-3c9c-4900-a9b0-5c6116ce7c75 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 16:12:47 +00:00
copilot-swe-agent[bot]	1087173fef	Rename dce.sh to dce and update docs to use dce/dce.bat without extensions Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/c1f3a4c9-8af4-4b11-a961-442363e2b7be Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 16:02:36 +00:00
copilot-swe-agent[bot]	a31629f722	Fix docs: put positional params before options per CliFx convention Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/41047efd-2bac-4c7a-8b26-42d9a4383281 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 15:52:29 +00:00
copilot-swe-agent[bot]	5c86beb809	Update ListCommand error message and use dce alias throughout CLI docs Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/b521468e-a2a4-4360-ab0c-847ef5e4d366 Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 15:48:36 +00:00
copilot-swe-agent[bot]	55c06ef40e	Add dce.sh/dce.bat alias scripts and update docs with inline DISCORD_TOKEN pipeline examples Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/98d87128-db13-4085-84c3-6290d3faffca Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 15:13:58 +00:00
copilot-swe-agent[bot]	f3638ecbdd	Add stub 'list' command that errors with help text when executed Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/b148b0cc-7ec8-4fa1-bbd6-36dfd116ceec Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 15:10:46 +00:00
copilot-swe-agent[bot]	0e3b455655	Restructure commands: list channels/guilds subcommands with positional parameters Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/27f23ff6-5b39-46d3-a7dc-387749ee63fa Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 15:05:43 +00:00
copilot-swe-agent[bot]	16ecb2802a	Clarify DISCORD_TOKEN env var tip in documentation Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/5f305835-64af-456e-b0b4-6163ece1e8cf Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 14:46:54 +00:00
copilot-swe-agent[bot]	6750195a35	Address code review: fix Snowflake.TryParse usage and remove blank line in channels redirect block Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/5f305835-64af-456e-b0b4-6163ece1e8cf Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 14:45:14 +00:00
copilot-swe-agent[bot]	efb371f093	Rework CLI commands to be composable: pipe channels to export, remove exportguild/exportall/exportdm Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/5f305835-64af-456e-b0b4-6163ece1e8cf Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>	2026-04-03 14:42:04 +00:00
copilot-swe-agent[bot]	716ea79f60	Initial plan	2026-04-03 14:36:19 +00:00