fix: changes from feedback

Author: gagik

src/deferred-promise.ts

@@ -26,24 +26,22 @@ export class DeferredPromise<T> extends Promise<T> {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         this.reject = rejectFn!;
 
-        if (timeout !== undefined) {
+        if (timeout !== undefined && onTimeout) {
             this.timeoutId = setTimeout(() => {
-                onTimeout?.(this.resolve, this.reject);
+                onTimeout(this.resolve, this.reject);
             }, timeout);
         }
 
-        if (executor) {
-            executor(
-                (value: T) => {
-                    if (this.timeoutId) clearTimeout(this.timeoutId);
-                    this.resolve(value);
-                },
-                (reason: Error) => {
-                    if (this.timeoutId) clearTimeout(this.timeoutId);
-                    this.reject(reason);
-                }
-            );
-        }
+        executor(
+            (value: T) => {
+                if (this.timeoutId) clearTimeout(this.timeoutId);
+                this.resolve(value);
+            },
+            (reason: Error) => {
+                if (this.timeoutId) clearTimeout(this.timeoutId);
+                this.reject(reason);
+            }
+        );
     }
 
     static fromPromise<T>(promise: Promise<T>, options: DeferredPromiseOptions<T> = {}): DeferredPromise<T> {

src/telemetry/telemetry.ts

@@ -77,7 +77,7 @@ export class Telemetry {
     }
 
     /**
-     * @returns A hashed, unique identifier for the running device or `undefined` if not known.
+     * @returns A hashed, unique identifier for the running device or `"unknown"` if not known.
      */
     private async getDeviceId(): Promise<string> {
         try {
@@ -126,7 +126,6 @@ export class Telemetry {
     public getCommonProperties(): CommonProperties {
         return {
             ...this.commonProperties,
-            device_id: this.commonProperties.device_id,
             mcp_client_version: this.session.agentRunner?.version,
             mcp_client_name: this.session.agentRunner?.name,
             session_id: this.session.sessionId,