ci: validate release PR commits independently (WealthLedger/main#30)

.gitea/workflows/verify.yml

@@ -34,7 +34,11 @@ jobs:
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
           printf '%s\n' "$PR_TITLE" | npm run commitlint -- --strict
-          npm run commitlint -- --strict --from "$BASE_SHA" --to "$HEAD_SHA"
+          if [[ "$PR_TITLE" =~ ^chore\(release\):\ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            npm run commitlint -- --strict --from "$HEAD_SHA^" --to "$HEAD_SHA"
+          else
+            npm run commitlint -- --strict --from "$BASE_SHA" --to "$HEAD_SHA"
+          fi
 
   security:
     needs: commits

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [2.1.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v2.0.0...v2.1.0) (2026-10-12)
+
+### Features
+
+* add hourly portfolio sync history ([0057925](https://git.personal.ksv741.ru/WealthLedger/backend/commit/0057925888dde874830149865fc5e13920ac5783))
+* add stock screener ([7d10ef8](https://git.personal.ksv741.ru/WealthLedger/backend/commit/7d10ef8adfce76ad2ed6368e1022fbd3f6847a23))
+* reconcile hourly investment resource states ([323b83b](https://git.personal.ksv741.ru/WealthLedger/backend/commit/323b83b5827d1191fbc14cfdf1d0e62f249fc78d))
+
+### Bug Fixes
+
+* align backend workflow rules (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/backend/issues/27)) ([c7d0600](https://git.personal.ksv741.ru/WealthLedger/backend/commit/c7d060023b612af9e1dd4c2a2fb2d5d1bf173784))
+* bound hourly step awaits by the per-step wait limit ([#56](https://git.personal.ksv741.ru/WealthLedger/backend/issues/56)) ([52fa3a3](https://git.personal.ksv741.ru/WealthLedger/backend/commit/52fa3a36baa5ab236a7ebd64ef1b4f447c91e129))
+* keep candle retries read-only ([947ffef](https://git.personal.ksv741.ru/WealthLedger/backend/commit/947ffefa9b8cad7f19355c187f2bd50c9739a822))
+* restore terminal hourly lifecycle after persistence failure ([#56](https://git.personal.ksv741.ru/WealthLedger/backend/issues/56)) ([fa57a20](https://git.personal.ksv741.ru/WealthLedger/backend/commit/fa57a201fdd8127774aee9af553da75a75add07c))
+* unblock backend dependency audit ([85858a1](https://git.personal.ksv741.ru/WealthLedger/backend/commit/85858a160f00dd428c80b8fa1824c1779245fdfe))
+
+### Documentation
+
+* clarify backend verification policy ([d7895f2](https://git.personal.ksv741.ru/WealthLedger/backend/commit/d7895f287ee802e7b13df7a2a4c6dba0b711e5a9))
+* pin backend workflow reference (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/backend/issues/27)) ([c5248db](https://git.personal.ksv741.ru/WealthLedger/backend/commit/c5248dbefc4b11a9f417bc835041a4294bd61047))
+
+### CI
+
+* skip checks on PR metadata edits ([0ad84ff](https://git.personal.ksv741.ru/WealthLedger/backend/commit/0ad84ff4f0b4712abc7e69dc299856f14af6eadd))
+
+### Tests
+
+* align all accounts metadata ([db375cb](https://git.personal.ksv741.ru/WealthLedger/backend/commit/db375cbee7d8f1eff48822b8e3c74898f40e8886))
+* align resource availability metadata ([bc631e7](https://git.personal.ksv741.ru/WealthLedger/backend/commit/bc631e72de0d9b0ff7b261b1ea644a73c2943d2a))
+* align upcoming events with local reads ([966b2a5](https://git.personal.ksv741.ru/WealthLedger/backend/commit/966b2a5836cdaf5b761e3c76568ff30a90ba1f4c))
+* extend ledger sqlite timeout ([4870d49](https://git.personal.ksv741.ru/WealthLedger/backend/commit/4870d4950303ad1de743e19b665b2fbdc05b781a))
+* increase ledger request timeout ([2facd86](https://git.personal.ksv741.ru/WealthLedger/backend/commit/2facd8675c74a97d92e0e8f44ed4a93aabb47674))
+
+### Maintenance
+
+* align backend engineering workflow (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/backend/issues/27)) ([a31e8d2](https://git.personal.ksv741.ru/WealthLedger/backend/commit/a31e8d2c4d85a21cdd5efdcc9f5fe503f210804b))
+* prune obsolete eslint suppressions ([a46a411](https://git.personal.ksv741.ru/WealthLedger/backend/commit/a46a4112cbcc72b1c3ff17cac4ac8bebcf579bca))
+
 ## [2.0.0](https://git.personal.ksv741.ru/WealthLedger/backend/compare/v1.0.0...v2.0.0) (2026-10-07)
 
 ### ⚠ BREAKING CHANGES

eslint-suppressions.json

@@ -54,6 +54,9 @@
     }
   },
   "src/modules/investments/instruments/application/catalog-discovery.service.ts": {
+    "sonarjs/cognitive-complexity": {
+      "count": 1
+    },
     "sonarjs/no-nested-conditional": {
       "count": 1
     }
@@ -139,8 +142,11 @@
     }
   },
   "src/modules/investments/tbank-sync/tbank-sync.service.ts": {
+    "sonarjs/cognitive-complexity": {
+      "count": 1
+    },
     "sonarjs/no-nested-conditional": {
-      "count": 6
+      "count": 7
     }
   },
   "test/bank-cards-durability.cjs": {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "wealth-ledger-backend",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "wealth-ledger-backend",
-      "version": "2.0.0",
+      "version": "2.1.0",
       "license": "UNLICENSED",
       "dependencies": {
         "@grpc/grpc-js": "1.14.5",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wealth-ledger-backend",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "",
   "author": "",
   "private": true,

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

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

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

@@ -1,6 +1,5 @@
-import { Metadata, status } from '@grpc/grpc-js';
+import { 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';
@@ -137,68 +136,6 @@ 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,
-      }));
-      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,7 +2,6 @@ import {
   ChannelCredentials,
   Client,
   ClientUnaryCall,
-  connectivityState,
   loadPackageDefinition,
   Metadata,
   ServiceError,
@@ -61,12 +60,6 @@ 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;
-  queueWaitMs?: number;
-  trackingId?: string;
-};
 export type TbankDecimal = { nano?: number | string; units?: number | string };
 export type TbankMoney = TbankDecimal & { currency?: string };
 export type TbankAccount = {
@@ -518,20 +511,15 @@ 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(() =>
-          diagnostics.queueWaitMs = Math.round(performance.now() - startedAt);
+          this.request<Response>(token, client, method, request),
-          return this.request<Response>(
+        );
-            token, client, method, request, diagnostics,
-          );
-        });
         this.logger.event('debug', 'tbank.rpc.completed', {
           operation: method,
-          ...diagnostics,
           attempts,
           durationMs: Math.round(performance.now() - startedAt),
         });
@@ -549,7 +537,6 @@ 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),
@@ -559,7 +546,6 @@ 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),
@@ -587,42 +573,17 @@ 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.
-      const call = client[method](
+      client[method](
         request as never,
         metadata,
         { deadline: new Date(Date.now() + requestDeadlineMs) },
-        (error, response) => {
+        (error, response) => (error ? reject(error) : resolve(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/investments/income/income-analytics.dto.ts

@@ -67,6 +67,28 @@ 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;
@@ -113,6 +135,12 @@ 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';
 
@@ -134,7 +162,7 @@ export class IncomeSummaryResourceDto {
   declare meta: InvestmentResourceMetaDto;
 }
 
-const incomeDependencyRoles = ['selected'] as const;
+const incomeDependencyRoles = ['selected', 'previous', 'year'] 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 the selected dependency independently of its resource key', async () => {
+  it('labels each comparison dependency independently of its resource key', async () => {
     seed([]);
     const response = await service.analytics(
       'user',
@@ -27,10 +27,32 @@ 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'),
+
-    ).toBe(false);
+  it('labels an unavailable leap-day comparison as year', async () => {
+    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[]) {
@@ -41,7 +63,7 @@ describe('IncomeAnalyticsService', () => {
         build: (opened?: Date) => unknown[],
       ) => {
         build(undefined);
-        return [items].map((items, index) => ({
+        return [items, [], []].map((items, index) => ({
           items,
           meta: completeMeta(index),
         }));
@@ -225,6 +247,8 @@ 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,6 +6,7 @@ import {
   compare,
   decimalFromString,
   formatDecimal,
+  subtract,
 } from '../../../common/decimal';
 import { isTbankProtocolValue, TbankOperationType } from '../../../integrations/tbank/tbank-protocol';
 import { DateOnlyRange, moscowDate } from '../investment-calendar';
@@ -17,6 +18,7 @@ import {
 import {
   IncomeAnalyticsEntryDto,
   IncomeAnalyticsResourceDto,
+  IncomeComparisonDto,
   IncomeCurrencySummaryDto,
   IncomeDependencyDto,
   IncomeInstrumentDto,
@@ -45,11 +47,14 @@ export class IncomeAnalyticsService {
     accountId: string,
     observe = false,
   ): Promise<IncomeSummaryResourceDto> {
-    const plan = planIncomePeriod(undefined, undefined);
+    let plan = planIncomePeriod(undefined, undefined);
     const [selected] = await this.operations.collectRanges(
       userId,
       accountId,
-      () => [plan.selected],
+      (openedAt) => {
+        plan = planIncomePeriod(undefined, undefined, openedAt);
+        return [plan.selected];
+      },
       observe,
     );
     if (selected.items === null) return { data: null, meta: selected.meta };
@@ -72,17 +77,44 @@ export class IncomeAnalyticsService {
     to: string | undefined,
     observe = false,
   ): Promise<IncomeAnalyticsResourceDto> {
-    const plan = planIncomePeriod(from, to);
+    let plan = planIncomePeriod(from, to);
-    const [current] = await this.operations.collectRanges(
+    const periods = await this.operations.collectRanges(
       userId,
       accountId,
-      () => [plan.selected],
+      (openedAt) => {
+        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 work = current.meta.sync;
+    const states = periods.map((period) => period.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}`,
@@ -95,9 +127,7 @@ export class IncomeAnalyticsService {
           ? new Date(current.meta.lastSuccessfulAt)
           : null,
         freshForMs: current.meta.freshness === 'fresh' ? Infinity : STALE_FRESHNESS_MS,
-        work: work.id
+        work: work?.id ? { ...work, id: work.id } : null,
-          ? { id: work.id, state: work.state, errorCode: work.errorCode }
-          : null,
         coverage: current.meta.coverage,
         dependencies,
       }),
@@ -117,6 +147,14 @@ 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),
@@ -160,6 +198,38 @@ 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,
@@ -223,6 +293,22 @@ 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,14 +23,16 @@ describe('income period planning', () => {
     }
   });
 
-  it('keeps empty buckets and skips removed comparison ranges', () => {
+  it('uses a full previous month, skips impossible year-ago dates, and keeps empty buckets', () => {
+    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', () => {
@@ -41,6 +43,7 @@ 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,28 +14,45 @@ 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'
@@ -119,6 +136,34 @@ 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

@@ -3,11 +3,17 @@ import {
   Injectable,
   NotFoundException,
 } from '@nestjs/common';
+import { randomUUID } from 'node:crypto';
 
+import { StructuredLogger } from '../../../../common/logging/structured-logger.service';
+import { isTbankErrorCode, TbankErrorCode } from '../../../../integrations/tbank/tbank-error-code';
 import {
   TbankAccessService,
+  type TbankBond,
   TbankClient,
+  type TbankShare,
   tbankSourceTtlMs,
+  type TbankSyncAttempt,
 } from '../../../../integrations/tbank/tbank.api';
 import { investmentResourceMeta } from '../../investment-resource.mapper';
 import { InstrumentErrorCode } from '../domain/instrument-error-code';
@@ -22,27 +28,46 @@ import {
   catalogSearchLimit,
   selectCatalogInstruments,
 } from './catalog-selection';
-import { publicInstrument } from './public-instrument';
 
 const UNAMBIGUOUS_MATCH_COUNT = 1;
 const NO_MATCHES = 0;
 const FIRST_RESULT_OFFSET = 0;
+const MISSING_DATA_REVISION = '0';
 
 const tickerAmbiguityLimit = 2;
 
+type Producer = {
+  attempt: TbankSyncAttempt;
+  force: boolean;
+  input: CatalogQuery;
+  observers: TbankSyncAttempt[];
+};
 @Injectable()
 export class CatalogDiscoveryService {
+  private readonly runId = randomUUID();
+  private readonly active = new Set<string>();
+  private readonly producers = new Map<string, Producer>();
+  private readonly queue: Producer[] = [];
+  private reservations: Promise<unknown> = Promise.resolve();
+  private running = false;
+  private readonly completions = new Map<
+    string,
+    { done: Promise<void>; resolve: () => void; workId: string }
+  >();
+
   constructor(
     private readonly repository: CatalogDiscoveryRepository,
     private readonly access: TbankAccessService,
     private readonly tbank: TbankClient,
+    private readonly logger: StructuredLogger,
     private readonly enrichment: CatalogEnrichmentService,
   ) {}
 
-  async read(userId: string, input: CatalogQuery) {
+  async read(userId: string, input: CatalogQuery, observe = false) {
     input = catalogQuery(input);
     const connection = await this.access.local(userId);
     const saved = await this.repository.read(input);
+    if (!observe) await this.request(userId, connection.revision, input);
     return {
       data: saved.data,
       meta: investmentResourceMeta({
@@ -58,7 +83,7 @@ export class CatalogDiscoveryService {
 
   async search(userId: string, input: CatalogQuery, observe = false) {
     if (!observe) return this.onlineSearch(userId, catalogQuery(input));
-    const discovery = await this.read(userId, input);
+    const discovery = await this.read(userId, input, observe);
     const sources = discovery.data
       ? await this.enrichment.readMany(
           userId,
@@ -158,11 +183,11 @@ export class CatalogDiscoveryService {
       instrument?.ticker &&
       /^[A-Z0-9][\w.@+-]{0,79}$/i.test(instrument.ticker)
     ) {
-      const alias = await this.read(userId, {
+      const alias = await this.read(
-        instrumentType,
+        userId,
-        query: instrument.ticker,
+        { instrumentType, query: instrument.ticker, exactTicker: true },
-        exactTicker: true,
+        observe,
-      });
+      );
       if (alias.data?.length === UNAMBIGUOUS_MATCH_COUNT && alias.data[0].uid === uid) {
         slug = instrument.ticker.toUpperCase();
       }
@@ -223,11 +248,11 @@ export class CatalogDiscoveryService {
       const result = await this.detail(userId, instrumentType, matches[0].uid);
       return { ...result, data: result.data ? { ...result.data, slug: query } : null };
     }
-    const lookup = await this.read(userId, {
+    const lookup = await this.read(
-      instrumentType,
+      userId,
-      query: ticker,
+      { instrumentType, query: ticker, exactTicker: true },
-      exactTicker: true,
+      observe,
-    });
+    );
     if (lookup.data?.length === NO_MATCHES) throw new NotFoundException();
     if (lookup.data && lookup.data.length > UNAMBIGUOUS_MATCH_COUNT) {
       throw new ConflictException({
@@ -311,4 +336,196 @@ export class CatalogDiscoveryService {
       }),
     };
   }
+
+  request(
+    userId: string,
+    revision: string,
+    query: CatalogQuery,
+    force = false,
+  ) {
+    const input = catalogQuery(query);
+    const reserved = this.reservations.then(async () => {
+      const saved = await this.repository.read(input);
+      if (
+        !force &&
+        saved.dataRevision !== MISSING_DATA_REVISION
+      ) return null;
+      const reservation = await this.repository.reserve(
+        { userId, revision },
+        input,
+        this.runId,
+        this.active,
+      );
+      if (!reservation) return null;
+      const { id, attemptId } = reservation.work;
+      if (!reservation.launch) {
+        const current = this.producers.get(catalogScope(input));
+        if (current) current.force ||= force;
+        return id;
+      }
+      const attempt = { userId, revision, id, attemptId };
+      this.active.add(attemptId);
+      let resolve = () => {};
+      const done = new Promise<void>((finish) => {
+        resolve = finish;
+      });
+      this.completions.set(attemptId, { workId: id, done, resolve });
+      const key = catalogScope(input);
+      const producer = this.producers.get(key);
+      if (producer) {
+        producer.observers.push(attempt);
+        producer.force ||= force;
+      } else {
+        const queued = { input, attempt, observers: [], force };
+        this.producers.set(key, queued);
+        this.queue.push(queued);
+      }
+      if (!this.running) {
+        this.running = true;
+        setImmediate(() => {
+          void this.drain();
+        });
+      }
+      return id;
+    });
+    this.reservations = reserved.catch(() => undefined);
+    return reserved;
+  }
+
+  async refresh(userId: string, revision: string, query: CatalogQuery) {
+    const id = await this.request(userId, revision, query, true);
+    if (id) {
+      await Promise.all(
+        [...this.completions.values()]
+          .filter((entry) => entry.workId === id)
+          .map((entry) => entry.done),
+      );
+    }
+    const saved = await this.repository.read(catalogQuery(query));
+    const sources = await this.enrichment.readMany(
+      userId,
+      query.instrumentType,
+      saved.data?.map((item) => item.uid) ?? [],
+      true,
+    );
+    return [
+      ...(id ? [id] : []),
+      ...sources.flatMap((source) =>
+        source.meta.sync.id ? [source.meta.sync.id] : [],
+      ),
+    ];
+  }
+
+  private async drain() {
+    try {
+      while (this.queue.length) {
+        const producer = this.queue.shift();
+        if (!producer) break;
+        const { input, attempt } = producer;
+        let success = false;
+        try {
+          const token = await this.access.tokenForAttempt(attempt);
+          if (token) {
+            const found =
+              input.instrumentType === 'share'
+                ? await this.tbank.findShares(token, input.query)
+                : await this.tbank.findBonds(token, input.query);
+            success = await this.repository.publish(
+              attempt,
+              input,
+              selectCatalogInstruments(
+                input.exactTicker
+                  ? found.filter(
+                      (item) =>
+                        item.ticker?.trim().toUpperCase() === input.query,
+                    )
+                  : found,
+                input.query,
+                input.instrumentType,
+              ).slice(
+                FIRST_RESULT_OFFSET,
+                input.exactTicker ? tickerAmbiguityLimit : catalogSearchLimit,
+              ),
+              new Date(),
+            );
+          }
+        } catch (error) {
+          if (error instanceof Error && isTbankErrorCode(error.message, TbankErrorCode.InvalidToken)) {
+            await this.access.rejectMembershipToken(attempt);
+          } else {
+            this.logger.event('warn', 'catalog-discovery.failed', {
+              code: TbankErrorCode.Unavailable,
+            });
+          }
+        }
+        if (success) {
+          const saved = await this.repository.read(input);
+          for (const observer of [attempt, ...producer.observers]) {
+            if (!input.exactTicker || saved.data?.length === UNAMBIGUOUS_MATCH_COUNT) {
+              await this.enrichment.requestMany(
+                observer.userId,
+                observer.revision,
+                input.instrumentType,
+                saved.data?.map((item) => item.uid) ?? [],
+                producer.force,
+                input.exactTicker ? ['detail'] : ['last-price', 'detail'],
+              );
+            }
+          }
+        }
+        this.producers.delete(catalogScope(input));
+        for (const observer of [attempt, ...producer.observers]) {
+          await this.repository.finish(observer, success);
+          this.active.delete(observer.attemptId);
+          this.completions.get(observer.attemptId)?.resolve();
+          this.completions.delete(observer.attemptId);
+        }
+      }
+    } catch {
+      for (const completion of this.completions.values()) completion.resolve();
+      this.completions.clear();
+      this.active.clear();
+      this.producers.clear();
+      this.queue.length = 0;
+      this.logger.event('error', 'catalog-discovery.persistence-failed', {
+        code: TbankErrorCode.Unavailable,
+      });
+    } finally {
+      this.running = false;
+    }
+  }
+}
+
+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,7 +38,6 @@ 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;
@@ -652,6 +651,39 @@ 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

@@ -1,64 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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/investment-sync-plan.spec.ts

@@ -17,7 +17,7 @@ describe('screen dependency and history planning', () => {
       },
     ],
   };
-  it('prioritizes discovery, the selected period, then history; Moscow dates are converted once', () => {
+  it('prioritizes discovery, selected/comparisons, then history; Moscow dates are converted once', () => {
     const plan = planInvestmentScreen(
       {
         screen: 'income',
@@ -32,17 +32,6 @@ 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',
@@ -53,7 +42,9 @@ 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,6 +111,13 @@ 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)
@@ -135,9 +142,23 @@ export function planInvestmentScreen(
     const period = planIncomePeriod(
       screen.screen === 'income' ? screen.from : undefined,
       screen.screen === 'income' ? screen.to : undefined,
+      knownOpening,
     );
-    const bounds = dateOnlyBounds(period.selected, now);
+    for (const range of [
-    operations(bounds.from, bounds.to);
+      period.selected,
+      ...(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

@@ -451,11 +451,7 @@ export class BrokerageOperationsService {
         key: `${period.from}/${period.to}`,
         movingEnd: false,
       }));
-    const rows = saved?.rows ?? [];
+    return periods.map((period, index) => {
-    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,
@@ -491,7 +487,8 @@ export class BrokerageOperationsService {
           null;
       const confirmed = confirmedOperationRanges(plan.intervals, sources);
       const meta = investmentResourceMeta({
-        resourceKey: `income/${accountId}/selected/${period.key}`,
+        // eslint-disable-next-line security/detect-object-injection -- The numeric index enumerates the three comparison periods.
+        resourceKey: `income/${accountId}/${['selected', 'previous', 'yearAgo'][index]}/${period.key}`,
         dataRevision: saved?.binding ?? 'missing',
         availability: !known
           ? 'missing'
@@ -545,7 +542,7 @@ export class BrokerageOperationsService {
       return {
         meta,
         items: complete
-          ? rows
+          ? (saved?.rows ?? [])
               .filter((row) =>
                 plan.intervals.some(
                   (interval) =>
@@ -559,10 +556,6 @@ 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.dto.ts

@@ -209,6 +209,13 @@ export const investmentScreenSchema = {
   },
 };
 
+export class TbankSyncAcceptedDto {
+  @ApiProperty({ format: 'uuid' }) declare id: string;
+  @ApiProperty({ type: Object, ...investmentScreenSchema })
+  declare scope: InvestmentScreenDto;
+
+  @ApiProperty({ format: 'date-time' }) declare now: string;
+}
 export class TbankSyncStatusDto {
   @ApiProperty({ format: 'uuid' }) declare id: string;
   @ApiProperty({ type: Object, ...investmentScreenSchema, nullable: true })
@@ -222,6 +229,26 @@ export class TbankSyncStatusDto {
     null | string;
 }
 
+export class HourlySyncSectionDto {
+  @ApiProperty({ enum: ['membership', 'portfolio', 'operations', 'events'] })
+  declare section: 'events' | 'membership' | 'operations' | 'portfolio';
+
+  @ApiPropertyOptional({
+    type: String,
+    nullable: false,
+    description: 'Account identifier of the problematic section, when scoped.',
+  })
+  declare accountId?: string;
+
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    description:
+      'Safe error code of the failed section. No tokens or upstream payloads.',
+  })
+  declare errorCode: null | string;
+}
+
 export class HourlySyncStatusDto {
   @ApiProperty({
     enum: ['running', 'succeeded', 'partial', 'failed', 'cancelled'],

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

@@ -2,27 +2,314 @@ import {
   ConflictException,
   Injectable,
   NotFoundException,
+  ServiceUnavailableException,
 } from '@nestjs/common';
 import { randomUUID } from 'node:crypto';
 
-import { TbankAccessService } from '../../../integrations/tbank/tbank.api';
+import { ISO_DATE_LENGTH, ISO_DATE_START } from '../../../common/time';
-import { BrokerageOperationsSyncService } from '../operations/operations.api';
+import { TbankErrorCode } from '../../../integrations/tbank/tbank-error-code';
-import { TbankSyncStatusDto } from './tbank-sync.dto';
+import {
+  InstrumentMetadataService,
+  TbankAccessService,
+  TbankMembershipService,
+  type TbankSyncAttempt,
+} from '../../../integrations/tbank/tbank.api';
+import {
+  CandleService,
+  CatalogDiscoveryService,
+  CatalogEnrichmentService,
+} from '../instruments/instruments.api';
+import { planInvestmentScreen } from '../investment-sync-plan';
+import {
+  BrokerageOperationsSyncService,
+  type OperationInterval,
+} from '../operations/operations.api';
+import { PortfolioService } from '../portfolio/portfolio.api';
+import { normalizeScreen } from './tbank-screen';
+import { InvestmentScreenDto, TbankSyncStatusDto } from './tbank-sync.dto';
 import {
   type ScreenIntent,
   TbankSyncRepository,
 } from './tbank-sync.repository';
 
+const FOREGROUND_CANDLE_PRIORITY = 0;
+
 @Injectable()
 export class TbankSyncService {
   private readonly runId = randomUUID();
   private readonly startedAt = new Date();
+  private reservations: Promise<unknown> = Promise.resolve();
   constructor(
     private readonly repository: TbankSyncRepository,
     private readonly access: TbankAccessService,
+    private readonly membership: TbankMembershipService,
+    private readonly portfolio: PortfolioService,
     private readonly operations: BrokerageOperationsSyncService,
+    private readonly metadata: InstrumentMetadataService,
+    private readonly discovery: CatalogDiscoveryService,
+    private readonly sources: CatalogEnrichmentService,
+    private readonly candles: CandleService,
   ) {}
 
+  async request(userId: string, input: InvestmentScreenDto) {
+    const scope = normalizeScreen(input);
+    const connection = await this.access.local(userId, scope.accountId);
+    const reservation = this.reservations.then(() =>
+      this.repository.reserve(userId, connection.revision, scope, this.runId),
+    );
+    this.reservations = reservation.catch(() => undefined);
+    const reserved = await reservation;
+    if (!reserved) throw new ServiceUnavailableException();
+    const intent = reserved.work.intent as unknown as ScreenIntent;
+    if (reserved.launch) {
+      const attempt = {
+        userId,
+        revision: connection.revision,
+        id: reserved.work.id,
+        attemptId: reserved.work.attemptId,
+      };
+      setImmediate(() => {
+        void this.dispatch(attempt, intent);
+      });
+    }
+    return { id: reserved.work.id, ...intent };
+  }
+
+  private async dispatch(attempt: TbankSyncAttempt, intent: ScreenIntent) {
+    const children: string[] = [];
+    const add = async (ids: (null | string | undefined)[]) => {
+      children.push(...ids.filter((id): id is string => Boolean(id)));
+      await this.repository.progress(attempt, children, false);
+    };
+    try {
+      const { userId, revision } = attempt;
+      const { scope } = intent;
+      const now = new Date(intent.now);
+      const member = await this.membership.request(userId, revision, true);
+      await add([member?.id]);
+      await member?.done;
+      const current = await this.access.local(userId, scope.accountId);
+      if (current.revision !== revision) return;
+      const accountScope = scope.accountId ?? 'all';
+      const selectedAccounts = current.accounts.filter(
+        (account) =>
+          accountScope === 'all' || account.accountId === accountScope,
+      );
+      if (
+        ['account', 'accounts', 'bond', 'events', 'stock'].includes(
+          scope.screen,
+        )
+      ) {
+        for (const account of scope.screen === 'stock' ||
+          scope.screen === 'bond'
+          ? current.accounts
+          : selectedAccounts) {
+          const work = await this.portfolio.request(
+            userId,
+            revision,
+            account.accountId,
+            true,
+          );
+          await add([work?.id]);
+          await work?.done;
+        }
+      }
+      const saved = await this.portfolio.read(
+        userId,
+        scope.screen === 'stock' || scope.screen === 'bond'
+          ? 'all'
+          : accountScope,
+      );
+      const positions = saved.data?.positions ?? [];
+      const instruments = [
+        ...new Map(
+          positions.flatMap((position) =>
+            position.instrumentUid &&
+            (position.type === 'STOCK' || position.type === 'BOND')
+              ? [
+                  [
+                    position.instrumentUid,
+                    {
+                      uid: position.instrumentUid,
+                      type: position.type,
+                      historyFrom: null,
+                    },
+                  ] as const,
+                ]
+              : [],
+          ),
+        ).values(),
+      ];
+      const plan = planInvestmentScreen(
+        {
+          ...scope,
+          candleRange: scope.candleRange
+            ? {
+                from: new Date(scope.candleRange.from),
+                to: new Date(scope.candleRange.to),
+              }
+            : undefined,
+        },
+        {
+          accounts: selectedAccounts,
+          instruments:
+            scope.screen === 'stocks' || scope.screen === 'bonds'
+              ? []
+              : instruments,
+          membershipKnown: Boolean(current.membershipAt),
+        },
+        now,
+        true,
+      );
+      const intervals: OperationInterval[] = plan.sources.flatMap((source) =>
+        source.kind === 'operations' &&
+        source.accountId &&
+        source.from &&
+        source.to
+          ? [
+              {
+                accountId: source.accountId,
+                from: source.from,
+                to: source.to,
+                ...(source.instrumentUid
+                  ? { instrumentUid: source.instrumentUid }
+                  : {}),
+              },
+            ]
+          : [],
+      );
+      if (intervals.length) {
+        await add([
+          await this.operations.request(
+            userId,
+            intervals,
+            true,
+            'screen',
+            revision,
+          ),
+        ]);
+      }
+      for (const source of plan.sources) {
+        const uid = source.instrumentUid;
+        const type = source.instrumentType === 'BOND' ? 'bond' : 'share';
+        if (source.kind === 'catalog') {
+          await add(
+            await this.discovery.refresh(userId, revision, {
+              instrumentType: type,
+              query: source.query ?? '',
+            }),
+          );
+        }
+        if (!uid) continue;
+        if (source.kind === 'metadata') {
+          await add([
+            await this.metadata.request(userId, revision, {
+              instrumentUid: uid,
+            }),
+          ]);
+        }
+        if (source.kind === 'quote') {
+          await add(
+            await this.sources.requestMany(
+              userId,
+              revision,
+              type,
+              [uid],
+              true,
+              [
+                type === 'bond' ? 'bond-current' : 'detail',
+                'last-price',
+                'trading-status',
+                'comparison',
+              ],
+            ),
+          );
+        }
+        if (source.kind === 'company') {
+          await add(
+            await this.sources.requestMany(
+              userId,
+              revision,
+              type,
+              [uid],
+              true,
+              ['description', 'fundamentals'],
+            ),
+          );
+        }
+        if (source.kind === 'metrics') {
+          await add(
+            await this.sources.requestMany(
+              userId,
+              revision,
+              type,
+              [uid],
+              true,
+              ['coupons', 'yield', 'rating'],
+            ),
+          );
+        }
+        if (source.kind === 'calendar' && source.from && source.to) {
+          await add(
+            await this.sources.requestMany(
+              userId,
+              revision,
+              type,
+              [uid],
+              true,
+              [
+                type === 'share'
+                  ? 'dividends'
+                  : scope.screen === 'bond'
+                    ? 'coupons'
+                    : 'bond-events',
+              ],
+              {
+                from: source.from.toISOString().slice(ISO_DATE_START, ISO_DATE_LENGTH),
+                to: source.to.toISOString().slice(ISO_DATE_START, ISO_DATE_LENGTH),
+                ticker:
+                  positions.find((position) => position.instrumentUid === uid)
+                    ?.ticker ?? undefined,
+              },
+            ),
+          );
+        }
+      }
+      if (
+        (scope.screen === 'stock' || scope.screen === 'bond') &&
+        scope.instrumentUid
+      ) {
+        await add([
+          await this.candles.request(
+            userId,
+            revision,
+            {
+              uid: scope.instrumentUid,
+              instrumentType: scope.screen === 'bond' ? 'bond' : 'share',
+              period: scope.candlePeriod ?? 'month',
+              ...(scope.candleRange
+                ? {
+                    range: {
+                      from: new Date(scope.candleRange.from),
+                      to: new Date(scope.candleRange.to),
+                    },
+                  }
+                : {}),
+            },
+            now,
+            true,
+            FOREGROUND_CANDLE_PRIORITY,
+          ),
+        ]);
+      }
+      await this.repository.progress(attempt, children, true);
+    } catch {
+      await this.repository
+        .progress(attempt, children, true, TbankErrorCode.Unavailable)
+        .catch(() => undefined);
+    }
+  }
+
   async status(userId: string, id: string): Promise<TbankSyncStatusDto> {
     const connection = await this.access
       .local(userId)

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

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

test/openapi-contract.e2e-spec.ts

@@ -77,7 +77,7 @@ describe('OpenAPI contract (integration)', () => {
     }
   });
 
-  it('exposes only the selected income dependency role and no comparison data', () => {
+  it('exposes required semantic income dependency roles', () => {
     const schemas = createOpenApiDocument(app).components?.schemas;
     expect(schemas?.IncomeAnalyticsResourceDto).toMatchObject({
       properties: {
@@ -100,25 +100,9 @@ describe('OpenAPI contract (integration)', () => {
     expect(dependency.required).toContain('role');
     expect(dependency).toMatchObject({
       properties: {
-        role: { type: 'string', enum: ['selected'] },
+        role: { type: 'string', enum: ['selected', 'previous', 'year'] },
       },
     });
-    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 () => {

test/tbank-catalog-discovery.e2e-spec.ts

@@ -1,5 +1,6 @@
 import { ConfigService } from '@nestjs/config';
 import assert from 'node:assert/strict';
+import { setTimeout as delay } from 'node:timers/promises';
 
 import { TbankAccessService } from '../src/integrations/tbank/tbank-access.service';
 import { TbankTokenService } from '../src/integrations/tbank/tbank-token.service';
@@ -11,7 +12,7 @@ import {
 } from '../src/modules/investments/instruments/infrastructure/catalog-discovery.repository';
 import { PrismaService } from '../src/prisma/prisma.service';
 
-// Real transactions prove query normalization, confirmed-empty identity and cross-user isolation of shared reads.
+// Real transactions prove query coverage, private work ownership and late-publication fences.
 describe('shared catalog discovery (SQLite)', () => {
   const prisma = new PrismaService(
     new ConfigService({ DATABASE_URL: process.env.DATABASE_URL }),
@@ -29,6 +30,7 @@ describe('shared catalog discovery (SQLite)', () => {
       repository,
       access,
       upstream as never,
+      { event: jest.fn() } as never,
       { requestMany: jest.fn().mockResolvedValue([]) } as never,
     );
   let service: CatalogDiscoveryService;
@@ -49,42 +51,14 @@ describe('shared catalog discovery (SQLite)', () => {
         connectedAt: new Date(),
       },
     });
-  // Writes a finished discovery directly, so the read path is tested without any producer.
+  async function settled() {
-  async function seedCatalog(
+    for (let i = 0; i < 300; i++) {
-    query: string,
+      if (!(await prisma.tbankSyncWork.count({ where: { state: 'running' } }))) {
-    instruments: Array<{ payload: CatalogInstrument; uid: string }>,
+        return;
-  ) {
+      }
-    for (const item of instruments) {
+      await delay(5);
-      await prisma.tbankInstrument.create({
-        data: {
-          provider: 'tbank',
-          uid: item.uid,
-          instrumentType: 'share',
-          metadata: {},
-          fetchedAt: new Date(),
-        },
-      });
-      await prisma.tbankInstrumentSource.create({
-        data: {
-          provider: 'tbank',
-          instrumentUid: item.uid,
-          source: 'tbank',
-          kind: 'catalog',
-          rangeKey: 'share',
-          payload: item.payload,
-          fetchedAt: new Date(),
-        },
-      });
     }
-    await prisma.tbankCatalogDiscovery.create({
+    throw new Error('Catalog work did not settle');
-      data: {
-        provider: 'tbank',
-        instrumentType: 'share',
-        query,
-        instrumentUids: instruments.map((item) => item.uid),
-        fetchedAt: new Date(),
-      },
-    });
   }
   beforeAll(async () => {
     await prisma.$connect();
@@ -98,41 +72,265 @@ describe('shared catalog discovery (SQLite)', () => {
   beforeEach(async () => {
     await prisma.tbankConnection.deleteMany();
     await prisma.tbankCatalogDiscovery.deleteMany();
-    await prisma.tbankInstrumentSource.deleteMany();
     await prisma.tbankInstrument.deleteMany();
     await seed('owner');
     await seed('other');
     jest.resetAllMocks();
+    upstream.findShares.mockResolvedValue([instrument]);
+    upstream.findBonds.mockResolvedValue([
+      { ...instrument, uid: 'bond', instrumentKind: 'INSTRUMENT_TYPE_BOND' },
+    ]);
     service = createService();
   });
-  it('treats an unknown query as unavailable and a seeded query as available for another user', async () => {
+  it('persists normalized query identity and confirmed empty separately from unknown, across users and reopen', async () => {
     const cold = await service.read('owner', { ...query, query: ' sber ' });
     expect(cold.data).toBeNull();
-    expect(cold.meta.availability).toBe('temporarily-unavailable');
+    expect(cold.meta.availability).toBe('initial-loading');
-    await seedCatalog('SBER', [{ uid: 'uid', payload: instrument }]);
+    await settled();
+    await prisma.$disconnect();
+    service = createService();
+    const decrypt = jest.spyOn(tokens, 'decrypt');
     const warm = await service.read('other', query);
     expect(warm.data).toEqual([instrument]);
     expect(warm.meta.availability).toBe('available');
-    expect(upstream.findShares).not.toHaveBeenCalled();
+    expect(warm.meta.completeness).toBe('complete');
+    expect(warm.meta.sync.id).toBeNull();
+    expect(decrypt).not.toHaveBeenCalled();
+    expect(upstream.findShares).toHaveBeenCalledTimes(1);
+    expect(
+      (await service.read('other', { ...query, query: 'GAZP' }, true)).data,
+    ).toBeNull();
+    upstream.findShares.mockResolvedValue([]);
+    await service.read('other', { ...query, query: 'GAZP' });
+    await settled();
+    expect(
+      (await service.read('owner', { ...query, query: 'GAZP' })).data,
+    ).toEqual([]);
+    expect((await service.read('owner', query)).data).toEqual([instrument]);
+    expect(upstream.findShares).toHaveBeenCalledTimes(2);
+    decrypt.mockRestore();
+    await service.read('owner', { ...query, instrumentType: 'bond' });
+    await settled();
+    expect(
+      (await service.read('other', { ...query, instrumentType: 'bond' }))
+        .data?.[0].uid,
+    ).toBe('bond');
   });
-  it('keeps a confirmed empty result distinct from an unknown query', async () => {
+  it('keeps selection ordering, deduplicates before limiting, and retains identity without enrichment or private fields', async () => {
-    await seedCatalog('GAZP', []);
+    upstream.findShares.mockResolvedValue([
-    const empty = await service.read('owner', { ...query, query: 'GAZP' });
+      { ...instrument, uid: 'unavailable', apiTradeAvailableFlag: false },
-    expect(empty.data).toEqual([]);
+      {
-    expect(empty.meta.availability).toBe('available');
+        ...instrument,
-    const unknown = await service.read('owner', { ...query, query: 'LKOH' });
+        uid: 'preferred',
-    expect(unknown.data).toBeNull();
+        apiTradeAvailableFlag: true,
-  });
+        classCode: 'TQBR',
-  it('keeps the stored selection order and does not expose private fields', async () => {
+        quantity: '999',
-    const first = { ...instrument, uid: 'first', name: 'First' };
+        estimatedAmount: 'secret',
-    const second = { ...instrument, uid: 'second', name: 'Second' };
+      },
-    await seedCatalog('SBER', [
+      ...Array.from({ length: 40 }, (_, i) => ({
-      { uid: 'second', payload: second },
+        ...instrument,
-      { uid: 'first', payload: first },
+        uid: `other-${String(i).padStart(2, '0')}`,
+        isin: undefined,
+        ticker: 'OTHER',
+      })),
+      {
+        ...instrument,
+        uid: 'wrong-kind',
+        instrumentKind: 'INSTRUMENT_TYPE_BOND',
+      },
     ]);
-    const result = await service.read('owner', query);
+    await service.read('owner', query);
-    assert(result.data);
+    await settled();
-    expect(result.data.map((item) => item.uid)).toEqual(['second', 'first']);
+    const saved = await service.read('other', query);
-    expect(result.data[0]).not.toHaveProperty('accountId');
+    expect(saved.data).toHaveLength(30);
+    expect(saved.data?.[0].uid).toBe('preferred');
+    expect(
+      saved.data?.some((row) =>
+        ['unavailable', 'wrong-kind'].includes(row.uid),
+      ),
+    ).toBe(false);
+    expect(
+      JSON.stringify(await prisma.tbankInstrumentSource.findMany()),
+    ).not.toMatch(
+      /quantity|estimatedAmount|secret|owner-revision|synthetic-owner/,
+    );
+    expect(await prisma.tbankInstrumentLookup.count()).toBe(0);
+  });
+  it('does not overwrite detailed metadata or its timestamp while refreshing discovery', async () => {
+    const detailed = { ...instrument, sector: 'financial', lot: 10 };
+    const fetchedAt = new Date('2026-01-01');
+    await prisma.tbankInstrument.create({
+      data: {
+        provider: 'tbank',
+        uid: 'uid',
+        instrumentType: 'share',
+        metadata: detailed,
+        fetchedAt,
+      },
+    });
+    await service.read('owner', query);
+    await settled();
+    const row = await prisma.tbankInstrument.findUniqueOrThrow({
+      where: { provider_uid: { provider: 'tbank', uid: 'uid' } },
+    });
+    expect(row.metadata).toEqual(detailed);
+    expect(row.fetchedAt).toEqual(fetchedAt);
+  });
+  it('coalesces twenty concurrent requests and forces with private handles and one upstream call', async () => {
+    const blocked = deferred<CatalogInstrument[]>();
+    upstream.findShares.mockReturnValue(blocked.promise);
+    const reads = await Promise.all(
+      Array.from({ length: 20 }, (_, i) =>
+        service.read(i % 2 ? 'owner' : 'other', query),
+      ),
+    );
+    await service.request('owner', 'owner-revision', query, true);
+    await delay(10);
+    expect(upstream.findShares).toHaveBeenCalledTimes(1);
+    expect(new Set(reads.map((read) => read.meta.sync.id)).size).toBe(2);
+    blocked.resolve([instrument]);
+    await settled();
+    expect(
+      await prisma.tbankSyncWork.count({ where: { state: 'complete' } }),
+    ).toBe(2);
+  });
+  it.each(['delete', 'replace'])(
+    'discards late %s publication and does not borrow observer credentials',
+    async (action) => {
+      const blocked = deferred<CatalogInstrument[]>();
+      upstream.findShares.mockReturnValueOnce(blocked.promise);
+      await service.read('owner', query);
+      await service.read('other', query);
+      await delay(10);
+      await prisma.tbankConnection.delete({ where: { userId: 'owner' } });
+      if (action === 'replace') {
+        await prisma.tbankConnection.create({
+          data: {
+            userId: 'owner',
+            revision: 'replacement',
+            encryptedToken: tokens.encrypt('replacement'),
+            connectedAt: new Date(),
+          },
+        });
+      }
+      blocked.resolve([instrument]);
+      await settled();
+      expect(await prisma.tbankCatalogDiscovery.count()).toBe(0);
+      expect(await prisma.tbankInstrument.count()).toBe(0);
+      expect(
+        (await service.read('other', query, true)).meta.sync.errorCode,
+      ).toBe('TBANK_UNAVAILABLE');
+      expect(upstream.findShares).toHaveBeenCalledTimes(1);
+      await service.read('other', query);
+      await settled();
+      expect((await service.read('other', query, true)).data).toEqual([
+        instrument,
+      ]);
+    },
+  );
+  it('preserves a successful result and its timestamp after a failed force without observe retry', async () => {
+    await service.read('owner', query);
+    await settled();
+    const before = await repository.read(query);
+    upstream.findShares.mockRejectedValue(new Error('outage'));
+    await service.request('owner', 'owner-revision', query, true);
+    await settled();
+    for (let i = 0; i < 5; i++) await service.read('owner', query, true);
+    expect(await repository.read(query)).toEqual(before);
+    expect((await service.read('owner', query, true)).meta.sync.state).toBe(
+      'failed',
+    );
+    expect(upstream.findShares).toHaveBeenCalledTimes(2);
+    expect((await service.read('other', query)).meta.sync.errorCode).toBeNull();
+  });
+  it('isolates invalid credentials from shared empty lookup and another user', async () => {
+    const blocked = deferred<CatalogInstrument[]>();
+    upstream.findShares.mockReturnValueOnce(blocked.promise);
+    await service.read('owner', query);
+    await service.read('other', query);
+    blocked.reject(new Error('INVALID_TBANK_TOKEN'));
+    await settled();
+    expect(await prisma.tbankCatalogDiscovery.count()).toBe(0);
+    expect(
+      (
+        await prisma.tbankConnection.findUniqueOrThrow({
+          where: { userId: 'owner' },
+        })
+      ).invalidToken,
+    ).toBe(true);
+    expect((await service.read('other', query, true)).meta.sync.errorCode).toBe(
+      'TBANK_UNAVAILABLE',
+    );
+    await service.read('other', query);
+    await settled();
+    expect((await service.read('other', query, true)).data).toEqual([
+      instrument,
+    ]);
+  });
+  it('recovers abandoned work only on the next ordinary request and rejects superseded attempts', async () => {
+    const abandoned = await repository.reserve(
+      { userId: 'owner', revision: 'owner-revision' },
+      query,
+      'old-process',
+      new Set(),
+    );
+    assert(abandoned);
+    service = createService();
+    await service.read('owner', query, true);
+    await delay(10);
+    expect(upstream.findShares).not.toHaveBeenCalled();
+    await service.read('owner', query);
+    await settled();
+    expect(
+      await repository.publish(
+        {
+          userId: 'owner',
+          revision: 'owner-revision',
+          id: abandoned.work.id,
+          attemptId: abandoned.work.attemptId,
+        },
+        query,
+        [],
+        new Date(),
+      ),
+    ).toBe(false);
+    expect((await service.read('owner', query, true)).data).toEqual([
+      instrument,
+    ]);
+  });
+  it('keeps known discovery stable between refresh requests', async () => {
+    await service.read('owner', query);
+    await settled();
+    const now = Date.now();
+    const clock = jest.spyOn(Date, 'now').mockReturnValue(now);
+    try {
+      await prisma.tbankCatalogDiscovery.updateMany({
+        data: { fetchedAt: new Date(now - 86_399_000) },
+      });
+      await service.read('other', query);
+      expect(upstream.findShares).toHaveBeenCalledTimes(1);
+      await prisma.tbankCatalogDiscovery.updateMany({
+        data: { fetchedAt: new Date(now - 86_400_000) },
+      });
+      expect((await service.read('other', query, true)).meta.freshness).toBe('fresh');
+      expect(upstream.findShares).toHaveBeenCalledTimes(1);
+      await service.read('other', query);
+      expect(upstream.findShares).toHaveBeenCalledTimes(1);
+    } finally {
+      clock.mockRestore();
+    }
   });
 });
+function deferred<T>() {
+  let resolve: (value: T) => void = () => {
+    throw new Error('Uninitialized deferred');
+  };
+  let reject: (error: Error) => void = () => {
+    throw new Error('Uninitialized deferred');
+  };
+  const promise = new Promise<T>((yes, no) => {
+    resolve = yes;
+    reject = no;
+  });
+  return { promise, resolve, reject };
+}

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

@@ -124,7 +124,7 @@ describe('local income completeness and exact money (SQLite)', () => {
       }
     }
   });
-  it('returns exact selected sums; reopen and observe need no RPC', async () => {
+  it('returns exact selected sums without a false zero comparison; reopen and observe need no RPC', async () => {
     for (let index = 0; index < 2; index++) {
       const result = await read();
       assert(result.data);
@@ -140,55 +140,22 @@ 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' },
@@ -209,7 +176,15 @@ describe('local income completeness and exact money (SQLite)', () => {
     ).toEqual([]);
     expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
   });
-  it('counts corrected identities once for the selected period', async () => {
+  it('completes previous/yearAgo independently and counts corrected identities once', 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: {
@@ -222,12 +197,14 @@ describe('local income completeness and exact money (SQLite)', () => {
       },
     });
     const result = await read();
-    assert(result.data);
+    assert(result.data?.previous && result.data.yearComparison);
     expect(result.data.entries).toHaveLength(6);
     expect(
-      result.data.totalsByCurrency.find(({ currency }) => currency === 'RUB')
+      result.data.previous.totalsByCurrency[0].difference.total.value,
-        ?.total,
+    ).toBe('25.000000002');
-    ).toEqual({ currency: 'RUB', value: '25.000000002' });
+    expect(
+      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();
@@ -299,13 +276,12 @@ 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('plans only the selected period for a leap day without scheduling it', async () => {
+  it('distinguishes unavailable calendar comparison without scheduling it', async () => {
     const result = await read('a', 'from=2024-02-29&to=2024-02-29');
-    expect(result.meta.dependencies.map(({ role }) => role)).toEqual([
+    expect(
-      'selected',
+      result.meta.dependencies.find(({ role }) => role === 'year')
-    ]);
+        ?.unavailableReason,
-    expect(result.meta.dependencies[0].availability).toBe('temporarily-unavailable');
+    ).toBe('CALENDAR_OR_ACCOUNT_HISTORY');
-    expect(result.data).toBeNull();
     expect(upstream.getOperationsByCursor).not.toHaveBeenCalled();
   });
 });

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

@@ -3,7 +3,6 @@ import type { Server } from 'node:http';
 import { INestApplication } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Test } from '@nestjs/testing';
-import assert from 'node:assert/strict';
 import { setTimeout as delay } from 'node:timers/promises';
 import request from 'supertest';
 
@@ -502,30 +501,16 @@ describe('local accounts and portfolio HTTP (SQLite)', () => {
     await put().expect(200);
     await seedMembership();
     const blocked = deferred<TbankPortfolio>();
-    const started = deferred<void>();
+    upstream.getPortfolio.mockReturnValueOnce(blocked.promise);
-    upstream.getPortfolio.mockImplementationOnce(() => {
+    await get('brokerage-accounts/account/portfolio').expect(200);
-      started.resolve();
-      return blocked.promise;
-    });
-    // Starts the real portfolio producer, the same path the hourly walk uses.
-    const late = await portfolioService.request(
-      'owner',
-      (await prisma.tbankConnection.findUniqueOrThrow({ where: { userId: 'owner' } })).revision,
-      'account',
-      true,
-    );
-    assert(late);
-    // The late upstream call must have begun before the connection is replaced.
-    await started.promise;
     await put().expect(200);
     await seedMembership();
     blocked.resolve({ positions: [] });
-    // Barrier: the fenced producer's completion, not a timer.
+    await delay(20);
-    await late.done;
-    expect(await prisma.tbankPortfolio.count()).toBe(0);
     const replaced = await get(
       'brokerage-accounts/account/portfolio?sync=observe',
     ).expect(200);
     expect((replaced.body as PortfolioResourceDto).data).toBeNull();
+    expect(await prisma.tbankPortfolio.count()).toBe(0);
   });
 });

test/tbank-portfolio-publish.e2e-spec.ts

@@ -1,73 +0,0 @@
-import { ConfigService } from '@nestjs/config';
-import assert from 'node:assert/strict';
-
-import { PortfolioRepository } from '../src/modules/investments/portfolio/infrastructure/portfolio.repository';
-import { PrismaService } from '../src/prisma/prisma.service';
-
-// Real SQLite transaction: a running attempt of the current revision publishes its snapshot.
-describe('portfolio publication (SQLite)', () => {
-  const prisma = new PrismaService(
-    new ConfigService({ DATABASE_URL: process.env.DATABASE_URL }),
-  );
-  const repository = new PortfolioRepository(prisma);
-  const snapshot = {
-    lastSuccessfulAt: '2026-01-01T00:00:00.000Z',
-    isStale: false,
-    totalsByCurrency: [],
-    positions: [],
-    cashBalances: [],
-    structure: {},
-  } as never;
-  const accountId = 'account';
-
-  beforeAll(async () => {
-    await prisma.$connect();
-    await prisma.user.create({
-      data: { id: 'owner', email: 'owner@example.invalid', passwordHash: 'synthetic' },
-    });
-  });
-  afterAll(async () => prisma.$disconnect());
-  beforeEach(async () => {
-    await prisma.tbankConnection.deleteMany();
-    await prisma.tbankConnection.create({
-      data: {
-        userId: 'owner',
-        revision: 'current',
-        encryptedToken: 'synthetic',
-        connectedAt: new Date(),
-        accounts: {
-          create: {
-            accountId,
-            type: 'brokerage',
-            name: 'Synthetic',
-            upstreamOrder: 0,
-          },
-        },
-      },
-    });
-  });
-
-  it('publishes the same snapshot for the running attempt of the current revision', async () => {
-    await prisma.tbankSyncWork.create({
-      data: {
-        id: 'live',
-        userId: 'owner',
-        revision: 'current',
-        scopeKey: `portfolio:${accountId}`,
-        intent: {},
-        state: 'running',
-        attemptId: 'live-attempt',
-        processRunId: 'run',
-        priority: 1,
-        progress: {},
-      },
-    });
-    const published = await repository.publish(
-      { id: 'live', attemptId: 'live-attempt', userId: 'owner', revision: 'current' },
-      accountId,
-      snapshot,
-    );
-    assert.equal(published, true);
-    expect(await prisma.tbankPortfolio.count()).toBe(1);
-  });
-});