Merge remote-tracking branch 'upstream/main'

Author: omalleyandy

src/main.ts

@@ -16,9 +16,9 @@ import {logger, saveLogsToFile} from './logger.js';
 import {McpContext} from './McpContext.js';
 import {McpResponse} from './McpResponse.js';
 import {Mutex} from './Mutex.js';
-import {ClearcutLogger} from './telemetry/clearcut-logger.js';
-import {computeFlagUsage} from './telemetry/flag-utils.js';
-import {bucketizeLatency} from './telemetry/metric-utils.js';
+import {ClearcutLogger} from './telemetry/ClearcutLogger.js';
+import {computeFlagUsage} from './telemetry/flagUtils.js';
+import {bucketizeLatency} from './telemetry/metricUtils.js';
 import {
   McpServer,
   StdioServerTransport,

src/telemetry/clearcut-logger.ts src/telemetry/ClearcutLogger.tssrc/telemetry/clearcut-logger.ts renamed to src/telemetry/ClearcutLogger.ts

@@ -11,7 +11,7 @@ import {logger} from '../logger.js';
 import type {LocalState, Persistence} from './persistence.js';
 import {FilePersistence} from './persistence.js';
 import {type FlagUsage, WatchdogMessageType, OsType} from './types.js';
-import {WatchdogClient} from './watchdog-client.js';
+import {WatchdogClient} from './WatchdogClient.js';
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 

src/telemetry/watchdog-client.ts src/telemetry/WatchdogClient.tssrc/telemetry/watchdog-client.ts renamed to src/telemetry/WatchdogClient.ts

@@ -13,7 +13,7 @@ import {logger, flushLogs, saveLogsToFile} from '../../logger.js';
 import type {OsType} from '../types.js';
 import {WatchdogMessageType} from '../types.js';
 
-import {ClearcutSender} from './clearcut-sender.js';
+import {ClearcutSender} from './ClearcutSender.js';
 
 interface WatchdogArgs {
   // Required arguments

src/telemetry/flag-utils.ts src/telemetry/flagUtils.tssrc/telemetry/flag-utils.ts renamed to src/telemetry/flagUtils.ts

@@ -19,6 +19,10 @@ describe('snapshotFormatter', () => {
       role: 'textbox',
       name: 'textbox',
       value: 'value',
+      live: 'polite',
+      relevant: 'additions',
+      errormessage: 'error-id',
+      details: 'details-id',
       children: [
         {
           id: '1_2',
@@ -39,7 +43,7 @@ describe('snapshotFormatter', () => {
     const formatted = formatter.toString();
     assert.strictEqual(
       formatted,
-      `uid=1_1 textbox "textbox" value="value"
+      `uid=1_1 textbox "textbox" details="details-id" errormessage="error-id" live="polite" relevant="additions" value="value"
   uid=1_2 statictext "text"
 `,
     );
@@ -51,6 +55,8 @@ describe('snapshotFormatter', () => {
       role: 'button',
       name: 'button',
       disabled: true,
+      busy: true,
+      atomic: true,
       children: [
         {
           id: '1_2',
@@ -71,7 +77,7 @@ describe('snapshotFormatter', () => {
     const formatted = formatter.toString();
     assert.strictEqual(
       formatted,
-      `uid=1_1 button "button" disableable disabled
+      `uid=1_1 button "button" atomic busy disableable disabled
   uid=1_2 statictext "text"
 `,
     );
@@ -261,6 +267,8 @@ describe('snapshotFormatter', () => {
       id: '1_1',
       role: 'root',
       name: 'root',
+      busy: true,
+      live: 'polite',
       children: [
         {
           id: '1_2',
@@ -281,6 +289,8 @@ describe('snapshotFormatter', () => {
       id: '1_1',
       role: 'root',
       name: 'root',
+      busy: true,
+      live: 'polite',
       children: [
         {
           id: '1_2',

src/telemetry/metric-utils.ts src/telemetry/metricUtils.tssrc/telemetry/metric-utils.ts renamed to src/telemetry/metricUtils.ts

@@ -9,11 +9,11 @@ import {describe, it, afterEach, beforeEach} from 'node:test';
 
 import sinon from 'sinon';
 
-import {ClearcutLogger} from '../../src/telemetry/clearcut-logger.js';
+import {ClearcutLogger} from '../../src/telemetry/ClearcutLogger.js';
 import type {Persistence} from '../../src/telemetry/persistence.js';
 import {FilePersistence} from '../../src/telemetry/persistence.js';
 import {WatchdogMessageType} from '../../src/telemetry/types.js';
-import {WatchdogClient} from '../../src/telemetry/watchdog-client.js';
+import {WatchdogClient} from '../../src/telemetry/WatchdogClient.js';
 
 describe('ClearcutLogger', () => {
   let mockPersistence: sinon.SinonStubbedInstance<Persistence>;

src/telemetry/watchdog/clearcut-sender.ts src/telemetry/watchdog/ClearcutSender.tssrc/telemetry/watchdog/clearcut-sender.ts renamed to src/telemetry/watchdog/ClearcutSender.ts

@@ -12,7 +12,7 @@ import {describe, it, afterEach, beforeEach} from 'node:test';
 import sinon from 'sinon';
 
 import {OsType, WatchdogMessageType} from '../../src/telemetry/types.js';
-import {WatchdogClient} from '../../src/telemetry/watchdog-client.js';
+import {WatchdogClient} from '../../src/telemetry/WatchdogClient.js';
 
 describe('WatchdogClient', () => {
   let spawnStub: sinon.SinonStub;