mt5cli 1.7.1__tar.gz → 1.7.3__tar.gz

mt5cli-1.7.3/.agents/skills/local-qa/SKILL.md

@@ -0,0 +1,17 @@
+---
+name: local-qa
+description: Run local QA including formatting, linting, and testing for the repository. Use whenever any file has been updated.
+---
+
+# Local QA (format, lint, and test)
+
+Run `scripts/qa.sh` relative to this skill's directory, not the shell's current working directory. The script changes to the repository root itself. It formats and fixes files in place, so check `git status` afterward.
+
+After the run, summarize the outcome: success or failure, major warnings, and any files modified.
+
+## When something fails
+
+- **Missing tooling** (`command not found` or equivalent): install the tool, preferring the project's package manager (`uv`, `pnpm`), then a system package manager, then a language-specific installer (`pipx`, `npm`, `go install`). Rerun `scripts/qa.sh` and repeat until QA completes. If installation fails or needs privileges you lack, report what was attempted and the exact failure, then stop.
+- **Any other failure**: fix the root cause and rerun until QA passes or you hit a blocker. Do not bypass or weaken checks, because the script is the repository's quality gate.
+
+Run only commands needed for QA, fixes, and tool installation.

{mt5cli-1.7.1 → mt5cli-1.7.3}/.agents/skills/mt5cli/SKILL.md

@@ -12,9 +12,10 @@ command. Output format is auto-detected from the file extension (`.csv`,
 
 ## Requirements
 
-MT5 terminal).
-
-- Install: `pip install -U mt5cli MetaTrader5`.
+- Windows with a MetaTrader 5 terminal installed (required by the MetaTrader5
+  Python package).
+- Install: `pip install -U mt5cli MetaTrader5`. Add the `parquet` extra
+  (`pip install -U "mt5cli[parquet]" MetaTrader5`) for Parquet output.
 - In this repo, run via `uv run mt5cli ...` or `uv run python -m mt5cli ...`.
 
 ## Invocation shape
@@ -23,7 +24,8 @@ MT5 terminal).
 mt5cli [GLOBAL OPTIONS] -o OUTPUT COMMAND [COMMAND OPTIONS]
 ```
 
-Global options MUST precede the subcommand.
+Put global options before the subcommand; they belong to the top-level
+command, and `-o` is required.
 
 ### Global options (apply to every subcommand)
 
@@ -32,7 +34,7 @@ Global options MUST precede the subcommand.
 | `-o, --output PATH`   | Output file path (required).                                  |
 | `-f, --format FORMAT` | `csv`, `json`, `parquet`, or `sqlite3` (auto from extension). |
 | `--table NAME`        | Table name for SQLite3 output (default: `data`).              |
-| `--login INT`         | MT5 trading account login (`MT5_LOGIN`).                      |
+| `--login TEXT`        | MT5 trading account login (`MT5_LOGIN`).                      |
 | `--password TEXT`     | MT5 trading account password (`MT5_PASSWORD`).                |
 | `--server TEXT`       | MT5 trading server name (`MT5_SERVER`).                       |
 | `--path TEXT`         | Path to MetaTrader 5 terminal EXE (`MT5_PATH`).               |
@@ -52,22 +54,22 @@ Global options MUST precede the subcommand.
 
 ## Commands
 
-| Command           | Required options                                      | Optional options                                                                                                                                                                                                                 |
-| ----------------- | ----------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `rates-from`      | `--symbol`, `--timeframe`, `--date-from`, `--count`   | —                                                                                                                                                                                                                                |
-| `rates-from-pos`  | `--symbol`, `--timeframe`, `--start-pos`, `--count`   | —                                                                                                                                                                                                                                |
-| `rates-range`     | `--symbol`, `--timeframe`, `--date-from`, `--date-to` | —                                                                                                                                                                                                                                |
-| `ticks-from`      | `--symbol`, `--date-from`, `--count`, `--flags`       | —                                                                                                                                                                                                                                |
-| `ticks-range`     | `--symbol`, `--date-from`, `--date-to`, `--flags`     | —                                                                                                                                                                                                                                |
-| `account-info`    | —                                                     | —                                                                                                                                                                                                                                |
-| `terminal-info`   | —                                                     | —                                                                                                                                                                                                                                |
-| `symbols`         | —                                                     | `--group` (e.g., `*USD*`)                                                                                                                                                                                                        |
-| `symbol-info`     | `--symbol`                                            | —                                                                                                                                                                                                                                |
-| `orders`          | —                                                     | `--symbol`, `--group`, `--ticket`                                                                                                                                                                                                |
-| `positions`       | —                                                     | `--symbol`, `--group`, `--ticket`                                                                                                                                                                                                |
-| `history-orders`  | —                                                     | `--date-from`, `--date-to`, `--group`, `--symbol`, `--ticket`, `--position`                                                                                                                                                      |
-| `history-deals`   | —                                                     | `--date-from`, `--date-to`, `--group`, `--symbol`, `--ticket`, `--position`                                                                                                                                                      |
-| `collect-history` | `--symbol` (repeatable), `--date-from`, `--date-to`   | `--dataset` (repeatable; rates/ticks/history-orders/history-deals; default all), `--timeframe` (M1; recorded on rates), `--flags` (ALL), `--if-exists` (append/replace/fail; default fail), `--with-views` (SQLite3 output only) |
+| Command           | Required options                                      | Optional options                                                                                                                                                                                                                                           |
+| ----------------- | ----------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `rates-from`      | `--symbol`, `--timeframe`, `--date-from`, `--count`   | —                                                                                                                                                                                                                                                          |
+| `rates-from-pos`  | `--symbol`, `--timeframe`, `--start-pos`, `--count`   | —                                                                                                                                                                                                                                                          |
+| `rates-range`     | `--symbol`, `--timeframe`, `--date-from`, `--date-to` | —                                                                                                                                                                                                                                                          |
+| `ticks-from`      | `--symbol`, `--date-from`, `--count`, `--flags`       | —                                                                                                                                                                                                                                                          |
+| `ticks-range`     | `--symbol`, `--date-from`, `--date-to`, `--flags`     | —                                                                                                                                                                                                                                                          |
+| `account-info`    | —                                                     | —                                                                                                                                                                                                                                                          |
+| `terminal-info`   | —                                                     | —                                                                                                                                                                                                                                                          |
+| `symbols`         | —                                                     | `--group` (e.g., `*USD*`)                                                                                                                                                                                                                                  |
+| `symbol-info`     | `--symbol`                                            | —                                                                                                                                                                                                                                                          |
+| `orders`          | —                                                     | `--symbol`, `--group`, `--ticket`                                                                                                                                                                                                                          |
+| `positions`       | —                                                     | `--symbol`, `--group`, `--ticket`                                                                                                                                                                                                                          |
+| `history-orders`  | —                                                     | `--date-from`, `--date-to`, `--group`, `--symbol`, `--ticket`, `--position`                                                                                                                                                                                |
+| `history-deals`   | —                                                     | `--date-from`, `--date-to`, `--group`, `--symbol`, `--ticket`, `--position`                                                                                                                                                                                |
+| `collect-history` | `--symbol` (repeatable), `--date-from`, `--date-to`   | `--dataset` (repeatable; rates/history-orders/history-deals by default, `ticks` and `symbols` are opt-in), `--timeframe` (M1; recorded on rates), `--flags` (ALL), `--if-exists` (append/replace/fail; default fail), `--with-views` (needs history-deals) |
 
 ## Examples
 
@@ -100,6 +102,11 @@ mt5cli -o history.db collect-history \
 
 ## Guidelines
 
+- The table lists the common export commands. Run `mt5cli COMMAND --help` for
+  exact options and for commands not listed here (for example `ticks-recent`,
+  `history-gaps`).
+- `collect-history` writes SQLite3 only (`.db`/`.sqlite`/`.sqlite3` or
+  `--format sqlite3`).
 - Pick the output extension to avoid passing `--format`.
 - Use `--table` only with SQLite3 outputs; it is otherwise ignored.
 - `--count` is required for `rates-from`, `rates-from-pos`, and `ticks-from`.

{mt5cli-1.7.1 → mt5cli-1.7.3}/.github/dependabot.yml

@@ -6,7 +6,7 @@ updates:
     schedule:
       interval: daily
     cooldown:
-      default-days: 1
+      default-days: 7
     open-pull-requests-limit: 10
     groups:
       github-actions-dependencies:
@@ -17,7 +17,7 @@ updates:
     schedule:
       interval: daily
     cooldown:
-      default-days: 1
+      default-days: 7
     open-pull-requests-limit: 10
     groups:
       uv-dependencies:

{mt5cli-1.7.1 → mt5cli-1.7.3}/.github/renovate.json

@@ -2,6 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:recommended"],
   "minimumReleaseAge": "1 day",
+  "lockFileMaintenance": {"enabled": true},
   "packageRules": [
     {
       "description": "Automatically merge minor and patch-level updates",

{mt5cli-1.7.1 → mt5cli-1.7.3}/.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
       || (github.event_name == 'workflow_dispatch' && inputs.workflow == 'lint-and-test')
     permissions:
       contents: read
-    uses: dceoy/gha-for-devops/.github/workflows/python-package-lint-and-scan.yml@main   # zizmor: ignore[unpinned-uses]
+    uses: dceoy/gha-for-devops/.github/workflows/python-package-lint-and-scan.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
     with:
       package-path: .
       runs-on: windows-latest
@@ -46,7 +46,7 @@ jobs:
       || (github.event_name == 'workflow_dispatch' && inputs.workflow == 'lint-and-test')
     permissions:
       contents: read
-    uses: dceoy/gha-for-devops/.github/workflows/python-package-test.yml@main  # zizmor: ignore[unpinned-uses]
+    uses: dceoy/gha-for-devops/.github/workflows/python-package-test.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
     with:
       package-path: .
       runs-on: windows-latest
@@ -57,7 +57,7 @@ jobs:
       || (github.event_name == 'workflow_dispatch' && inputs.workflow == 'lint-and-test')
     permissions:
       contents: read
-    uses: dceoy/gha-for-devops/.github/workflows/bats-test.yml@main  # zizmor: ignore[unpinned-uses]
+    uses: dceoy/gha-for-devops/.github/workflows/bats-test.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
     with:
       search-path: ./tests/cli/
       runs-on: windows-latest
@@ -67,7 +67,7 @@ jobs:
       || (github.event_name == 'workflow_dispatch' && inputs.workflow == 'docs-deploy')
     permissions:
       contents: write
-    uses: dceoy/gha-for-devops/.github/workflows/python-package-mkdocs-gh-deploy.yml@main  # zizmor: ignore[unpinned-uses]
+    uses: dceoy/gha-for-devops/.github/workflows/python-package-mkdocs-gh-deploy.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
     with:
       package-path: .
       runs-on: ubuntu-slim
@@ -75,12 +75,12 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   dependabot-auto-merge:
     if: >
-      github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
+      github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]'
     needs:
       - python-lint-and-scan
       - python-test
       - bats-test
-    uses: dceoy/gha-for-devops/.github/workflows/dependabot-auto-merge.yml@main  # zizmor: ignore[unpinned-uses]
+    uses: dceoy/gha-for-devops/.github/workflows/dependabot-auto-merge.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
     permissions:
       contents: write
       pull-requests: write

mt5cli-1.7.3/.github/workflows/claude.yml

@@ -0,0 +1,29 @@
+---
+name: Claude Code review
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - opened
+      - ready_for_review
+    paths-ignore:
+      - .github/workflows/claude.yml
+permissions:
+  contents: read
+jobs:
+  claude-code-review:
+    if: >
+      github.event_name == 'pull_request'
+      && (! github.event.pull_request.draft)
+      && github.event.pull_request.user.type != 'Bot'
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
+      id-token: write
+      actions: read
+    uses: dceoy/pr-loop/.github/workflows/claude-code-review.yml@66193c0383663b48ea144b438d7dd4a42e02b6e2  # v1.1.5
+    secrets:
+      CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}  # zizmor: ignore[secrets-outside-env]
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{mt5cli-1.7.1 → mt5cli-1.7.3}/.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
       contents: read
       security-events: write
       actions: read
-    uses: dceoy/gha-for-devops/.github/workflows/github-codeql-analysis.yml@main  # zizmor: ignore[unpinned-uses]
+    uses: dceoy/gha-for-devops/.github/workflows/github-codeql-analysis.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
     with:
       language: >
         ["actions","python"]

mt5cli-1.7.3/.github/workflows/release.yml

@@ -0,0 +1,228 @@
+---
+name: Release
+on:
+  workflow_dispatch:
+permissions:
+  contents: read
+concurrency:
+  group: python-release-${{ github.repository }}
+  cancel-in-progress: false
+defaults:
+  run:
+    shell: bash -euo pipefail {0}
+    working-directory: .
+jobs:
+  plan:
+    if: >-
+      github.repository == 'dceoy/mt5cli'
+      && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+    outputs:
+      release-tag: ${{ steps.plan.outputs.tag }}
+      source-sha: ${{ steps.plan.outputs.source-sha }}
+    steps:
+      - name: Check out validated source and tags
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
+        with:
+          ref: ${{ github.sha }}
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Plan release from pyproject.toml
+        id: plan
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SOURCE_SHA: ${{ github.sha }}
+        run: |
+          if [[ "$(git rev-parse HEAD)" != "${SOURCE_SHA}" || "${GITHUB_SHA}" != "${SOURCE_SHA}" ]]; then
+            echo '::notice::Workflow SHA differs from the validated source; skipping.'
+            exit 0
+          fi
+          main_sha="$(gh api "repos/${GITHUB_REPOSITORY}/git/ref/heads/main" --jq '.object.sha')"
+          if [[ "${main_sha}" != "${SOURCE_SHA}" ]]; then
+            echo '::notice::main advanced since validation; skipping stale release.'
+            exit 0
+          fi
+          ci_runs="$(gh run list --repo "${GITHUB_REPOSITORY}" --workflow ci.yml --commit "${SOURCE_SHA}" --event push --branch main --status success --json databaseId --jq 'length')"
+          if [[ "${ci_runs}" == 0 ]]; then
+            echo "::error::No successful CI/CD push run found for ${SOURCE_SHA}."
+            exit 1
+          fi
+          version="$(python3 - <<'PY'
+          import tomllib
+          with open("pyproject.toml", "rb") as file:
+              print(tomllib.load(file)["project"]["version"])
+          PY
+          )"
+          if [[ ! "${version}" =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
+            echo '::error::project.version must be MAJOR.MINOR.PATCH.'
+            exit 1
+          fi
+          tag="v${version}"
+          if git rev-parse --verify -q "refs/tags/${tag}^{commit}" > /dev/null; then
+            tagged_sha="$(git rev-parse "refs/tags/${tag}^{commit}")"
+            if gh release view "${tag}" --json isDraft --jq '.isDraft' > /tmp/release-draft 2>/dev/null; then
+              if [[ "$(cat /tmp/release-draft)" == false ]]; then
+                echo "::notice::${tag} is already published; skipping."
+                exit 0
+              fi
+            fi
+            if [[ "${tagged_sha}" != "${SOURCE_SHA}" ]]; then
+              echo "::error::${tag} already points to another commit."
+              exit 1
+            fi
+          fi
+          latest="$(gh release list --json tagName,isLatest --jq '.[] | select(.isLatest) | .tagName')"
+          if [[ -n "${latest}" ]]; then
+            if [[ ! "${latest}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+              echo "::error::Latest release tag is not stable SemVer: ${latest}"
+              exit 1
+            fi
+            if ! python3 - "${version}" "${latest#v}" <<'PY'
+          import sys
+          current, previous = (tuple(map(int, s.split("."))) for s in sys.argv[1:])
+          sys.exit(0 if current > previous else 1)
+          PY
+            then
+              echo "::error::project.version must exceed the latest release (${latest})."
+              exit 1
+            fi
+          fi
+          {
+            echo "tag=${tag}"
+            echo "source-sha=${SOURCE_SHA}"
+          } >> "${GITHUB_OUTPUT}"
+  build:
+    needs: plan
+    if: needs.plan.outputs.release-tag != ''
+    # Nested jobs declare these permissions even when their publish flags are false.
+    permissions:
+      contents: write
+      id-token: write
+    uses: dceoy/gha-for-devops/.github/workflows/python-package-release-on-pypi-and-github.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
+    with:
+      package-path: .
+      create-github-release: false
+      publish-to-pypi: false
+  verify-source:
+    needs:
+      - plan
+      - build
+    if: needs.plan.outputs.release-tag != ''
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      current: ${{ steps.verify.outputs.current }}
+    steps:
+      - name: Recheck that main still matches the validated source
+        id: verify
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SOURCE_SHA: ${{ needs.plan.outputs.source-sha }}
+          RELEASE_TAG: ${{ needs.plan.outputs.release-tag }}
+        run: |
+          main_sha="$(gh api "repos/${GITHUB_REPOSITORY}/git/ref/heads/main" --jq '.object.sha')"
+          if [[ -z "${SOURCE_SHA}" || "${main_sha}" != "${SOURCE_SHA}" ]]; then
+            echo '::notice::main advanced during the build; skipping stale release.'
+            echo 'current=false' >> "${GITHUB_OUTPUT}"
+            exit 0
+          fi
+          # The release helper accepts an existing tag without checking its commit.
+          # The last ls-remote line is the peeled commit for annotated tags.
+          tagged_sha="$(git ls-remote "https://github.com/${GITHUB_REPOSITORY}.git" "refs/tags/${RELEASE_TAG}" "refs/tags/${RELEASE_TAG}^{}" | awk 'END {print $1}')"
+          if [[ -n "${tagged_sha}" && "${tagged_sha}" != "${SOURCE_SHA}" ]]; then
+            echo "::error::${RELEASE_TAG} points to ${tagged_sha}, not the validated source ${SOURCE_SHA}."
+            exit 1
+          fi
+          echo 'current=true' >> "${GITHUB_OUTPUT}"
+  draft-release:
+    needs:
+      - plan
+      - build
+      - verify-source
+    if: needs.verify-source.outputs.current == 'true'
+    permissions:
+      contents: write
+    uses: dceoy/gha-for-devops/.github/workflows/github-release.yml@9e394d7c18b3a00fb853cd3c693cc4eeb5f0c825  # v2.3.0
+    with:
+      tag-name: ${{ needs.plan.outputs.release-tag }}
+      create-new-tag: true
+      draft: true
+  attach-assets:
+    needs:
+      - build
+      - draft-release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - name: Download distributions
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8.0.2
+        with:
+          name: ${{ needs.build.outputs.distribution-artifact-name }}
+          path: dist/
+      - name: Check distribution version
+        env:
+          RELEASE_TAG: ${{ needs.draft-release.outputs.release-tag }}
+        run: |
+          version="${RELEASE_TAG#v}"
+          test -f "dist/mt5cli-${version}.tar.gz"
+          shopt -s nullglob
+          wheels=(dist/mt5cli-"${version}"-*.whl)
+          if ((${#wheels[@]} == 0)); then
+            echo "::error::No wheel found for ${RELEASE_TAG}."
+            exit 1
+          fi
+      - name: Sign wheels with Sigstore
+        uses: sigstore/gh-action-sigstore-python@790bc6befb9d733738f18d8f895854b453640ec9  # v3.5.0
+        with:
+          inputs: ./dist/*.whl
+      - name: Attach distributions and signatures
+        env:
+          GH_TOKEN: ${{ github.token }}
+          RELEASE_TAG: ${{ needs.draft-release.outputs.release-tag }}
+        run: |
+          gh release upload "${RELEASE_TAG}" dist/* --repo "${GITHUB_REPOSITORY}" --clobber
+  publish-to-pypi:
+    needs:
+      - build
+      - attach-assets
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/mt5cli
+    permissions:
+      id-token: write
+    steps:
+      - name: Download distributions
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8.0.2
+        with:
+          name: ${{ needs.build.outputs.distribution-artifact-name }}
+          path: dist/
+      - name: Publish distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@7245906fb61fa33a13554f9d5fb856fe61758086  # v1.14.3
+        with:
+          verbose: true
+  # Recovery: if publish-to-pypi succeeded but this job failed, a rerun fails closed at
+  # PyPI (duplicate version) and re-uploads draft assets via `--clobber`. Do not publish
+  # the draft by hand until the wheel/sdist filenames and SHA-256 digests in
+  # https://pypi.org/pypi/mt5cli/<version>/json match the draft's assets; then run
+  # `gh release edit v<version> --draft=false`.
+  publish-release:
+    needs:
+      - draft-release
+      - publish-to-pypi
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Publish GitHub Release
+        env:
+          GH_TOKEN: ${{ github.token }}
+          RELEASE_TAG: ${{ needs.draft-release.outputs.release-tag }}
+        run: |
+          gh release edit "${RELEASE_TAG}" --repo "${GITHUB_REPOSITORY}" --draft=false

{mt5cli-1.7.1 → mt5cli-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: mt5cli
-Version: 1.7.1
+Version: 1.7.3
 Summary: Generic MT5 data and execution infrastructure for Python applications
 Project-URL: Repository, https://github.com/dceoy/mt5cli.git
 Author-email: dceoy <dceoy@users.noreply.github.com>
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Office/Business :: Financial :: Investment
 Requires-Python: <3.15,>=3.11
 Requires-Dist: pandas>=2.2.2
-Requires-Dist: pdmt5>=1.2.0
+Requires-Dist: pdmt5>=1.2.4
 Requires-Dist: typer>=0.26.0
 Provides-Extra: otel
 Requires-Dist: opentelemetry-api>=1.23.0; extra == 'otel'
@@ -211,7 +211,7 @@ python -m mt5cli -o account.csv account-info
 | `order-send`           | Send a raw trade request to the trade server (`--yes` required; expert path)                                                                                             |
 | `close-positions`      | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` available; optional `--filling-mode` / `--deviation` / `--comment` / `--magic`) |
 | `collect-history`      | Collect rates, history-orders, and history-deals for one or more symbols into a single SQLite database (ticks opt-in via `--dataset ticks`)                              |
-| `history-gaps`         | Export a SQLite-only one-row-per-gap report from managed rate compatibility views without connecting to MT5                                                              |
+| `history-gaps`         | Export a SQLite-only one-row-per-gap report from the collected `rates` table (or custom rate tables) without connecting to MT5                                           |
 | `publish-dashboard`    | Publish Parquet analytics datasets and a manifest from a SQLite history database for static dashboards (`--sqlite3`; `-o` is the manifest path; no MT5)                  |
 | `snapshot`             | Snapshot current account, position, order, and terminal state into SQLite                                                                                                |
 
@@ -223,13 +223,21 @@ and `MT5_PATH` when unset, and explicit CLI values still win.
 
 ### `history-gaps`
 
-Inspect collected SQLite rate views offline and export one row per detected gap.
-For managed compatibility views, the command infers bar spacing from the view
-name. Use `--granularity-seconds` for custom tables or views.
+Inspect collected SQLite rates offline and export one row per detected gap.
+For the canonical `rates` table, the command infers bar spacing from each
+series' `timeframe` column (series without a fixed interval, such as `MN1`, are
+skipped). Use `--table` with `--granularity-seconds` for custom tables or views.
 
 ```bash
 mt5cli -o gaps.json history-gaps --sqlite3 history.db
-mt5cli -o eurusd.csv history-gaps --sqlite3 history.db --table rate_EURUSD__M1_1
+```
+
+`--table` targets a custom table or view that you create yourself. Such tables
+carry no `timeframe` metadata, so pass the bar interval explicitly:
+
+```bash
+sqlite3 history.db "CREATE VIEW eurusd_m1 AS SELECT time, close FROM rates WHERE symbol = 'EURUSD' AND timeframe = 1"
+mt5cli -o eurusd.csv history-gaps --sqlite3 history.db --table eurusd_m1 --granularity-seconds 60
 ```
 
 ### `collect-history`

{mt5cli-1.7.1 → mt5cli-1.7.3}/README.md

@@ -182,7 +182,7 @@ python -m mt5cli -o account.csv account-info
 | `order-send`           | Send a raw trade request to the trade server (`--yes` required; expert path)                                                                                             |
 | `close-positions`      | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` available; optional `--filling-mode` / `--deviation` / `--comment` / `--magic`) |
 | `collect-history`      | Collect rates, history-orders, and history-deals for one or more symbols into a single SQLite database (ticks opt-in via `--dataset ticks`)                              |
-| `history-gaps`         | Export a SQLite-only one-row-per-gap report from managed rate compatibility views without connecting to MT5                                                              |
+| `history-gaps`         | Export a SQLite-only one-row-per-gap report from the collected `rates` table (or custom rate tables) without connecting to MT5                                           |
 | `publish-dashboard`    | Publish Parquet analytics datasets and a manifest from a SQLite history database for static dashboards (`--sqlite3`; `-o` is the manifest path; no MT5)                  |
 | `snapshot`             | Snapshot current account, position, order, and terminal state into SQLite                                                                                                |
 
@@ -194,13 +194,21 @@ and `MT5_PATH` when unset, and explicit CLI values still win.
 
 ### `history-gaps`
 
-Inspect collected SQLite rate views offline and export one row per detected gap.
-For managed compatibility views, the command infers bar spacing from the view
-name. Use `--granularity-seconds` for custom tables or views.
+Inspect collected SQLite rates offline and export one row per detected gap.
+For the canonical `rates` table, the command infers bar spacing from each
+series' `timeframe` column (series without a fixed interval, such as `MN1`, are
+skipped). Use `--table` with `--granularity-seconds` for custom tables or views.
 
 ```bash
 mt5cli -o gaps.json history-gaps --sqlite3 history.db
-mt5cli -o eurusd.csv history-gaps --sqlite3 history.db --table rate_EURUSD__M1_1
+```
+
+`--table` targets a custom table or view that you create yourself. Such tables
+carry no `timeframe` metadata, so pass the bar interval explicitly:
+
+```bash
+sqlite3 history.db "CREATE VIEW eurusd_m1 AS SELECT time, close FROM rates WHERE symbol = 'EURUSD' AND timeframe = 1"
+mt5cli -o eurusd.csv history-gaps --sqlite3 history.db --table eurusd_m1 --granularity-seconds 60
 ```
 
 ### `collect-history`

{mt5cli-1.7.1 → mt5cli-1.7.3}/mt5cli/analytics.py

@@ -200,7 +200,7 @@ _STRATEGY_STATS_SQL = (
 _EQUITY_SQL = (
     "SELECT time, date, ticket, position_id, symbol, magic, leg_index, role,"
     " net_profit,"
-    " SUM(net_profit) OVER (ORDER BY time, ticket, role, leg_index)"
+    " SUM(net_profit) OVER (ORDER BY time, ticket, leg_index, role)"
     " AS cumulative_net_profit"
     " FROM analytics_realized_events"
 )

{mt5cli-1.7.1 → mt5cli-1.7.3}/mt5cli/client.py

@@ -21,7 +21,7 @@ import pandas as pd
 from pdmt5 import Mt5Config, Mt5DataClient, Mt5RuntimeError
 
 from .converters import ensure_trade_server_time, recent_window
-from .exceptions import normalize_mt5_exception
+from .exceptions import Mt5OperationError, normalize_mt5_exception
 from .utils import coerce_login as _coerce_login
 from .utils import parse_tick_flags, parse_timeframe
 
@@ -272,6 +272,22 @@ def _fetch_recent_ticks(
     return frame
 
 
+def _fetch_market_book(client: Mt5DataClient, symbol: str) -> pd.DataFrame:
+    # MT5 only serves market depth for symbols subscribed via market_book_add,
+    # which reports failure by returning False rather than raising.
+    if not client.market_book_add(symbol):
+        msg = f"Failed to subscribe to market depth for {symbol!r}."
+        raise Mt5OperationError(msg)
+    try:
+        return client.market_book_get_as_df(symbol=symbol)
+    finally:
+        if not client.market_book_release(symbol):
+            logger.warning(
+                "Failed to release market depth subscription for %s.",
+                symbol,
+            )
+
+
 def _fetch_minimum_margins(client: Mt5DataClient, symbol: str) -> pd.DataFrame:
     sym = client.symbol_info(symbol)
     account = client.account_info()
@@ -822,7 +838,7 @@ class _BaseMT5Client:
 
     def market_book(self, symbol: str) -> pd.DataFrame:
         """Return market depth for a symbol."""
-        return self._fetch(lambda c: c.market_book_get_as_df(symbol=symbol))
+        return self._fetch(lambda c: _fetch_market_book(c, symbol))
 
     def recent_ticks(
         self,