Support usage tracking message state (#405)

* wip

* Support usageTrackingMessageLastShowVersion in state.ts

Author: camden11

config/__tests__/state.test.ts

@@ -1,6 +1,6 @@
 import { vi, describe, it, expect, beforeEach, afterEach, Mock } from 'vitest';
 import path from 'path';
-import { STATE_FILE_PATH } from '../../constants/config.js';
+import { STATE_FILE_PATH, STATE_FLAGS } from '../../constants/config.js';
 
 vi.mock('../../utils/lang', () => ({
   i18n: vi.fn((key: string) => key),
@@ -129,15 +129,15 @@ describe('config/state', () => {
       expect(result).toBe(0);
     });
 
-    it('returns default value when state file has invalid structure (wrong type)', () => {
+    it('accepts value even if type does not match default', () => {
       existsSyncSpy.mockReturnValue(true);
       readFileSyncSpy.mockReturnValue(
         JSON.stringify({ mcpTotalToolCalls: 'not-a-number' })
       );
 
       const result = getStateValue('mcpTotalToolCalls');
 
-      expect(result).toBe(0);
+      expect(result).toBe('not-a-number');
     });
 
     it('ignores extra keys in state file', () => {
@@ -174,6 +174,43 @@ describe('config/state', () => {
       expect(result).toBe(0);
     });
 
+    it('returns usageTrackingMessageLastShowVersion from state file', () => {
+      const mockState = {
+        mcpTotalToolCalls: 0,
+        usageTrackingMessageLastShowVersion: '5.3.2',
+      };
+      existsSyncSpy.mockReturnValue(true);
+      readFileSyncSpy.mockReturnValue(JSON.stringify(mockState));
+
+      const result = getStateValue(
+        STATE_FLAGS.USAGE_TRACKING_MESSAGE_LAST_SHOW_VERSION
+      );
+
+      expect(result).toBe('5.3.2');
+    });
+
+    it('returns undefined for usageTrackingMessageLastShowVersion when not in state file', () => {
+      const mockState = { mcpTotalToolCalls: 5 };
+      existsSyncSpy.mockReturnValue(true);
+      readFileSyncSpy.mockReturnValue(JSON.stringify(mockState));
+
+      const result = getStateValue(
+        STATE_FLAGS.USAGE_TRACKING_MESSAGE_LAST_SHOW_VERSION
+      );
+
+      expect(result).toBeUndefined();
+    });
+
+    it('returns undefined for usageTrackingMessageLastShowVersion when file does not exist', () => {
+      existsSyncSpy.mockReturnValue(false);
+
+      const result = getStateValue(
+        STATE_FLAGS.USAGE_TRACKING_MESSAGE_LAST_SHOW_VERSION
+      );
+
+      expect(result).toBeUndefined();
+    });
+
     it('returns default state when JSON parses to an array', () => {
       existsSyncSpy.mockReturnValue(true);
       readFileSyncSpy.mockReturnValue(JSON.stringify([1, 2, 3]));
@@ -276,18 +313,36 @@ describe('config/state', () => {
     });
 
     it('preserves other state values when updating one value', () => {
-      const existingState = { mcpTotalToolCalls: 100 };
+      const existingState = {
+        mcpTotalToolCalls: 100,
+        usageTrackingMessageLastShowVersion: '5.3.0',
+      };
       existsSyncSpy.mockReturnValue(true);
       readFileSyncSpy.mockReturnValue(JSON.stringify(existingState));
       writeFileSyncSpy.mockImplementation(() => undefined);
 
       setStateValue('mcpTotalToolCalls', 150);
 
-      expect(writeFileSyncSpy).toHaveBeenCalledWith(
-        STATE_FILE_PATH,
-        JSON.stringify({ mcpTotalToolCalls: 150 }, null, 2),
-        'utf-8'
+      const written = JSON.parse(writeFileSyncSpy.mock.calls[0][1]);
+      expect(written.mcpTotalToolCalls).toBe(150);
+      expect(written.usageTrackingMessageLastShowVersion).toBe('5.3.0');
+    });
+
+    it('sets usageTrackingMessageLastShowVersion', () => {
+      existsSyncSpy.mockReturnValue(true);
+      readFileSyncSpy.mockReturnValue(
+        JSON.stringify({ mcpTotalToolCalls: 10 })
       );
+      writeFileSyncSpy.mockImplementation(() => undefined);
+
+      setStateValue(
+        STATE_FLAGS.USAGE_TRACKING_MESSAGE_LAST_SHOW_VERSION,
+        '5.3.2'
+      );
+
+      const written = JSON.parse(writeFileSyncSpy.mock.calls[0][1]);
+      expect(written.mcpTotalToolCalls).toBe(10);
+      expect(written.usageTrackingMessageLastShowVersion).toBe('5.3.2');
     });
 
     it('throws error when write fails with non-Error', () => {

config/state.ts

@@ -10,6 +10,7 @@ const i18nKey = 'config.state';
 
 const DEFAULT_STATE: HubSpotState = {
   [STATE_FLAGS.MCP_TOTAL_TOOL_CALLS]: 0,
+  [STATE_FLAGS.USAGE_TRACKING_MESSAGE_LAST_SHOW_VERSION]: undefined,
 };
 
 function ensureCLIDirectory(): void {
@@ -27,23 +28,18 @@ function ensureCLIDirectory(): void {
   }
 }
 
-function sanitizeAndMerge(parsed: unknown): HubSpotState {
+function parseState(parsed: unknown): HubSpotState {
   if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
     return structuredClone(DEFAULT_STATE);
   }
 
-  const state = parsed as HubSpotState;
+  const record = parsed as Record<string, unknown>;
   const result: HubSpotState = structuredClone(DEFAULT_STATE);
 
-  for (const key in DEFAULT_STATE) {
-    const typedKey = key as keyof HubSpotState;
-    if (
-      key in state &&
-      typeof state[typedKey] === typeof DEFAULT_STATE[typedKey]
-    ) {
-      result[typedKey] = state[typedKey];
+  for (const key of Object.keys(DEFAULT_STATE)) {
+    if (key in record && record[key] !== undefined) {
+      Object.assign(result, { [key]: record[key] });
     }
-    // keys not in parsed file remain as DEFAULT values
   }
 
   return result;
@@ -63,7 +59,7 @@ function getCurrentState(): HubSpotState {
     }
 
     const parsed = JSON.parse(data);
-    return sanitizeAndMerge(parsed);
+    return parseState(parsed);
   } catch (error) {
     logger.debug(
       i18n(`${i18nKey}.getCurrentState.errors.errorReading`, {

constants/config.ts

@@ -79,6 +79,8 @@ export const HUBSPOT_ACCOUNT_TYPE_STRINGS = {
 
 export const STATE_FLAGS = {
   MCP_TOTAL_TOOL_CALLS: 'mcpTotalToolCalls',
+  USAGE_TRACKING_MESSAGE_LAST_SHOW_VERSION:
+    'usageTrackingMessageLastShowVersion',
 } as const;
 
 export const CONFIG_FLAGS = {

types/Config.ts

@@ -2,6 +2,7 @@ import {
   CONFIG_FLAGS,
   HUBSPOT_CONFIG_ERROR_TYPES,
   HUBSPOT_CONFIG_OPERATIONS,
+  STATE_FLAGS,
 } from '../constants/config.js';
 import {
   DeprecatedHubSpotConfigAccountFields,
@@ -41,7 +42,8 @@ export type GitInclusionResult = {
 export type ConfigFlag = ValueOf<typeof CONFIG_FLAGS>;
 
 export type HubSpotState = {
-  mcpTotalToolCalls: number;
+  [STATE_FLAGS.MCP_TOTAL_TOOL_CALLS]: number;
+  [STATE_FLAGS.USAGE_TRACKING_MESSAGE_LAST_SHOW_VERSION]?: string;
 };
 
 export type HubSpotConfigErrorType = ValueOf<typeof HUBSPOT_CONFIG_ERROR_TYPES>;