Merge branch 'develop' into 4-dependency-audit

Closes #74

.gitea/workflows/image.yml

@@ -28,9 +28,8 @@ jobs:
           docker version
           docker buildx version
       - run: npm ci
-      - run: npx --no-install prisma generate
       - run: npm run verify
-      - run: npm run test:e2e
+      - run: node test/sqlite.cjs --all
       - name: Login with dedicated Nexus writer
         env:
           REGISTRY_USERNAME: ${{ secrets.NEXUS_USERNAME }}

.gitea/workflows/verify.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [develop, main]
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [opened, synchronize, reopened, edited]
   schedule:
     - cron: '47 5 * * *'
 
@@ -40,6 +40,7 @@ jobs:
     needs: commits
     if: >-
       !cancelled() &&
+      gitea.event.action != 'edited' &&
       (needs.commits.result == 'success' || needs.commits.result == 'skipped')
     timeout-minutes: 15
     runs-on: ubuntu-latest
@@ -67,7 +68,8 @@ jobs:
   verify:
     needs: [commits, security]
     if: >-
-      !cancelled() && needs.security.result == 'success' &&
+      !cancelled() && gitea.event.action != 'edited' &&
+      needs.security.result == 'success' &&
       gitea.event_name != 'schedule'
     timeout-minutes: 45
     runs-on: ubuntu-latest
@@ -81,12 +83,10 @@ jobs:
         with:
           node-version-file: .nvmrc
       - run: npm ci
-      - name: Generate Prisma client before typechecks
-        run: npx --no-install prisma generate
       - name: Run all backend gates
         run: npm run verify
       - name: Run isolated SQLite and runtime OpenAPI suites
-        run: npm run test:e2e
+        run: node test/sqlite.cjs --all
       - name: Analyze develop with SonarQube
         if: gitea.event_name == 'push' && gitea.ref == 'refs/heads/develop'
         # v2.3.0: same Docker-based scanner used for SonarQube 9.9.

Dockerfile

@@ -19,7 +19,8 @@ EXPOSE 3000
 CMD ["npm", "run", "start:dev"]
 
 FROM dependencies AS build
-RUN npm run build && npm prune --omit=dev --omit=optional
+# The client is already generated at the shared dependencies stage (same revision).
+RUN npx --no-install nest build && npm prune --omit=dev --omit=optional
 
 FROM base AS production
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates=20250419~deb12u1 openssl=3.0.20-1~deb12u2 && rm -rf /var/lib/apt/lists/* \

README.md

@@ -14,6 +14,7 @@ cp .env.example .env
 nvm use --silent
 npm ci
 npx prisma migrate deploy
+npx prisma generate
 npm run start:dev
 ```
 
@@ -60,7 +61,7 @@ Compose topology принадлежит workspace, эксплуатационн
 npm run verify
 ```
 
-Он запускает zero-warning lint,
+Он запускает генерацию Prisma client, zero-warning lint,
 application/test typechecks, Jest с покрытием и build. `npm run lint:fix` — отдельная
 записывающая команда. `npm run test:cov` также доступен отдельно; общего числового
 threshold нет. `npm run test:e2e` отдельно проверяет функциональные HTTP suites
@@ -80,11 +81,13 @@ TypeScript 7 требует поддержки со стороны `ts-jest` и
 Единый `.gitea/workflows/verify.yml` запускает `commits → security → verify`
 последовательно на PR; на push в `develop`/`main` — `security → verify`.
 Рабочие ветки проверяются после открытия PR, без дублирующего push-запуска.
-Изменение заголовка PR тоже повторяет проверки Conventional Commits.
+Изменение заголовка PR повторяет только проверку Conventional Commits; `security`
+и `verify` на metadata-only событии не запускаются.
 Новый запуск отменяет устаревший для того же PR/ветки и типа события
 (требуется Gitea 1.26+). Ежедневно в 05:47 UTC выполняется только `security`.
-Job `verify` запускает `npm ci`, генерацию Prisma client,
+Job `verify` запускает `npm ci` и `npm run verify` (генерация Prisma client
-`npm run verify` и функциональный `npm run test:e2e`. Используется только checkout
+внутри gate, один Nest build), затем функциональный `node test/sqlite.cjs --all`
+на уже собранных артефактах. Используется только checkout
 backend и его зависимости; OpenAPI генерируется во время проверки, SHA записывается в лог.
 Успешный unit gate не заменяет SQLite/e2e; ошибка любой suite завершает job с FAIL.
 
@@ -248,10 +251,14 @@ breaking changes относительно предыдущего выпуска.
 настраивается отдельно. История migrations применяется штатным `migrate deploy`.
 
 Регрессия самого запуска: `node test/sqlite-regression.cjs`. Она выполняет
-три последовательных и два параллельных полных e2e, проверяет уникальность DB,
+три последовательных и два параллельных запуска двух обычных e2e suites,
-сохранность вымышленного внешнего файла, отказ migration и SIGINT/SIGTERM cleanup.
+проверяет уникальность DB, сохранность вымышленного внешнего файла, отказ migration
+и SIGINT/SIGTERM cleanup. Полный e2e набор остаётся в `npm run test:e2e`.
 Логи остаются в каталоге из вывода. Для одной suite:
-`node test/sqlite.cjs app.e2e-spec.ts`.
+`node test/sqlite.cjs app.e2e-spec.ts`. Crash-регрессия в
+`tbank-operations-sync.e2e-spec.ts` загружает классы из `dist/`, поэтому перед
+адресным запуском этой suite выполните `npm run build`, иначе child/dist может
+расходиться с parent/src.
 
 | Риск | Проверка реальной DB |
 | --- | --- |

package-lock.json

@@ -21,7 +21,7 @@
         "@prisma/adapter-better-sqlite3": "7.10.0",
         "@prisma/client": "7.10.0",
         "bcrypt": "6.0.0",
-        "better-sqlite3": "13.0.3",
+        "better-sqlite3": "12.11.1",
         "cheerio": "1.2.0",
         "class-transformer": "0.5.1",
         "class-validator": "0.15.1",
@@ -66,7 +66,6 @@
         "globals": "17.12.0",
         "jest": "30.5.1",
         "release-it": "21.0.2",
-        "source-map-support": "0.5.21",
         "supertest": "7.2.2",
         "ts-jest": "29.4.12",
         "ts-loader": "9.6.2",
@@ -3769,20 +3768,6 @@
         "better-sqlite3": "^12.6.0"
       }
     },
-    "node_modules/@prisma/adapter-better-sqlite3/node_modules/better-sqlite3": {
-      "version": "12.11.1",
-      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.11.1.tgz",
-      "integrity": "sha512-dq9AtApgg5PGFtBzPFSBl3HZQjHok5gaQCM6zh2Yk0aSmDCs1CbnVI8/HgASQkNKsWFpseIO9beg5xxpYhbIfA==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "prebuild-install": "^7.1.1"
-      },
-      "engines": {
-        "node": "20.x || 22.x || 23.x || 24.x || 25.x || 26.x"
-      }
-    },
     "node_modules/@prisma/client": {
       "version": "7.10.0",
       "resolved": "https://registry.npmjs.org/@prisma/client/-/client-7.10.0.tgz",
@@ -6282,15 +6267,17 @@
       "license": "MIT"
     },
     "node_modules/better-sqlite3": {
-      "version": "13.0.3",
+      "version": "12.11.1",
-      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-13.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.11.1.tgz",
-      "integrity": "sha512-RbOBxmLBG8uvFUc15X9+9SFemKcQ0WBuISBVkpuiaUB2qblC8UWlHEjdWVoZ8AdhSwmoEgsiXKfopX0CQxaACQ==",
+      "integrity": "sha512-dq9AtApgg5PGFtBzPFSBl3HZQjHok5gaQCM6zh2Yk0aSmDCs1CbnVI8/HgASQkNKsWFpseIO9beg5xxpYhbIfA==",
+      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "node-addon-api": "^8.0.0"
+        "bindings": "^1.5.0",
+        "prebuild-install": "^7.1.1"
       },
       "engines": {
-        "node": ">=22"
+        "node": "20.x || 22.x || 23.x || 24.x || 25.x || 26.x"
       }
     },
     "node_modules/bindings": {
@@ -13636,6 +13623,7 @@
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -13647,6 +13635,7 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }

package.json

@@ -14,7 +14,7 @@
     "format": "npm run lint:fix",
     "start": "nest start",
     "start:dev": "NODE_ENV=development nest start --watch --path tsconfig.dev.json",
-    "start:debug": "nest start --debug --watch --path tsconfig.dev.json",
+    "start:debug": "NODE_ENV=development nest start --debug --watch --path tsconfig.dev.json",
     "start:prod": "node dist/src/main.js",
     "lint": "npm run lint:check",
     "lint:check": "eslint . --max-warnings=0",
@@ -31,7 +31,7 @@
     "test:container": "node test/container-smoke.cjs",
     "test:durability": "node test/bank-cards-durability.cjs",
     "test:openapi-contract": "npm run build && node test/sqlite.cjs openapi-contract.e2e-spec.ts",
-    "verify": "npm run lint && npm run test:lint && npm run typecheck:app && npm run typecheck:test && npm run test:cov -- --runInBand && npm run build",
+    "verify": "prisma generate && npm run lint && npm run test:lint && npm run typecheck:app && npm run typecheck:test && npm run test:cov -- --runInBand && nest build",
     "release:preview": "release-it --dry-run --ci",
     "release:prepare": "release-it --ci",
     "commitlint": "commitlint",
@@ -50,7 +50,7 @@
     "@prisma/adapter-better-sqlite3": "7.10.0",
     "@prisma/client": "7.10.0",
     "bcrypt": "6.0.0",
-    "better-sqlite3": "13.0.3",
+    "better-sqlite3": "12.11.1",
     "cheerio": "1.2.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.15.1",
@@ -95,7 +95,6 @@
     "globals": "17.12.0",
     "jest": "30.5.1",
     "release-it": "21.0.2",
-    "source-map-support": "0.5.21",
     "supertest": "7.2.2",
     "ts-jest": "29.4.12",
     "ts-loader": "9.6.2",
@@ -144,7 +143,6 @@
     "better-sqlite3@12.11.1": true,
     "fsevents@2.3.3": true,
     "protobufjs@7.6.5": true,
-    "unrs-resolver@1.12.2": true,
+    "unrs-resolver@1.12.2": true
-    "better-sqlite3@13.0.3": true
   }
 }

src/common/logging/structured-logger.service.ts

@@ -8,6 +8,7 @@ const allowedFields = new Set([
   'asOf',
   'attempts',
   'brokerageAccountId',
+  'channelState',
   'clientRequestId',
   'code',
   'count',
@@ -15,12 +16,16 @@ const allowedFields = new Set([
   'environment',
   'found',
   'grpcCode',
+  'headersReceived',
   'method',
+  'networkMs',
   'operation',
+  'queueWaitMs',
   'requestId',
   'route',
   'service',
   'status',
+  'trackingId',
   'userId',
 ]);
 

src/integrations/tbank/tbank.client.spec.ts

@@ -1,5 +1,6 @@
-import { status } from '@grpc/grpc-js';
+import { Metadata, status } from '@grpc/grpc-js';
 import { NotFoundException, ServiceUnavailableException } from '@nestjs/common';
+import { EventEmitter } from 'node:events';
 
 import { TbankOperationState } from './tbank-protocol';
 import { TbankClient } from './tbank.client';
@@ -136,6 +137,70 @@ describe('TbankClient operations', () => {
     );
     jest.useRealTimers();
   });
+
+  it('distinguishes a gRPC deadline from queue delay without logging upstream secrets', async () => {
+    const logger = { event: jest.fn() };
+    const client = Object.assign(Object.create(TbankClient.prototype) as TbankClient, {
+      logger,
+      queue: { size: 0, run: (operation: () => Promise<unknown>) => operation() },
+    });
+    const channel = { getConnectivityState: () => 1 };
+    const service = {
+      getChannel: () => channel,
+      getAccounts: (_input: unknown, _metadata: unknown, _options: unknown, callback: (error: unknown) => void) => {
+        const call = new EventEmitter();
+        void Promise.resolve().then(() => callback({ code: status.DEADLINE_EXCEEDED, details: 'Bearer secret' }));
+        return call;
+      },
+    };
+    const invoke = (client as unknown as { call: (token: string, service: unknown, method: string, input: object) => Promise<unknown> }).call.bind(client);
+    jest.useFakeTimers();
+    try {
+      const failed = invoke('secret', service, 'getAccounts', {});
+      await Promise.all([
+        expect(failed).rejects.toBeInstanceOf(ServiceUnavailableException),
+        jest.advanceTimersByTimeAsync(1000),
+      ]);
+      expect(logger.event).toHaveBeenLastCalledWith('error', 'tbank.rpc.failed', expect.objectContaining({
+        operation: 'getAccounts', grpcCode: status.DEADLINE_EXCEEDED,
+        queueWaitMs: 0, channelState: 'CONNECTING', headersReceived: false,
+      }));
+      const [, , fields] = logger.event.mock.calls.at(-1) as [string, string, { networkMs: unknown }];
+      expect(typeof fields.networkMs).toBe('number');
+      expect(JSON.stringify(logger.event.mock.calls)).not.toContain('secret');
+    } finally {
+      jest.useRealTimers();
+    }
+  });
+
+  it('records response headers and a validated upstream tracking ID', async () => {
+    const logger = { event: jest.fn() };
+    const client = Object.assign(Object.create(TbankClient.prototype) as TbankClient, {
+      logger,
+      queue: { size: 0, run: (operation: () => Promise<unknown>) => operation() },
+    });
+    const headers = new Metadata();
+    headers.set('x-tracking-id', '123e4567-e89b-12d3-a456-426614174000');
+    headers.set('authorization', 'Bearer secret');
+    const service = {
+      getChannel: () => ({ getConnectivityState: () => 2 }),
+      getAccounts: (_input: unknown, _metadata: unknown, _options: unknown, callback: (error: null, response: object) => void) => {
+        const call = new EventEmitter();
+        void Promise.resolve().then(() => {
+          call.emit('metadata', headers);
+          callback(null, { accounts: [] });
+        });
+        return call;
+      },
+    };
+    const invoke = (client as unknown as { call: (token: string, service: unknown, method: string, input: object) => Promise<unknown> }).call.bind(client);
+    await expect(invoke('secret', service, 'getAccounts', {})).resolves.toEqual({ accounts: [] });
+    expect(logger.event).toHaveBeenLastCalledWith('debug', 'tbank.rpc.completed', expect.objectContaining({
+      channelState: 'READY', headersReceived: true,
+      trackingId: '123e4567-e89b-12d3-a456-426614174000',
+    }));
+    expect(JSON.stringify(logger.event.mock.calls)).not.toContain('secret');
+  });
 });
 
 describe('TbankClient metadata retries', () => {

src/integrations/tbank/tbank.client.ts

@@ -2,6 +2,7 @@ import {
   ChannelCredentials,
   Client,
   ClientUnaryCall,
+  connectivityState,
   loadPackageDefinition,
   Metadata,
   ServiceError,
@@ -60,6 +61,13 @@ type Unary<Request, Response> = (
   callback: (error: null | ServiceError, response: Response) => void,
 ) => ClientUnaryCall;
 type TbankClientService = Client & Record<string, Unary<never, never>>;
+type RpcDiagnostics = {
+  channelState?: string;
+  headersReceived?: boolean;
+  networkMs?: number;
+  queueWaitMs?: number;
+  trackingId?: string;
+};
 export type TbankDecimal = { nano?: number | string; units?: number | string };
 export type TbankMoney = TbankDecimal & { currency?: string };
 export type TbankAccount = {
@@ -511,15 +519,23 @@ export class TbankClient {
     for (let attempts = FIRST_ATTEMPT; attempts <= RPC_MAX_ATTEMPTS; attempts += ATTEMPT_INCREMENT) {
       const startedAt = performance.now();
       const queueFull = this.queue.size >= MAX_QUEUE_SIZE;
+      const diagnostics: RpcDiagnostics = {};
       try {
         if (queueFull) {
           throw new ServiceUnavailableException({ code: TbankErrorCode.Unavailable });
         }
-        const response = await this.queue.run(() =>
+        const response = await this.queue.run(() => {
-          this.request<Response>(token, client, method, request),
+          const sentAt = performance.now();
-        );
+          diagnostics.queueWaitMs = Math.round(sentAt - startedAt);
+          return this.request<Response>(
+            token, client, method, request, diagnostics,
+          ).finally(() => {
+            diagnostics.networkMs = Math.round(performance.now() - sentAt);
+          });
+        });
         this.logger.event('debug', 'tbank.rpc.completed', {
           operation: method,
+          ...diagnostics,
           attempts,
           durationMs: Math.round(performance.now() - startedAt),
         });
@@ -537,6 +553,7 @@ export class TbankClient {
         if (retryable && attempts < RPC_MAX_ATTEMPTS) {
           this.logger.event('warn', 'tbank.rpc.retry', {
             operation: method,
+            ...diagnostics,
             ...failureContext,
             attempts,
             durationMs: Math.round(performance.now() - startedAt),
@@ -546,6 +563,7 @@ export class TbankClient {
         }
         this.logger.event('error', 'tbank.rpc.failed', {
           operation: method,
+          ...diagnostics,
           ...failureContext,
           attempts: queueFull ? NO_RPC_ATTEMPTS : attempts,
           durationMs: Math.round(performance.now() - startedAt),
@@ -573,17 +591,42 @@ export class TbankClient {
     client: TbankClientService,
     method: string,
     request: object,
+    diagnostics?: RpcDiagnostics,
   ): Promise<Response> {
     return new Promise((resolve, reject) => {
       const metadata = new Metadata();
       metadata.set('Authorization', `Bearer ${token}`);
+      // A channel state is a snapshot, not proof that this particular call reached the server.
+      const channel = diagnostics && client.getChannel();
+      if (diagnostics) diagnostics.headersReceived = false;
       // eslint-disable-next-line security/detect-object-injection -- Service and method names are internal RPC selections, not request input.
-      client[method](
+      const call = client[method](
         request as never,
         metadata,
         { deadline: new Date(Date.now() + requestDeadlineMs) },
-        (error, response) => (error ? reject(error) : resolve(response)),
+        (error, response) => {
+          if (diagnostics && channel) {
+            diagnostics.channelState = connectivityState[
+              channel.getConnectivityState(false)
+            ];
+          }
+          if (error) reject(error);
+          else resolve(response);
+        },
       );
+      if (diagnostics) {
+        call.on('metadata', (headers: Metadata) => {
+          diagnostics.headersReceived = true;
+          const trackingId = headers.get('x-tracking-id')[0];
+          // Only a UUID may enter logs; never forward arbitrary upstream metadata.
+          if (
+            typeof trackingId === 'string' &&
+            /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(trackingId)
+          ) {
+            diagnostics.trackingId = trackingId;
+          }
+        });
+      }
     });
   }
 }

src/modules/banking/bank-cards/application/bank-operations.service.ts

@@ -91,6 +91,101 @@ export class BankOperationsService {
     };
   }
 
+  private async pageViews(tx: Tx, rows: BankCardOperation[]) {
+    const userId = rows[0]?.userId;
+    if (!userId) return [];
+    const cardIds = new Set(
+      rows.flatMap((row) =>
+        [row.cardId, row.targetCardId].filter(
+          (id): id is string => id !== null,
+        ),
+      ),
+    );
+    const sourceIds = new Set(
+      rows.flatMap((row) => (row.originalExpenseId ? [row.originalExpenseId] : [])),
+    );
+    const [cards, sources] = await Promise.all([
+      tx.bankCard.findMany({ where: { userId, id: { in: [...cardIds] } } }),
+      tx.bankCardOperation.findMany({
+        where: { userId, id: { in: [...sourceIds] } },
+      }),
+    ]);
+    const categoryIds = new Set(
+      rows
+        .map(
+          (row) =>
+            sources.find((source) => source.id === row.originalExpenseId)
+              ?.categoryId ?? row.categoryId,
+        )
+        .filter((id): id is string => id !== null),
+    );
+    const expenseIds = new Set(
+      rows.flatMap((row) => {
+        const source = sources.find((item) => item.id === row.originalExpenseId);
+        return row.kind === BankOperationKind.Expense || source
+          ? [source?.id ?? row.id]
+          : [];
+      }),
+    );
+    const [categories, refunds] = await Promise.all([
+      tx.expenseCategory.findMany({
+        where: { userId, id: { in: [...categoryIds] } },
+      }),
+      tx.bankCardOperation.findMany({
+        where: {
+          userId,
+          originalExpenseId: { in: [...expenseIds] },
+          deletedAt: null,
+        },
+      }),
+    ]);
+    const cardsById = new Map(cards.map((card) => [card.id, card]));
+    const sourcesById = new Map(sources.map((source) => [source.id, source]));
+    const categoriesById = new Map(categories.map((category) => [category.id, category]));
+    return rows.map((row) => {
+      const card = cardsById.get(row.cardId) as { name: string };
+      const target = row.targetCardId ? cardsById.get(row.targetCardId) : null;
+      const source = row.originalExpenseId
+        ? sourcesById.get(row.originalExpenseId)
+        : null;
+      const categoryId = source?.categoryId ?? row.categoryId;
+      const relatedRefunds =
+        row.kind === BankOperationKind.Expense || source
+          ? refunds.filter(
+              (refund) =>
+                refund.originalExpenseId === (source?.id ?? row.id) &&
+                (!source || refund.id !== row.id),
+            )
+          : [];
+      return {
+        id: row.id,
+        kind: row.kind as BankOperationDto['kind'],
+        cardId: row.cardId,
+        cardName: card.name,
+        targetCardId: row.targetCardId,
+        targetCardName: target?.name ?? null,
+        categoryId,
+        categoryName: categoriesById.get(categoryId ?? '')?.name ?? null,
+        originalExpenseId: row.originalExpenseId,
+        amount: rubMoney(row.amountKopecks),
+        availableRefund:
+          row.kind === BankOperationKind.Expense || source
+            ? rubMoney(
+                (source?.amountKopecks ?? row.amountKopecks) -
+                relatedRefunds.reduce(
+                  (sum, refund) => sum + refund.amountKopecks,
+                  ZERO_KOPECKS,
+                ),
+              )
+            : null,
+        date: row.date,
+        description: row.description,
+        version: row.version,
+        createdAt: row.createdAt.toISOString(),
+      };
+    });
+  }
+
   private async validateOperation(
     tx: Tx,
     userId: string,
@@ -359,9 +454,7 @@ export class BankOperationsService {
         take: limit,
       });
       return {
-        items: await Promise.all(
+        items: await this.pageViews(tx, rows),
-          rows.map((row) => this.operationView(tx, row)),
-        ),
         total,
         page,
         hasNext: page * limit < total,

src/modules/investments/brokerage-accounts/brokerage-accounts.service.ts

@@ -3,7 +3,7 @@ import { createHash } from 'node:crypto';
 
 import { investmentResourceMeta } from '../investment-resource.mapper';
 import { PortfolioService } from '../portfolio/portfolio.api';
-import { TbankSyncRepository } from '../tbank-sync/tbank-sync.repository';
+import { hourlyAttempt, TbankSyncRepository } from '../tbank-sync/tbank-sync.repository';
 import { BrokerageAccountDto, BrokerageAccountsResourceDto } from './brokerage-account.dto';
 
 @Injectable()
@@ -61,6 +61,7 @@ export class BrokerageAccountsService {
           : null,
         freshForMs: 3_600_000,
         work: null,
+        lastAttempt: hourlyAttempt(hourly, ['membership', 'portfolio']),
         dependencies: saved.accounts.map((account) => account.meta),
       }),
       sync: hourly

src/modules/investments/income/income-analytics.dto.ts

@@ -67,28 +67,6 @@ export class IncomeSummaryDto {
   declare calculatedAt: string;
 }
 
-export class IncomeComparisonCurrencyDto {
-  @ApiProperty()
-  declare currency: string;
-
-  @ApiProperty({ type: IncomeCurrencySummaryDto })
-  declare selected: IncomeCurrencySummaryDto;
-
-  @ApiProperty({ type: IncomeCurrencySummaryDto })
-  declare compared: IncomeCurrencySummaryDto;
-
-  @ApiProperty({ type: IncomeCurrencySummaryDto })
-  declare difference: IncomeCurrencySummaryDto;
-}
-
-export class IncomeComparisonDto {
-  @ApiProperty({ type: IncomePeriodDto })
-  declare period: IncomePeriodDto;
-
-  @ApiProperty({ type: IncomeComparisonCurrencyDto, isArray: true })
-  declare totalsByCurrency: IncomeComparisonCurrencyDto[];
-}
-
 export class IncomeBucketDto {
   @ApiProperty({ type: IncomePeriodDto })
   declare period: IncomePeriodDto;
@@ -135,12 +113,6 @@ export class IncomeAnalyticsEntryDto extends BrokerageOperationDto {
 }
 
 export class IncomeAnalyticsDto extends IncomeSummaryDto {
-  @ApiProperty({ type: IncomeComparisonDto, nullable: true })
-  declare previous: IncomeComparisonDto | null;
-
-  @ApiProperty({ type: IncomeComparisonDto, nullable: true })
-  declare yearComparison: IncomeComparisonDto | null;
-
   @ApiProperty({ enum: ['day', 'week', 'month'] })
   declare bucketGranularity: 'day' | 'month' | 'week';
 
@@ -162,7 +134,7 @@ export class IncomeSummaryResourceDto {
   declare meta: InvestmentResourceMetaDto;
 }
 
-const incomeDependencyRoles = ['selected', 'previous', 'year'] as const;
+const incomeDependencyRoles = ['selected'] as const;
 
 export class IncomeDependencyDto extends InvestmentDependencyDto {
   @ApiProperty({ enum: incomeDependencyRoles })

src/modules/investments/income/income-analytics.service.spec.ts

@@ -17,7 +17,7 @@ describe('IncomeAnalyticsService', () => {
 
   beforeEach(() => jest.clearAllMocks());
 
-  it('labels each comparison dependency independently of its resource key', async () => {
+  it('labels the selected dependency independently of its resource key', async () => {
     seed([]);
     const response = await service.analytics(
       'user',
@@ -27,32 +27,10 @@ describe('IncomeAnalyticsService', () => {
     );
     expect(response.meta.dependencies).toEqual([
       expect.objectContaining({ role: 'selected', resourceKey: 'period/0' }),
-      expect.objectContaining({ role: 'previous', resourceKey: 'period/1' }),
-      expect.objectContaining({ role: 'year', resourceKey: 'period/2' }),
     ]);
-  });
+    expect(
-
+      response.meta.dependencies.some((dependency) => dependency.role !== 'selected'),
-  it('labels an unavailable leap-day comparison as year', async () => {
+    ).toBe(false);
-    operations.collectRanges.mockImplementation(
-      (_user: string, _account: string, build: () => unknown[]) =>
-        build().map((_, index) => ({ items: [], meta: completeMeta(index) })),
-    );
-    const response = await service.analytics(
-      'user',
-      'account',
-      '2024-02-29',
-      '2024-02-29',
-    );
-    expect(response.meta.dependencies).toEqual([
-      expect.objectContaining({ role: 'selected' }),
-      expect.objectContaining({ role: 'previous' }),
-      expect.objectContaining({
-        role: 'year',
-        availability: 'temporarily-unavailable',
-        unavailableReason: 'CALENDAR_OR_ACCOUNT_HISTORY',
-      }),
-    ]);
-    expect(response.data?.yearComparison).toBeNull();
   });
 
   function seed(items: BrokerageOperationDto[]) {
@@ -63,7 +41,7 @@ describe('IncomeAnalyticsService', () => {
         build: (opened?: Date) => unknown[],
       ) => {
         build(undefined);
-        return [items, [], []].map((items, index) => ({
+        return [items].map((items, index) => ({
           items,
           meta: completeMeta(index),
         }));
@@ -247,8 +225,6 @@ describe('IncomeAnalyticsService', () => {
             entry('transfer', 'OPERATION_TYPE_DIVIDEND_TRANSFER', '99', 'RUB'),
             entry('usd', 'OPERATION_TYPE_COUPON', '1', 'USD'),
           ],
-          [],
-          [],
         ].map((items, index) => ({ items, meta: completeMeta(index) }));
       },
     );

src/modules/investments/income/income-analytics.service.ts

@@ -6,7 +6,6 @@ import {
   compare,
   decimalFromString,
   formatDecimal,
-  subtract,
 } from '../../../common/decimal';
 import { isTbankProtocolValue, TbankOperationType } from '../../../integrations/tbank/tbank-protocol';
 import { DateOnlyRange, moscowDate } from '../investment-calendar';
@@ -18,7 +17,6 @@ import {
 import {
   IncomeAnalyticsEntryDto,
   IncomeAnalyticsResourceDto,
-  IncomeComparisonDto,
   IncomeCurrencySummaryDto,
   IncomeDependencyDto,
   IncomeInstrumentDto,
@@ -47,14 +45,11 @@ export class IncomeAnalyticsService {
     accountId: string,
     observe = false,
   ): Promise<IncomeSummaryResourceDto> {
-    let plan = planIncomePeriod(undefined, undefined);
+    const plan = planIncomePeriod(undefined, undefined);
     const [selected] = await this.operations.collectRanges(
       userId,
       accountId,
-      (openedAt) => {
+      () => [plan.selected],
-        plan = planIncomePeriod(undefined, undefined, openedAt);
-        return [plan.selected];
-      },
       observe,
     );
     if (selected.items === null) return { data: null, meta: selected.meta };
@@ -77,44 +72,17 @@ export class IncomeAnalyticsService {
     to: string | undefined,
     observe = false,
   ): Promise<IncomeAnalyticsResourceDto> {
-    let plan = planIncomePeriod(from, to);
+    const plan = planIncomePeriod(from, to);
-    const periods = await this.operations.collectRanges(
+    const [current] = await this.operations.collectRanges(
       userId,
       accountId,
-      (openedAt) => {
+      () => [plan.selected],
-        plan = planIncomePeriod(from, to, openedAt);
-        return [
-          plan.selected,
-          plan.previous,
-          ...(plan.yearAgo ? [plan.yearAgo] : []),
-        ];
-      },
       observe,
     );
-    const [current, prior, year] = periods;
-    // Preserve the legacy order while consumers migrate to explicit roles.
     const dependencies: IncomeDependencyDto[] = [
       { ...current.meta, role: 'selected' },
-      { ...prior.meta, role: 'previous' },
-      {
-        ...(plan.yearAgo && year
-          ? year.meta
-          : investmentResourceMeta({
-              resourceKey: 'income/yearAgo', // gitleaks:allow public resource identifier
-              dataRevision: 'unavailable',
-              availability: 'missing',
-              fetchedAt: null,
-              freshForMs: 0,
-              work: null,
-              unavailableReason: 'CALENDAR_OR_ACCOUNT_HISTORY',
-            })),
-        role: 'year',
-      },
     ];
-    const states = periods.map((period) => period.meta.sync);
+    const work = current.meta.sync;
-    const work =
-      states.find((state) => state.state === 'running') ??
-      states.find((state) => state.state === 'failed');
     const meta = {
       ...investmentResourceMeta({
         resourceKey: `income/${accountId}/${plan.selected.from}/${plan.selected.to}`,
@@ -127,7 +95,10 @@ export class IncomeAnalyticsService {
           ? new Date(current.meta.lastSuccessfulAt)
           : null,
         freshForMs: current.meta.freshness === 'fresh' ? Infinity : STALE_FRESHNESS_MS,
-        work: work?.id ? { ...work, id: work.id } : null,
+        work: work.id
+          ? { id: work.id, state: work.state, errorCode: work.errorCode }
+          : null,
+        lastAttempt: current.meta.lastAttempt,
         coverage: current.meta.coverage,
         dependencies,
       }),
@@ -147,14 +118,6 @@ export class IncomeAnalyticsService {
           selected,
           current.meta.lastSuccessfulAt,
         ),
-        previous:
-          prior.items === null
-            ? null
-            : comparison(selected, plan.previous, qualifying(prior.items)),
-        yearComparison:
-          plan.yearAgo && year?.items !== null && year
-            ? comparison(selected, plan.yearAgo, qualifying(year.items))
-            : null,
         bucketGranularity: plan.granularity,
         buckets: buckets(plan.selected, plan.granularity, selected),
         instruments: instruments(selected),
@@ -198,38 +161,6 @@ function totals(entries: BrokerageOperationDto[]): IncomeCurrencySummaryDto[] {
     .map(([currency, total]) => presentTotal(currency, total));
 }
 
-function comparison(
-  selectedEntries: BrokerageOperationDto[],
-  comparedPeriod: DateOnlyRange,
-  comparedEntries: BrokerageOperationDto[],
-): IncomeComparisonDto {
-  const selected = new Map(
-    totals(selectedEntries).map((total) => [total.currency, total]),
-  );
-  const compared = new Map(
-    totals(comparedEntries).map((total) => [total.currency, total]),
-  );
-  const currencies = [
-    ...new Set([...selected.keys(), ...compared.keys()]),
-  // eslint-disable-next-line sonarjs/no-alphabetical-sort -- Code-unit ordering is intentional for canonical keys and ISO dates; locale collation would change persisted bindings.
-  ].sort();
-  return {
-    period: comparedPeriod,
-    totalsByCurrency: currencies.map((currency) => {
-      const current =
-        selected.get(currency) ?? presentTotal(currency, zeroTotal());
-      const prior =
-        compared.get(currency) ?? presentTotal(currency, zeroTotal());
-      return {
-        currency,
-        selected: current,
-        compared: prior,
-        difference: difference(current, prior),
-      };
-    }),
-  };
-}
-
 function buckets(
   range: DateOnlyRange,
   granularity: IncomeBucketGranularity,
@@ -293,22 +224,6 @@ function instrumentKey(entry: BrokerageOperationDto): string {
   return `operation:${entry.account ? `${entry.account.id}:` : ''}${entry.id}`;
 }
 
-function difference(
-  left: IncomeCurrencySummaryDto,
-  right: IncomeCurrencySummaryDto,
-): IncomeCurrencySummaryDto {
-  return presentTotal(left.currency, {
-    coupon: subtract(
-      decimalFromString(left.coupon.value),
-      decimalFromString(right.coupon.value),
-    ),
-    dividend: subtract(
-      decimalFromString(left.dividend.value),
-      decimalFromString(right.dividend.value),
-    ),
-  });
-}
-
 function zeroTotal(): Total {
   return { coupon: { value: 0n, scale: 0 }, dividend: { value: 0n, scale: 0 } };
 }

src/modules/investments/income/income-period.spec.ts

@@ -23,16 +23,14 @@ describe('income period planning', () => {
     }
   });
 
-  it('uses a full previous month, skips impossible year-ago dates, and keeps empty buckets', () => {
+  it('keeps empty buckets and skips removed comparison ranges', () => {
-    const fullMonth = planIncomePeriod('2026-03-01', '2026-03-31');
-    expect(fullMonth.previous).toEqual({
-      from: '2026-02-01',
-      to: '2026-02-28',
-    });
-    expect(planIncomePeriod('2024-02-29', '2024-02-29').yearAgo).toBeNull();
     expect(
       rangeBuckets({ from: '2026-01-01', to: '2026-02-15' }, 'week'),
     ).toHaveLength(7);
+    expect(planIncomePeriod('2026-03-01', '2026-03-31')).toEqual({
+      selected: { from: '2026-03-01', to: '2026-03-31' },
+      granularity: 'day',
+    });
   });
 
   it('accepts multi-year periods and creates monthly buckets for the entire range', () => {
@@ -43,7 +41,6 @@ describe('income period planning', () => {
     expect(plan.selected).toEqual({ from: '2020-01-01', to: '2025-12-31' });
     expect(plan.granularity).toBe('month');
     expect(rangeBuckets(plan.selected, plan.granularity)).toHaveLength(72);
-    expect(plan.yearAgo).toEqual({ from: '2019-01-01', to: '2024-12-31' });
   });
 
   it('does not send the unfinished Moscow day as a future instant', () => {

src/modules/investments/income/income-period.ts

@@ -14,45 +14,28 @@ const MONDAY_WEEKDAY_INDEX = 1;
 const INCLUSIVE_DAY_OFFSET = 1;
 const NEXT_DAY_OFFSET = 1;
 const PREVIOUS_MONTH_LAST_DAY = 0;
-const PREVIOUS_DAY_OFFSET = -1;
-const PREVIOUS_YEAR_OFFSET = 1;
-const DATE_COMPONENT_DIGITS = 2;
 
 const DAILY_BUCKET_MAX_DAYS = 45;
 const WEEKLY_BUCKET_MAX_DAYS = 180;
 const DAYS_PER_WEEK = 7;
 const ISO_MONTH_LENGTH = 7;
-const ISO_YEAR_LENGTH = 4;
 
 export type IncomeBucketGranularity = 'day' | 'month' | 'week';
 
 export function planIncomePeriod(
   from: string | undefined,
   to: string | undefined,
-  openedDate?: Date,
 ): {
   granularity: IncomeBucketGranularity;
-  previous: DateOnlyRange;
   selected: DateOnlyRange;
-  yearAgo: DateOnlyRange | null;
 } {
   if (Boolean(from) !== Boolean(to)) throw invalidPeriod();
   const today = moscowDate(new Date());
   const selected =
     from && to ? { from, to } : { from: firstOfMonth(today), to: today };
   assertRange(selected, today);
-  const previous = isFullMonth(selected)
-    ? previousMonth(selected.from)
-    : shiftDays(selected, -rangeDays(selected));
-  const candidate = yearAgo(selected);
-  const yearAgoRange =
-    candidate && (!openedDate || candidate.from >= moscowDate(openedDate))
-      ? candidate
-      : null;
   return {
     selected,
-    previous,
-    yearAgo: yearAgoRange,
     granularity:
       rangeDays(selected) <= DAILY_BUCKET_MAX_DAYS
         ? 'day'
@@ -136,34 +119,6 @@ function endOfMonth(value: string): string {
   return new Date(Date.UTC(year, month, PREVIOUS_MONTH_LAST_DAY)).toISOString().slice(ISO_DATE_START, ISO_DATE_LENGTH);
 }
 
-function isFullMonth(range: DateOnlyRange): boolean {
-  return (
-    range.from === firstOfMonth(range.from) && range.to === endOfMonth(range.to)
-  );
-}
-
-function previousMonth(from: string): DateOnlyRange {
-  const last = addDays(firstOfMonth(from), PREVIOUS_DAY_OFFSET);
-  return { from: firstOfMonth(last), to: last };
-}
-
-function shiftDays(range: DateOnlyRange, days: number): DateOnlyRange {
-  return { from: addDays(range.from, days), to: addDays(range.to, days) };
-}
-
-function yearAgo(range: DateOnlyRange): DateOnlyRange | null {
-  const shift = (value: string) => {
-    const [year, month, day] = dateParts(value);
-    const result = `${String(year - PREVIOUS_YEAR_OFFSET).padStart(ISO_YEAR_LENGTH, '0')}-${String(month).padStart(DATE_COMPONENT_DIGITS, '0')}-${String(day).padStart(DATE_COMPONENT_DIGITS, '0')}`;
-    return utcDate(result).toISOString().slice(ISO_DATE_START, ISO_DATE_LENGTH) === result
-      ? result
-      : null;
-  };
-  const from = shift(range.from);
-  const to = shift(range.to);
-  return from && to ? { from, to } : null;
-}
-
 function invalidPeriod(): BadRequestException {
   return new BadRequestException({ code: IncomeErrorCode.InvalidPeriod });
 }

src/modules/investments/instruments/application/catalog-discovery.service.ts

@@ -9,9 +9,7 @@ import { StructuredLogger } from '../../../../common/logging/structured-logger.s
 import { isTbankErrorCode, TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
 import {
   TbankAccessService,
-  type TbankBond,
   TbankClient,
-  type TbankShare,
   tbankSourceTtlMs,
   type TbankSyncAttempt,
 } from '../../../../integrations/tbank/tbank.api';
@@ -28,6 +26,7 @@ import {
   catalogSearchLimit,
   selectCatalogInstruments,
 } from './catalog-selection';
+import { publicInstrument } from './public-instrument';
 
 const UNAMBIGUOUS_MATCH_COUNT = 1;
 const NO_MATCHES = 0;
@@ -305,16 +304,18 @@ export class CatalogDiscoveryService {
       input.query,
       input.instrumentType,
     ).slice(FIRST_RESULT_OFFSET, input.exactTicker ? tickerAmbiguityLimit : catalogSearchLimit);
-    const details = await Promise.all(
+    const [details, prices] = await Promise.all([
-      instruments.map((item) =>
+      Promise.all(
-        input.instrumentType === 'share'
+        instruments.map((item) =>
-          ? this.tbank.getShare(token, item.uid)
+          input.instrumentType === 'share'
-          : this.tbank.getBond(token, item.uid),
+            ? this.tbank.getShare(token, item.uid)
+            : this.tbank.getBond(token, item.uid),
+        ),
       ),
-    );
+      instruments.length
-    const prices = instruments.length
+        ? this.tbank.getLastPrices(token, instruments.map((item) => item.uid))
-      ? await this.tbank.getLastPrices(token, instruments.map((item) => item.uid))
+        : [],
-      : [];
+    ]);
     const fetchedAt = new Date();
     const data = instruments.flatMap((item, index) => {
       const detail = details.at(index);
@@ -495,37 +496,3 @@ export class CatalogDiscoveryService {
     }
   }
 }
-
-function publicInstrument(value: TbankBond | TbankShare) {
-  const bond = value as TbankBond;
-  const share = value as TbankShare;
-  return {
-    uid: value.uid,
-    figi: value.figi,
-    assetUid: value.assetUid,
-    name: value.name,
-    ticker: value.ticker,
-    isin: value.isin,
-    classCode: value.classCode,
-    realExchange: value.realExchange,
-    apiTradeAvailableFlag: value.apiTradeAvailableFlag,
-    currency: value.currency,
-    shareType: share.shareType,
-    sector: value.sector,
-    lot: value.lot,
-    brand: value.brand ? { logoName: value.brand.logoName } : undefined,
-    first_1dayCandleDate: value.first_1dayCandleDate,
-    nominal: bond.nominal,
-    initialNominal: bond.initialNominal,
-    aciValue: bond.aciValue,
-    maturityDate: bond.maturityDate,
-    callDate: bond.callDate,
-    couponQuantityPerYear: bond.couponQuantityPerYear,
-    floatingCouponFlag: bond.floatingCouponFlag,
-    perpetualFlag: bond.perpetualFlag,
-    amortizationFlag: bond.amortizationFlag,
-    subordinatedFlag: bond.subordinatedFlag,
-    bondType: bond.bondType,
-    riskLevel: bond.riskLevel,
-  };
-}

src/modules/investments/instruments/application/catalog-enrichment.service.ts

@@ -38,6 +38,7 @@ import {
 import { toSavedCandle } from '../infrastructure/tbank-candle.mapper';
 import { catalogSearchLimit } from './catalog-selection';
 import { previousClose, timestamp } from './instrument-market';
+import { publicInstrument } from './public-instrument';
 
 const MISSING_DATA_REVISION = 0;
 const FIRST_QUEUE_INDEX = 0;
@@ -651,39 +652,6 @@ export type CatalogPayload = {
   tradingStatus?: null | string;
 };
 
-function publicInstrument(value: TbankBond | TbankShare) {
-  const bond = value as TbankBond;
-  const share = value as TbankShare;
-  return {
-    uid: value.uid,
-    figi: value.figi,
-    assetUid: value.assetUid,
-    name: value.name,
-    ticker: value.ticker,
-    isin: value.isin,
-    classCode: value.classCode,
-    realExchange: value.realExchange,
-    apiTradeAvailableFlag: value.apiTradeAvailableFlag,
-    currency: value.currency,
-    shareType: share.shareType,
-    sector: value.sector,
-    lot: value.lot,
-    brand: value.brand ? { logoName: value.brand.logoName } : undefined,
-    first_1dayCandleDate: value.first_1dayCandleDate,
-    nominal: bond.nominal,
-    initialNominal: bond.initialNominal,
-    aciValue: bond.aciValue,
-    maturityDate: bond.maturityDate,
-    callDate: bond.callDate,
-    couponQuantityPerYear: bond.couponQuantityPerYear,
-    floatingCouponFlag: bond.floatingCouponFlag,
-    perpetualFlag: bond.perpetualFlag,
-    amortizationFlag: bond.amortizationFlag,
-    subordinatedFlag: bond.subordinatedFlag,
-    bondType: bond.bondType,
-    riskLevel: bond.riskLevel,
-  };
-}
 function sourcePolicy(kind: CatalogSource['kind']) {
   if (
     [

src/modules/investments/instruments/application/public-instrument.spec.ts

@@ -0,0 +1,64 @@
+import type {
+  TbankBond,
+  TbankShare,
+} from '../../../../integrations/tbank/tbank.api';
+
+import { publicInstrument } from './public-instrument';
+
+const share = {
+  uid: 'share-uid',
+  figi: 'FIGI1',
+  assetUid: 'asset-1',
+  name: 'Share',
+  ticker: 'SHAR',
+  isin: 'US000',
+  classCode: 'TQBR',
+  realExchange: 'REAL_EXCHANGE_MOEX',
+  apiTradeAvailableFlag: true,
+  currency: 'rub',
+  shareType: 'SHARE_TYPE_COMMON',
+  sector: 'Finance',
+  lot: 1,
+  brand: { logoName: 'logo.png', title: 'Brand', id: 'brand-1' },
+  first_1dayCandleDate: '2020-01-01T00:00:00Z',
+  privateField: 'must-not-leak',
+} as unknown as TbankShare;
+
+const bond = {
+  uid: 'bond-uid',
+  figi: 'FIGI2',
+  assetUid: 'asset-2',
+  name: 'Bond',
+  ticker: 'BOND',
+  classCode: 'TQOB',
+  currency: 'rub',
+  lot: 1,
+  nominal: { value: '1000', currency: 'rub' },
+  initialNominal: { value: '1000', currency: 'rub' },
+  aciValue: { value: '10', currency: 'rub' },
+  maturityDate: '2030-01-01T00:00:00Z',
+  couponQuantityPerYear: 2,
+  bondType: 'BOND_TYPE_EXPIRING',
+  brand: null,
+  privateField: 'must-not-leak',
+} as unknown as TbankBond;
+
+describe('publicInstrument projection', () => {
+  it('keeps approved share fields, trims brand, drops private extras', () => {
+    const result = publicInstrument(share);
+    expect(result.uid).toBe('share-uid');
+    expect(result.shareType).toBe('SHARE_TYPE_COMMON');
+    expect(result.brand).toEqual({ logoName: 'logo.png' });
+    expect(result).not.toHaveProperty('privateField');
+    expect(result).not.toHaveProperty('brand.title');
+  });
+
+  it('projects bonds with missing optional fields and null brand', () => {
+    const result = publicInstrument(bond);
+    expect(result.nominal).toEqual({ value: '1000', currency: 'rub' });
+    expect(result.shareType).toBeUndefined();
+    expect(result.brand).toBeUndefined();
+    expect(result.isin).toBeUndefined();
+    expect(result).not.toHaveProperty('privateField');
+  });
+});

src/modules/investments/instruments/application/public-instrument.ts

@@ -0,0 +1,38 @@
+import type {
+  TbankBond,
+  TbankShare,
+} from '../../../../integrations/tbank/tbank.api';
+
+export function publicInstrument(value: TbankBond | TbankShare) {
+  const bond = value as TbankBond;
+  const share = value as TbankShare;
+  return {
+    uid: value.uid,
+    figi: value.figi,
+    assetUid: value.assetUid,
+    name: value.name,
+    ticker: value.ticker,
+    isin: value.isin,
+    classCode: value.classCode,
+    realExchange: value.realExchange,
+    apiTradeAvailableFlag: value.apiTradeAvailableFlag,
+    currency: value.currency,
+    shareType: share.shareType,
+    sector: value.sector,
+    lot: value.lot,
+    brand: value.brand ? { logoName: value.brand.logoName } : undefined,
+    first_1dayCandleDate: value.first_1dayCandleDate,
+    nominal: bond.nominal,
+    initialNominal: bond.initialNominal,
+    aciValue: bond.aciValue,
+    maturityDate: bond.maturityDate,
+    callDate: bond.callDate,
+    couponQuantityPerYear: bond.couponQuantityPerYear,
+    floatingCouponFlag: bond.floatingCouponFlag,
+    perpetualFlag: bond.perpetualFlag,
+    amortizationFlag: bond.amortizationFlag,
+    subordinatedFlag: bond.subordinatedFlag,
+    bondType: bond.bondType,
+    riskLevel: bond.riskLevel,
+  };
+}

src/modules/investments/instruments/stocks/presentation/stock.dto.ts

@@ -93,7 +93,7 @@ export class StockScreenerItemDto {
   @ApiProperty({ nullable: true, type: String }) declare currency: null | string;
   @ApiProperty({ nullable: true, type: String }) declare realExchange: null | string;
   @ApiProperty({ nullable: true, type: String }) declare countryOfRisk: null | string;
-  @ApiProperty({ nullable: true, type: 'integer' }) declare lot: null | number;
+  @ApiProperty({ nullable: true, minimum: MIN_TICKER_LENGTH, type: 'integer' }) declare lot: null | number;
 }
 
 export class StockScreenerPageDto {

src/modules/investments/investment-sync-plan.spec.ts

@@ -17,7 +17,7 @@ describe('screen dependency and history planning', () => {
       },
     ],
   };
-  it('prioritizes discovery, selected/comparisons, then history; Moscow dates are converted once', () => {
+  it('prioritizes discovery, the selected period, then history; Moscow dates are converted once', () => {
     const plan = planInvestmentScreen(
       {
         screen: 'income',
@@ -32,6 +32,17 @@ describe('screen dependency and history planning', () => {
     const selected = plan.sources.filter(
       (source) => source.kind === 'operations' && source.priority === 'screen',
     );
+    // The single selected range is chunked into month-aligned intervals.
+    expect(selected).toHaveLength(2);
+    expect(
+      selected.every(
+        (source) =>
+          source.from != null &&
+          source.from.toISOString() >= '2024-01-31T21:00:00.000Z' &&
+          source.to != null &&
+          source.to.toISOString() <= '2024-02-29T21:00:00.000Z',
+      ),
+    ).toBe(true);
     expect(
       selected.some(
         (source) => source.from?.toISOString() === '2024-01-31T21:00:00.000Z',
@@ -42,9 +53,7 @@ describe('screen dependency and history planning', () => {
         (source) => source.to?.toISOString() === '2024-02-29T21:00:00.000Z',
       ),
     ).toBe(true);
-    expect(plan.unavailable).toEqual([
+    expect(plan.unavailable).toEqual([]);
-      { resourceKey: 'income/yearAgo', reason: 'calendar_or_account_boundary' }, // gitleaks:allow public resource identifier
-    ]);
     const firstHistory = plan.sources.findIndex(
       (source) => source.priority === 'history',
     );

src/modules/investments/investment-sync-plan.ts

@@ -111,13 +111,6 @@ export function planInvestmentScreen(
         priority: 'screen' as const,
       })),
     );
-  const knownOpening =
-    accounts.length && accounts.every((account) => account.openedOn)
-      ? new Date(
-          // eslint-disable-next-line sonarjs/no-alphabetical-sort -- Code-unit ordering is intentional for canonical keys and ISO dates; locale collation would change persisted bindings.
-          `${accounts.map((account) => account.openedOn ?? '').sort()[0]}T00:00:00+03:00`,
-        )
-      : undefined;
   if (!context.membershipKnown) return { sources, unavailable, now };
   if (
     ['account', 'accounts', 'bond', 'events', 'stock'].includes(screen.screen)
@@ -142,23 +135,9 @@ export function planInvestmentScreen(
     const period = planIncomePeriod(
       screen.screen === 'income' ? screen.from : undefined,
       screen.screen === 'income' ? screen.to : undefined,
-      knownOpening,
     );
-    for (const range of [
+    const bounds = dateOnlyBounds(period.selected, now);
-      period.selected,
+    operations(bounds.from, bounds.to);
-      ...(screen.screen === 'income'
-        ? [period.previous, ...(period.yearAgo ? [period.yearAgo] : [])]
-        : []),
-    ]) {
-      const bounds = dateOnlyBounds(range, now);
-      operations(bounds.from, bounds.to);
-    }
-    if (screen.screen === 'income' && !period.yearAgo) {
-      unavailable.push({
-        resourceKey: 'income/yearAgo', // gitleaks:allow public resource identifier
-        reason: 'calendar_or_account_boundary',
-      });
-    }
     if (screen.screen === 'account') {
       const range = ledgerRange(
         screen.from,

src/modules/investments/operations/application/brokerage-operations.service.ts

@@ -435,6 +435,7 @@ export class BrokerageOperationsService {
       saved = await this.repository.readPage(input);
     }
     const now = new Date();
+    const hourly = await this.hourlySync.hourly(userId);
     const membership = investmentResourceMeta({
       resourceKey: 'accounts/membership',
       dataRevision: String(saved?.connection.membershipRevision ?? MISSING_MEMBERSHIP_REVISION),
@@ -451,7 +452,11 @@ export class BrokerageOperationsService {
         key: `${period.from}/${period.to}`,
         movingEnd: false,
       }));
-    return periods.map((period, index) => {
+    const rows = saved?.rows ?? [];
+    const instruments = await this.metadata.savedMany(
+      rows.map((row) => row.payload as TbankOperationItem),
+    );
+    return periods.map((period) => {
       const targets = (saved?.connection.accounts ?? []).map((account) => ({
         accountId: account.accountId,
         ...period,
@@ -487,8 +492,7 @@ export class BrokerageOperationsService {
           null;
       const confirmed = confirmedOperationRanges(plan.intervals, sources);
       const meta = investmentResourceMeta({
-        // eslint-disable-next-line security/detect-object-injection -- The numeric index enumerates the three comparison periods.
+        resourceKey: `income/${accountId}/selected/${period.key}`,
-        resourceKey: `income/${accountId}/${['selected', 'previous', 'yearAgo'][index]}/${period.key}`,
         dataRevision: saved?.binding ?? 'missing',
         availability: !known
           ? 'missing'
@@ -500,6 +504,7 @@ export class BrokerageOperationsService {
         fetchedAt,
         freshForMs: plan.intervals.some((range) => range.stale) ? STALE_FRESHNESS_MS : Infinity,
         work,
+        lastAttempt: hourlyAttempt(hourly, 'operations', accountId === 'all' ? undefined : accountId),
         dependencies: [membership],
         coverage: {
           requested: targets.map(serialize),
@@ -542,7 +547,7 @@ export class BrokerageOperationsService {
       return {
         meta,
         items: complete
-          ? (saved?.rows ?? [])
+          ? rows
               .filter((row) =>
                 plan.intervals.some(
                   (interval) =>
@@ -556,6 +561,10 @@ export class BrokerageOperationsService {
                   row.payload as TbankOperationItem,
                   row.occurredAt,
                 ),
+                logoName:
+                  instruments
+                    .get(metadataKey(row.payload as TbankOperationItem))
+                    ?.data?.brand?.logoName?.trim() || null,
                 ...(accountId === 'all'
                   ? {
                       account: {

src/modules/investments/tbank-sync/tbank-sync.repository.ts

@@ -43,16 +43,17 @@ type HourlyAttempt = {
 
 export function hourlyAttempt(
   hourly: HourlyAttempt | null,
-  section: HourlySection['section'],
+  section: HourlySection['section'] | readonly HourlySection['section'][],
   accountId?: string,
 ): InvestmentAttemptDto {
   if (!hourly) {
     return { state: 'none', startedAt: null, finishedAt: null, problems: [] };
   }
+  const sections = Array.isArray(section) ? section : [section];
   const problems = hourly.sections
     .filter(
       (entry) =>
-        entry.section === section &&
+        sections.includes(entry.section) &&
         (accountId === undefined || entry.accountId === accountId),
     )
     .map((entry) => ({
@@ -182,7 +183,8 @@ export class TbankSyncRepository {
 
   // The timer only proposes work; this reservation is the durable fence. The
   // attempt start (createdAt) is the basis of the next hourly term, including
-  // failed and interrupted attempts.
+  // failed and interrupted attempts. After downtime the next tick is due at
+  // once, so no catch-up queue forms.
   reserveHourly(userId: string, runId: string, hourMs: number) {
     return this.prisma.$transaction(async (tx) => {
       const connection = await tx.tbankConnection.findFirst({
@@ -200,7 +202,16 @@ export class TbankSyncRepository {
       });
       const now = new Date();
       if (previous) {
-        const due = now.valueOf() - previous.createdAt.valueOf() >= hourMs;
+        // Terms are hourMs steps from the attempt start; a walk still running
+        // at a term consumes it. A dead process's attempt has no known end, so
+        // it consumes only its own term.
+        const started = previous.createdAt.valueOf();
+        const ended =
+          previous.state === 'running' ? started : previous.updatedAt.valueOf();
+        const dueAt =
+          started +
+          Math.max(hourMs, Math.ceil((ended - started) / hourMs) * hourMs);
+        const due = now.valueOf() >= dueAt;
         if (previous.state === 'running') {
           if (previous.processRunId === runId) return null;
           // A dead process cannot finish its attempt; close it from its

src/modules/investments/upcoming-events/upcoming-events.service.ts

@@ -2,6 +2,7 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 
 import {
   add,
+  type Decimal,
   decimalFromString,
   formatDecimal,
   isZero,
@@ -280,7 +281,7 @@ function dateWindow(query: UpcomingEventsQueryDto) {
 }
 
 function incomeTotals(events: UpcomingEventDto[]): MoneyDto[] {
-  const totals = new Map<string, ReturnType<typeof decimalFromString>>();
+  const totals = new Map<string, Decimal>();
   for (const event of events) {
     if (!['coupon', 'dividend'].includes(event.type) || !event.projectedAmount) {
       continue;

src/openapi.ts

@@ -3,9 +3,20 @@ import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 
 export const API_PREFIX = 'api/v1';
 
+// Nest Swagger cannot express additionalProperties on a class, so closed request
+// bodies are restored here after generation; the runtime allowlist stays in the controller.
+const CLOSED_SCHEMAS = ['StockScreenerCriteriaDto'];
+
 export function createOpenApiDocument(app: INestApplication) {
-  return SwaggerModule.createDocument(
+  const document = SwaggerModule.createDocument(
     app,
     new DocumentBuilder().setTitle('WealthLedger API').setVersion('v1').build(),
   );
+  const schemas = document.components?.schemas ?? {};
+  for (const [name, schema] of Object.entries(schemas)) {
+    if (CLOSED_SCHEMAS.includes(name) && 'properties' in schema) {
+      schema.additionalProperties = false;
+    }
+  }
+  return document;
 }

test/openapi-contract.e2e-spec.ts

@@ -77,7 +77,7 @@ describe('OpenAPI contract (integration)', () => {
     }
   });
 
-  it('exposes required semantic income dependency roles', () => {
+  it('exposes only the selected income dependency role and no comparison data', () => {
     const schemas = createOpenApiDocument(app).components?.schemas;
     expect(schemas?.IncomeAnalyticsResourceDto).toMatchObject({
       properties: {
@@ -100,12 +100,35 @@ describe('OpenAPI contract (integration)', () => {
     expect(dependency.required).toContain('role');
     expect(dependency).toMatchObject({
       properties: {
-        role: { type: 'string', enum: ['selected', 'previous', 'year'] },
+        role: { type: 'string', enum: ['selected'] },
       },
     });
+    const analytics = schemas?.IncomeAnalyticsDto;
+    assert(analytics && !('$ref' in analytics));
+    expect(analytics.required).toEqual(
+      expect.arrayContaining([
+        'accountId',
+        'period',
+        'totalsByCurrency',
+        'calculatedAt',
+        'bucketGranularity',
+        'buckets',
+        'instruments',
+        'entries',
+      ]),
+    );
+    expect(analytics.properties).not.toHaveProperty('previous');
+    expect(analytics.properties).not.toHaveProperty('yearComparison');
   });
 
   it('generates the runtime contract without server startup or deployment configuration', async () => {
+    const schemas = createOpenApiDocument(app).components?.schemas;
+    expect(schemas?.StockScreenerCriteriaDto).toMatchObject({
+      additionalProperties: false,
+    });
+    expect(schemas?.StockScreenerItemDto).toMatchObject({
+      properties: { lot: { type: 'integer', minimum: 1, nullable: true } },
+    });
     expect(
       createOpenApiDocument(app).components?.schemas?.ProblemDetailsDto,
     ).toMatchObject({

test/sqlite-regression.cjs

@@ -18,7 +18,7 @@ writeFileSync(sentinel, 'fictional user database: must never be opened');
 const before = readFileSync(sentinel);
 const databases = new Set();
 async function check(name, overrides = {}, signal) {
-  const child = spawn(process.execPath, ['test/sqlite.cjs', '--all'], {
+  const child = spawn(process.execPath, ['test/sqlite.cjs'], {
     cwd,
     env: {
       ...process.env,

test/tbank-hourly-lifecycle.e2e-spec.ts

@@ -385,6 +385,83 @@ describe('hourly attempt lifecycle (SQLite)', () => {
     expect(next?.state).not.toBe('running');
   });
 
+  describe('hourly term eligibility', () => {
+    const at = (h: number, m = 0) => new Date(Date.UTC(2026, 0, 1, h, m));
+    const seed = (
+      state: 'complete' | 'failed' | 'running',
+      start: Date,
+      end: Date,
+      processRunId = 'other-process',
+    ) =>
+      prisma.tbankSyncWork.create({
+        data: {
+          id: randomUUID(),
+          userId: USER,
+          revision: REVISION,
+          scopeKey: 'hourly',
+          attemptId: randomUUID(),
+          processRunId,
+          priority: 0,
+          intent: {},
+          progress: {},
+          state,
+          createdAt: start,
+          updatedAt: end,
+        },
+      });
+    const reserve = async (when: Date) => {
+      jest.setSystemTime(when);
+      return repository.reserveHourly(USER, 'this-process', 3_600_000);
+    };
+
+    it.each([
+      ['short attempt', 'complete', at(10), at(10, 5), at(10, 59), at(11)],
+      ['failed attempt', 'failed', at(10), at(10, 5), at(10, 59), at(11)],
+      ['walk past one term', 'complete', at(10), at(11, 10), at(11, 59), at(12)],
+      ['walk past two terms', 'complete', at(10), at(12, 10), at(12, 59), at(13)],
+      ['walk ending on a term', 'complete', at(10), at(11), at(10, 59), at(11)],
+    ] as const)('%s', async (_name, state, start, end, early, due) => {
+      await seed(state, start, end);
+      expect(await reserve(early)).toBeNull();
+      const reserved = await reserve(due);
+      expect(reserved?.work.state).toBe('running');
+      expect(reserved?.work.createdAt).toEqual(due);
+    });
+
+    it('starts a new revision at once', async () => {
+      await seed('complete', at(10), at(10, 5));
+      await prisma.tbankConnection.deleteMany({ where: { userId: USER } });
+      await prisma.tbankConnection.create({
+        data: {
+          userId: USER,
+          revision: 'next-revision',
+          encryptedToken: tokens.encrypt('synthetic'),
+          connectedAt: at(10, 10),
+        },
+      });
+      expect((await reserve(at(10, 10)))?.work.revision).toBe('next-revision');
+    });
+
+    it('closes a dead process attempt without early retry and runs one catch-up after downtime', async () => {
+      await seed('running', at(10), at(10, 1), 'dead-process');
+      expect(await reserve(at(10, 30))).toBeNull();
+      expect((await hourlyRow())?.errorCode).toBe('INTERRUPTED');
+      expect(await reserve(at(10, 59))).toBeNull();
+      expect((await reserve(at(14, 30)))?.work.createdAt).toEqual(at(14, 30));
+      expect(await reserve(at(14, 31))).toBeNull();
+      expect(
+        await prisma.tbankSyncWork.count({
+          where: { userId: USER, scopeKey: 'hourly' },
+        }),
+      ).toBe(1);
+    });
+
+    it('does not reserve while this process still runs the attempt', async () => {
+      await seed('running', at(10), at(10, 1), 'this-process');
+      expect(await reserve(at(12, 30))).toBeNull();
+    });
+  });
+
   it('does not overlap a running attempt with a second walk', async () => {
     operations.request.mockImplementation(async () => {
       const row = await child('running', null, 'operations');

test/tbank-income-local.e2e-spec.ts

@@ -124,7 +124,7 @@ describe('local income completeness and exact money (SQLite)', () => {
       }
     }
   });
-  it('returns exact selected sums without a false zero comparison; reopen and observe need no RPC', async () => {
+  it('returns exact selected sums; reopen and observe need no RPC', async () => {
     for (let index = 0; index < 2; index++) {
       const result = await read();
       assert(result.data);
@@ -140,22 +140,55 @@ describe('local income completeness and exact money (SQLite)', () => {
           .filter((row) => row.id === 'same')
           .map((row) => row.account?.id),
       ).toEqual(['a', 'b']);
-      expect(result.data.previous).toBeNull();
-      expect(result.data.yearComparison).toBeNull();
       expect(result.meta.dependencies.map(({ role }) => role)).toEqual([
         'selected',
-        'previous',
-        'year',
       ]);
-      const previous = result.meta.dependencies.find(({ role }) => role === 'previous');
-      expect(previous?.availability).toBe('temporarily-unavailable');
-      expect(previous?.completeness).toBe('incomplete');
       expect(result.data.calculatedAt).toBe('2025-02-01T00:00:00.000Z');
       await prisma.$disconnect();
     }
     expect(upstream.getOpenAccounts).not.toHaveBeenCalled();
     expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
   });
+  it('uses saved instrument logos for income entries without changing their financial data', async () => {
+    const before = await read();
+    const base = before.data;
+    assert(base);
+    const fetchedAt = new Date();
+    await prisma.tbankOperation.update({
+      where: {
+        userId_revision_accountId_brokerOperationId: {
+          userId: 'income-owner', revision, accountId: 'a', brokerOperationId: 'same',
+        },
+      },
+      data: {
+        payload: {
+          id: 'same', figi: 'income-figi', type: 'OPERATION_TYPE_COUPON',
+          date: { seconds: String(Date.parse('2025-01-15Z') / 1000) },
+          payment: { units: '10', nano: 1, currency: 'rub' },
+        },
+      },
+    });
+    await prisma.tbankInstrument.create({
+      data: {
+        provider: 'tbank', uid: 'income-uid', figi: 'income-figi',
+        instrumentType: 'bond', fetchedAt,
+        metadata: { uid: 'income-uid', figi: 'income-figi', name: 'Bond', brand: { logoName: 'bond.png' } },
+      },
+    });
+    await prisma.tbankInstrumentLookup.create({
+      data: {
+        provider: 'tbank', identifierType: 'figi', identifier: 'income-figi',
+        matchedUids: ['income-uid'], fetchedAt,
+      },
+    });
+    const after = await read();
+    assert(after.data);
+    expect(after.data.entries.find((entry) => entry.account?.id === 'a' && entry.id === 'same')?.logoName).toBe('bond.png');
+    expect(after.data.entries.find((entry) => entry.account?.id === 'b' && entry.id === 'same')?.logoName).toBeNull();
+    expect(after.data.totalsByCurrency).toEqual(base.totalsByCurrency);
+    expect(after.data.calculatedAt).toBe(base.calculatedAt);
+    expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
+  });
   it('requires every account and separates missing, partial and confirmed empty periods', async () => {
     await prisma.tbankOperationCoverage.deleteMany({
       where: { accountId: 'b' },
@@ -176,15 +209,7 @@ describe('local income completeness and exact money (SQLite)', () => {
     ).toEqual([]);
     expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
   });
-  it('completes previous/yearAgo independently and counts corrected identities once', async () => {
+  it('counts corrected identities once for the selected period', async () => {
-    for (const account of ['a', 'b']) {
-      await coverage(account, new Date('2024-11-30T21:00:00Z'), from);
-      await coverage(
-        account,
-        new Date('2023-12-31T21:00:00Z'),
-        new Date('2024-01-31T21:00:00Z'),
-      );
-    }
     await prisma.tbankOperation.updateMany({
       where: { accountId: 'a', brokerOperationId: 'same' },
       data: {
@@ -197,14 +222,12 @@ describe('local income completeness and exact money (SQLite)', () => {
       },
     });
     const result = await read();
-    assert(result.data?.previous && result.data.yearComparison);
+    assert(result.data);
     expect(result.data.entries).toHaveLength(6);
     expect(
-      result.data.previous.totalsByCurrency[0].difference.total.value,
+      result.data.totalsByCurrency.find(({ currency }) => currency === 'RUB')
-    ).toBe('25.000000002');
+        ?.total,
-    expect(
+    ).toEqual({ currency: 'RUB', value: '25.000000002' });
-      result.data.yearComparison.totalsByCurrency[0].compared.total.value,
-    ).toBe('0');
   });
   it('preserves the complete financial result and timestamp through failed atomic reconciliation', async () => {
     const before = await read();
@@ -243,7 +266,9 @@ describe('local income completeness and exact money (SQLite)', () => {
     await repo.fail(fence, false);
     const after = await read();
     expect(after.data).toEqual(before.data);
-    expect(after.meta.lastAttempt.state).toBe('failed');
+    // Without an hourly walk the durable attempt is absent; the failed
+    // source work stays a technical observation, not the hourly attempt.
+    expect(after.meta.lastAttempt.state).toBe('none');
     expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
   });
   it('retains current-month observed completeness and does not renew source timestamps', async () => {
@@ -276,12 +301,13 @@ describe('local income completeness and exact money (SQLite)', () => {
     const response = await get('all', undefined, false).expect(200);
     expect((response.body as IncomeAnalyticsResourceDto).data).not.toBeNull();
   });
-  it('distinguishes unavailable calendar comparison without scheduling it', async () => {
+  it('plans only the selected period for a leap day without scheduling it', async () => {
     const result = await read('a', 'from=2024-02-29&to=2024-02-29');
-    expect(
+    expect(result.meta.dependencies.map(({ role }) => role)).toEqual([
-      result.meta.dependencies.find(({ role }) => role === 'year')
+      'selected',
-        ?.unavailableReason,
+    ]);
-    ).toBe('CALENDAR_OR_ACCOUNT_HISTORY');
+    expect(result.meta.dependencies[0].availability).toBe('temporarily-unavailable');
+    expect(result.data).toBeNull();
     expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
   });
 });

test/tbank-local-reads.e2e-spec.ts

@@ -15,6 +15,7 @@ import {
 } from '../src/integrations/tbank/tbank.client';
 import { configureApp } from '../src/main';
 import { BrokerageAccountsResourceDto } from '../src/modules/investments/brokerage-accounts/brokerage-account.dto';
+import { IncomeAnalyticsResourceDto } from '../src/modules/investments/income/income-analytics.dto';
 import { PortfolioService } from '../src/modules/investments/portfolio/application/portfolio.service';
 import { PortfolioResourceDto } from '../src/modules/investments/portfolio/presentation/portfolio.dto';
 import { PrismaService } from '../src/prisma/prisma.service';
@@ -325,6 +326,74 @@ describe('local accounts and portfolio HTTP (SQLite)', () => {
     expect(upstream.getPortfolio).toHaveBeenCalledTimes(1);
   });
 
+  it('reports the durable hourly attempt in accounts and income meta with section relevance', async () => {
+    await put().expect(200);
+    await seedMembership();
+    await requestPortfolio('account');
+    await settled();
+    const connection = await prisma.tbankConnection.findUniqueOrThrow({
+      where: { userId: 'owner' },
+    });
+    const startedAt = new Date('2026-10-10T10:00:00.000Z');
+    const finishedAt = new Date('2026-10-10T10:05:00.000Z');
+    await prisma.tbankSyncWork.create({
+      data: {
+        id: 'hourly-attempt',
+        userId: 'owner',
+        revision: connection.revision,
+        scopeKey: 'hourly',
+        intent: {},
+        state: 'complete',
+        attemptId: 'hourly-attempt',
+        processRunId: 'test',
+        priority: 0,
+        progress: {
+          result: 'partial',
+          sections: [
+            {
+              section: 'portfolio',
+              accountId: 'account',
+              errorCode: 'TBANK_UNAVAILABLE',
+            },
+            {
+              section: 'operations',
+              accountId: 'account',
+              errorCode: 'TBANK_UNAVAILABLE',
+            },
+          ],
+        },
+        createdAt: startedAt,
+        updatedAt: finishedAt,
+      },
+    });
+    const accounts = await get('brokerage-accounts').expect(200);
+    const accountsMeta = (accounts.body as BrokerageAccountsResourceDto).meta;
+    expect(accountsMeta.lastAttempt.state).toBe('partial');
+    expect(accountsMeta.lastAttempt.startedAt).toBe(startedAt.toISOString());
+    expect(accountsMeta.lastAttempt.finishedAt).toBe(finishedAt.toISOString());
+    expect(accountsMeta.lastAttempt.problems).toEqual([
+      {
+        section: 'portfolio',
+        accountId: 'account',
+        errorCode: 'TBANK_UNAVAILABLE',
+      },
+    ]);
+    const income = await get(
+      'brokerage-accounts/account/income-analytics?sync=observe',
+    ).expect(200);
+    const incomeMeta = (income.body as IncomeAnalyticsResourceDto).meta;
+    expect(incomeMeta.lastAttempt.state).toBe('partial');
+    expect(incomeMeta.lastAttempt.startedAt).toBe(startedAt.toISOString());
+    expect(incomeMeta.lastAttempt.finishedAt).toBe(finishedAt.toISOString());
+    expect(incomeMeta.lastAttempt.problems).toEqual([
+      {
+        section: 'operations',
+        accountId: 'account',
+        errorCode: 'TBANK_UNAVAILABLE',
+      },
+    ]);
+  });
+
   it('recovers abandoned discovery only on a data request and coalesces concurrent reads', async () => {
     await put().expect(200);
     const connection = await prisma.tbankConnection.update({