@go-avro/avro-js 0.0.42 → 0.0.44

package/dist/client/QueryClient.js

@@ -1,11 +1,11 @@
-import io from "socket.io-client";
-import { useMutation, useQueryClient, } from "@tanstack/react-query";
-import { v4 as uuidv4 } from "uuid";
-import { _Event, Job, LoginResponse, Route, } from "../types/api";
-import { AuthState } from "../types/auth";
-import { StandardError } from "../types/error";
+import io from 'socket.io-client';
+import { useMutation, useQueryClient, } from '@tanstack/react-query';
+import { v4 as uuidv4 } from 'uuid';
+import { _Event, Job, LoginResponse, Route, } from '../types/api';
+import { AuthState } from '../types/auth';
+import { StandardError } from '../types/error';
 function isBulkEvent(c) {
-    return "invalidateKeys" in c;
+    return 'invalidateKeys' in c;
 }
 /**
  * Maps socket event names to cache-update strategies.
@@ -19,188 +19,188 @@ function isBulkEvent(c) {
 const SOCKET_EVENT_CONFIG = {
     // ── Company ──
     create_company: {
-        entityKey: "companies",
-        action: "create",
+        entityKey: 'companies',
+        action: 'create',
         fetchPath: (id) => `/company/${id}`,
     },
     update_company: {
-        entityKey: "companies",
-        action: "update",
+        entityKey: 'companies',
+        action: 'update',
         fetchPath: (id) => `/company/${id}`,
     },
-    delete_company: { entityKey: "companies", action: "delete", fetchPath: null },
+    delete_company: { entityKey: 'companies', action: 'delete', fetchPath: null },
     // ── Users (no single-entity socket events) ──
-    user_updated: { invalidateKeys: [["users"], ["user"]] },
-    update_users: { invalidateKeys: [["users"], ["user"]] },
+    user_updated: { invalidateKeys: [['users'], ['user']] },
+    update_users: { invalidateKeys: [['users'], ['user']] },
     // ── Jobs ──
     create_job: {
-        entityKey: "jobs",
-        action: "create",
+        entityKey: 'jobs',
+        action: 'create',
         fetchPath: (id) => `/job/${id}`,
         construct: (d) => new Job(d),
     },
     update_job: {
-        entityKey: "jobs",
-        action: "update",
+        entityKey: 'jobs',
+        action: 'update',
         fetchPath: (id) => `/job/${id}`,
         construct: (d) => new Job(d),
     },
-    delete_job: { entityKey: "jobs", action: "delete", fetchPath: null },
-    update_jobs: { invalidateKeys: [["jobs"], ["infinite", "jobs"]] },
-    delete_jobs: { invalidateKeys: [["jobs"], ["infinite", "jobs"]] },
+    delete_job: { entityKey: 'jobs', action: 'delete', fetchPath: null },
+    update_jobs: { invalidateKeys: [['jobs'], ['infinite', 'jobs']] },
+    delete_jobs: { invalidateKeys: [['jobs'], ['infinite', 'jobs']] },
     // ── Routes ──
     create_route: {
-        entityKey: "routes",
-        action: "create",
+        entityKey: 'routes',
+        action: 'create',
         fetchPath: (id) => `/route/${id}`,
         construct: (d) => new Route(d),
     },
     update_route: {
-        entityKey: "routes",
-        action: "update",
+        entityKey: 'routes',
+        action: 'update',
         fetchPath: (id) => `/route/${id}`,
         construct: (d) => new Route(d),
     },
-    delete_route: { entityKey: "routes", action: "delete", fetchPath: null },
+    delete_route: { entityKey: 'routes', action: 'delete', fetchPath: null },
     // ── Events (also refetch parent job — overdueness, last_event, etc.) ──
     create_event: {
-        entityKey: "events",
-        action: "create",
+        entityKey: 'events',
+        action: 'create',
         fetchPath: (id) => `/event/${id}`,
         construct: (d) => new _Event(d),
         relatedRefetch: [
             {
-                entityKey: "jobs",
-                idField: "job_id",
+                entityKey: 'jobs',
+                idField: 'job_id',
                 fetchPath: (id) => `/job/${id}`,
                 construct: (d) => new Job(d),
             },
         ],
     },
     update_event: {
-        entityKey: "events",
-        action: "update",
+        entityKey: 'events',
+        action: 'update',
         fetchPath: (id) => `/event/${id}`,
         construct: (d) => new _Event(d),
         relatedRefetch: [
             {
-                entityKey: "jobs",
-                idField: "job_id",
+                entityKey: 'jobs',
+                idField: 'job_id',
                 fetchPath: (id) => `/job/${id}`,
                 construct: (d) => new Job(d),
             },
         ],
     },
     delete_event: {
-        entityKey: "events",
-        action: "delete",
+        entityKey: 'events',
+        action: 'delete',
         fetchPath: null,
         relatedRefetch: [
             {
-                entityKey: "jobs",
-                idField: "job_id",
+                entityKey: 'jobs',
+                idField: 'job_id',
                 fetchPath: (id) => `/job/${id}`,
                 construct: (d) => new Job(d),
             },
         ],
     },
-    update_events: { invalidateKeys: [["events"]] },
+    update_events: { invalidateKeys: [['events']] },
     // ── Teams ──
-    create_team: { entityKey: "teams", action: "create", fetchPath: null },
-    update_team: { entityKey: "teams", action: "update", fetchPath: null },
-    delete_team: { entityKey: "teams", action: "delete", fetchPath: null },
-    update_teams: { invalidateKeys: [["teams"]] },
+    create_team: { entityKey: 'teams', action: 'create', fetchPath: null },
+    update_team: { entityKey: 'teams', action: 'update', fetchPath: null },
+    delete_team: { entityKey: 'teams', action: 'delete', fetchPath: null },
+    update_teams: { invalidateKeys: [['teams']] },
     // ── Bills ──
     create_bill: {
-        entityKey: "bills",
-        action: "create",
+        entityKey: 'bills',
+        action: 'create',
         fetchPath: (id) => `/bill/${id}`,
     },
-    delete_bill: { entityKey: "bills", action: "delete", fetchPath: null },
-    update_bills: { invalidateKeys: [["bills"]] },
+    delete_bill: { entityKey: 'bills', action: 'delete', fetchPath: null },
+    update_bills: { invalidateKeys: [['bills']] },
     // ── Sessions ──
-    create_session: { entityKey: "sessions", action: "create", fetchPath: null },
-    update_session: { entityKey: "sessions", action: "update", fetchPath: null },
+    create_session: { entityKey: 'sessions', action: 'create', fetchPath: null },
+    update_session: { entityKey: 'sessions', action: 'update', fetchPath: null },
     // ── Catalog Items ──
     create_catalog_item: {
-        entityKey: "catalog_items",
-        action: "create",
+        entityKey: 'catalog_items',
+        action: 'create',
         fetchPath: (id) => `/catalog_item/${id}`,
     },
     update_catalog_item: {
-        entityKey: "catalog_items",
-        action: "update",
+        entityKey: 'catalog_items',
+        action: 'update',
         fetchPath: (id) => `/catalog_item/${id}`,
     },
     delete_catalog_item: {
-        entityKey: "catalog_items",
-        action: "delete",
+        entityKey: 'catalog_items',
+        action: 'delete',
         fetchPath: null,
     },
     // ── Groups ──
-    create_group: { entityKey: "groups", action: "create", fetchPath: null },
-    update_group: { entityKey: "groups", action: "update", fetchPath: null },
-    delete_group: { entityKey: "groups", action: "delete", fetchPath: null },
+    create_group: { entityKey: 'groups', action: 'create', fetchPath: null },
+    update_group: { entityKey: 'groups', action: 'update', fetchPath: null },
+    delete_group: { entityKey: 'groups', action: 'delete', fetchPath: null },
     // ── Labels ──
-    create_label: { entityKey: "labels", action: "create", fetchPath: null },
-    update_label: { entityKey: "labels", action: "update", fetchPath: null },
-    delete_label: { entityKey: "labels", action: "delete", fetchPath: null },
+    create_label: { entityKey: 'labels', action: 'create', fetchPath: null },
+    update_label: { entityKey: 'labels', action: 'update', fetchPath: null },
+    delete_label: { entityKey: 'labels', action: 'delete', fetchPath: null },
     // ── Skills ──
-    create_skill: { entityKey: "skills", action: "create", fetchPath: null },
-    update_skill: { entityKey: "skills", action: "update", fetchPath: null },
-    delete_skill: { entityKey: "skills", action: "delete", fetchPath: null },
+    create_skill: { entityKey: 'skills', action: 'create', fetchPath: null },
+    update_skill: { entityKey: 'skills', action: 'update', fetchPath: null },
+    delete_skill: { entityKey: 'skills', action: 'delete', fetchPath: null },
     // ── Proposals ──
     create_proposal: {
-        entityKey: "proposals",
-        action: "create",
+        entityKey: 'proposals',
+        action: 'create',
         fetchPath: (id) => `/proposal/${id}`,
     },
     update_proposal: {
-        entityKey: "proposals",
-        action: "update",
+        entityKey: 'proposals',
+        action: 'update',
         fetchPath: (id) => `/proposal/${id}`,
     },
     delete_proposal: {
-        entityKey: "proposals",
-        action: "delete",
+        entityKey: 'proposals',
+        action: 'delete',
         fetchPath: null,
     },
     // ── Service Months ──
-    create_month: { entityKey: "months", action: "create", fetchPath: null },
-    update_months: { invalidateKeys: [["months"]] },
-    delete_months: { invalidateKeys: [["months"]] },
+    create_month: { entityKey: 'months', action: 'create', fetchPath: null },
+    update_months: { invalidateKeys: [['months']] },
+    delete_months: { invalidateKeys: [['months']] },
     // ── Tasks (nested under jobs — target the parent job) ──
     create_task: {
-        entityKey: "jobs",
-        action: "update",
+        entityKey: 'jobs',
+        action: 'update',
         fetchPath: (id) => `/job/${id}`,
-        idField: "job_id",
+        idField: 'job_id',
         construct: (d) => new Job(d),
     },
     update_task: {
-        entityKey: "jobs",
-        action: "update",
+        entityKey: 'jobs',
+        action: 'update',
         fetchPath: (id) => `/job/${id}`,
-        idField: "job_id",
+        idField: 'job_id',
         construct: (d) => new Job(d),
     },
     delete_task: {
-        entityKey: "jobs",
-        action: "update",
+        entityKey: 'jobs',
+        action: 'update',
         fetchPath: (id) => `/job/${id}`,
-        idField: "job_id",
+        idField: 'job_id',
         construct: (d) => new Job(d),
     },
     // ── Scheduling ──
     schedule_complete: {
-        invalidateKeys: [["routes"], ["jobs"], ["infinite", "jobs"]],
+        invalidateKeys: [['routes'], ['jobs'], ['infinite', 'jobs']],
     },
     // ── Location ──
-    location_update: { invalidateKeys: [["teams"]] },
+    location_update: { invalidateKeys: [['teams']] },
     // ── Prepayments ──
-    update_prepayments: { invalidateKeys: [["prepayments"]] },
+    update_prepayments: { invalidateKeys: [['prepayments']] },
     // ── Chats ──
-    new_message: { invalidateKeys: [["chats"], ["messages"]] },
+    new_message: { invalidateKeys: [['chats'], ['messages']] },
 };
 /**
  * Returns true when `query.queryKey` belongs to the given entity,
@@ -208,7 +208,7 @@ const SOCKET_EVENT_CONFIG = {
  */
 function matchesEntityKey(query, entityKey) {
     const k = query.queryKey;
-    return k[0] === entityKey || (k[0] === "infinite" && k[1] === entityKey);
+    return k[0] === entityKey || (k[0] === 'infinite' && k[1] === entityKey);
 }
 export class AvroQueryClient {
     constructor(config) {
@@ -224,12 +224,12 @@ export class AvroQueryClient {
             baseUrl: config.baseUrl,
             authManager: config.authManager,
             maxRetries: config.maxRetries ?? 3,
-            retryStrategy: config.retryStrategy ?? "fixed",
+            retryStrategy: config.retryStrategy ?? 'fixed',
             timeout: config.timeout ?? 0,
         };
         this.socket = io(config.baseUrl, {
             autoConnect: false,
-            transports: ["websocket"],
+            transports: ['websocket'],
         });
         config.authManager.isAuthenticated().then((isAuth) => {
             this.setAuthState(isAuth);
@@ -237,18 +237,14 @@ export class AvroQueryClient {
                 // Resolve both companyId and access token before connecting so
                 // the 'connect' handler in setupSocketInvalidation can immediately
                 // join the company room.
-                Promise.all([
-                    this.getCompanyId(),
-                    this.config.authManager.accessToken(),
-                ])
+                Promise.all([this.getCompanyId(), this.config.authManager.accessToken()])
                     .then(([id, token]) => {
                     this.companyId = id;
-                    console.log("Initializing socket connection with token:", token);
                     this.socket.auth = { token: token };
                     this.socket.connect();
                 })
                     .catch((err) => {
-                    console.error("Not logged in:", err);
+                    console.error('Not logged in:', err);
                 });
             }
             else {
@@ -258,20 +254,19 @@ export class AvroQueryClient {
                 });
             }
         });
-        this.socket.on("connect", () => {
+        this.socket.on('connect', () => {
             this.setAuthState(AuthState.AUTHENTICATED);
             console.log(`Socket connected with ID: ${this.socket?.id}`);
         });
-        this.socket.on("disconnect", (reason) => {
+        this.socket.on('disconnect', (reason) => {
             console.log(`Socket disconnected: ${reason}`);
         });
-        this.socket.on("connect_error", (err) => {
+        this.socket.on('connect_error', (err) => {
             console.error(`Socket connection error: ${err.message}`);
         });
         this.config.authManager.onTokenRefreshed((newAccessToken) => {
             if (this.socket && newAccessToken) {
                 this.setAuthState(AuthState.AUTHENTICATED);
-                console.log("Access token refreshed, updating socket auth...");
                 this.socket.auth = { token: newAccessToken };
                 this.socket.disconnect().connect();
             }
@@ -286,7 +281,7 @@ export class AvroQueryClient {
     }
     emit(eventName, data) {
         if (!this.socket?.connected) {
-            console.error("Socket is not connected. Cannot emit event.");
+            console.error('Socket is not connected. Cannot emit event.');
             return;
         }
         this.socket.emit(eventName, data);
@@ -328,7 +323,6 @@ export class AvroQueryClient {
             if (isBulkEvent(config)) {
                 // ── Bulk: invalidate all specified keys ──────────────
                 const handler = () => {
-                    console.log(`[socket-debug] bulk event: ${event}`, config.invalidateKeys);
                     for (const key of config.invalidateKeys) {
                         queryClient.invalidateQueries({ queryKey: key });
                     }
@@ -338,13 +332,10 @@ export class AvroQueryClient {
             }
             else {
                 // ── Targeted: surgical cache update ──────────────────
-                const { entityKey, action, fetchPath, idField, alsoInvalidate, relatedRefetch, } = config;
+                const { entityKey, action, fetchPath, idField, alsoInvalidate, relatedRefetch } = config;
                 const handler = async (data) => {
-                    console.log(`[socket-debug] targeted event: ${event}`, data);
-                    const id = data?.[idField ?? "id"];
-                    // No id → old backend or malformed payload → full invalidation
-                    if (!id || typeof id !== "string") {
-                        console.log(`[socket-debug] no id found, falling back to full invalidation for ${entityKey}`);
+                    const id = data?.[idField ?? 'id'];
+                    if (!id || typeof id !== 'string') {
                         invalidateEntity(entityKey);
                         alsoInvalidate?.forEach((k) => queryClient.invalidateQueries({ queryKey: k }));
                         return;
@@ -364,10 +355,10 @@ export class AvroQueryClient {
                     if (relatedRefetch) {
                         for (const related of relatedRefetch) {
                             const relatedId = data?.[related.idField] ?? fetchedItem?.[related.idField];
-                            if (!relatedId || typeof relatedId !== "string")
+                            if (!relatedId || typeof relatedId !== 'string')
                                 continue;
                             await client._syncEntity(queryClient, {
-                                action: "update",
+                                action: 'update',
                                 entityKey: related.entityKey,
                                 id: relatedId,
                                 fetchPath: related.fetchPath(relatedId),
@@ -382,29 +373,26 @@ export class AvroQueryClient {
         }
         // Auto join/leave company room
         const joinCompanyRoom = () => {
-            console.log(`[socket-debug] joinCompanyRoom called, companyId=${this.companyId}, connected=${this.socket.connected}`);
             if (this.companyId) {
-                this.socket.emit("join_company", { company_id: this.companyId });
-                console.log(`[socket-debug] emitted join_company for ${this.companyId}`);
+                this.socket.emit('join_company', { company_id: this.companyId });
             }
             else {
                 console.warn(`[socket-debug] joinCompanyRoom skipped — companyId is undefined`);
             }
         };
-        this.socket.on("connect", joinCompanyRoom);
-        handlers.push({ event: "connect", handler: joinCompanyRoom });
+        this.socket.on('connect', joinCompanyRoom);
+        handlers.push({ event: 'connect', handler: joinCompanyRoom });
         // If already connected, join immediately
         if (this.socket.connected && this.companyId) {
             joinCompanyRoom();
         }
-        console.log(`[socket-debug] setupSocketInvalidation complete, socket.connected=${this.socket.connected}, companyId=${this.companyId}`);
         this._socketInvalidationCleanup = () => {
             for (const { event, handler } of handlers) {
                 this.socket.off(event, handler);
             }
             // Leave company room on teardown
             if (this.socket.connected && this.companyId) {
-                this.socket.emit("leave_company", { company_id: this.companyId });
+                this.socket.emit('leave_company', { company_id: this.companyId });
             }
             this._queryClient = null;
         };
@@ -417,16 +405,16 @@ export class AvroQueryClient {
         this._socketInvalidationCleanup = null;
     }
     get({ path, cancelToken, headers, progressUpdateCallback, }) {
-        return this._xhr("GET", path, null, cancelToken, headers, true, this.config.maxRetries, progressUpdateCallback);
+        return this._xhr('GET', path, null, cancelToken, headers, true, this.config.maxRetries, progressUpdateCallback);
     }
     post({ path, data, cancelToken, headers, progressUpdateCallback, }) {
-        return this._xhr("POST", path, data, cancelToken, headers, false, this.config.maxRetries, progressUpdateCallback);
+        return this._xhr('POST', path, data, cancelToken, headers, false, this.config.maxRetries, progressUpdateCallback);
     }
     put({ path, data, cancelToken, headers, progressUpdateCallback, }) {
-        return this._xhr("PUT", path, data, cancelToken, headers, true, this.config.maxRetries, progressUpdateCallback);
+        return this._xhr('PUT', path, data, cancelToken, headers, true, this.config.maxRetries, progressUpdateCallback);
     }
     delete({ path, cancelToken, headers, progressUpdateCallback, }) {
-        return this._xhr("DELETE", path, null, cancelToken, headers, false, this.config.maxRetries, progressUpdateCallback);
+        return this._xhr('DELETE', path, null, cancelToken, headers, false, this.config.maxRetries, progressUpdateCallback);
     }
     loginSuccess(tokens) {
         this.setAuthState(AuthState.AUTHENTICATED);
@@ -441,16 +429,16 @@ export class AvroQueryClient {
         return useMutation({
             mutationFn: async ({ username, password, code, cancelToken, }) => {
                 const resp = await this.post({
-                    path: "/login",
+                    path: '/login',
                     data: JSON.stringify({ username, password, code }),
                     cancelToken,
-                    headers: { "Content-Type": "application/json" },
+                    headers: { 'Content-Type': 'application/json' },
                 });
-                if (!resp || !("access_token" in resp)) {
-                    if (resp.msg === "TOTP required") {
+                if (!resp || !('access_token' in resp)) {
+                    if (resp.msg === 'TOTP required') {
                         return LoginResponse.NEEDS_TOTP;
                     }
-                    throw new StandardError(401, "Invalid login response");
+                    throw new StandardError(401, 'Invalid login response');
                 }
                 await this.loginSuccess({
                     access_token: resp.access_token,
@@ -463,7 +451,7 @@ export class AvroQueryClient {
             },
             onError: (err) => {
                 this.config.authManager.clearCache();
-                throw new StandardError(401, err.message || "Login failed");
+                throw new StandardError(401, err.message || 'Login failed');
             },
         });
     }
@@ -472,10 +460,10 @@ export class AvroQueryClient {
         return useMutation({
             mutationFn: async ({ username, email, cancelToken, }) => {
                 const resp = await this.post({
-                    path: "/code",
+                    path: '/code',
                     data: JSON.stringify({ username, email }),
                     cancelToken,
-                    headers: { "Content-Type": "application/json" },
+                    headers: { 'Content-Type': 'application/json' },
                 });
                 return resp;
             },
@@ -483,7 +471,7 @@ export class AvroQueryClient {
                 queryClient.invalidateQueries();
             },
             onError: (err) => {
-                throw new StandardError(err.status, err.message || "Request code failed");
+                throw new StandardError(err.status, err.message || 'Request code failed');
             },
         });
     }
@@ -495,14 +483,14 @@ export class AvroQueryClient {
                     path: `/user/${username ?? email}/password`,
                     data: JSON.stringify({ code, password: newPassword }),
                     cancelToken,
-                    headers: { "Content-Type": "application/json" },
+                    headers: { 'Content-Type': 'application/json' },
                 });
             },
             onSettled: () => {
                 queryClient.invalidateQueries();
             },
             onError: (err) => {
-                throw new StandardError(err.status, err.message || "Update password failed");
+                throw new StandardError(err.status, err.message || 'Update password failed');
             },
         });
     }
@@ -510,12 +498,12 @@ export class AvroQueryClient {
         const queryClient = this.getQueryClient();
         return useMutation({
             mutationFn: async ({ token, cancelToken, }) => {
-                const resp = await this._xhr("POST", `/google/authorize?token=${token}`, {}, cancelToken, { "Content-Type": "application/json" });
-                if (!resp || !("access_token" in resp)) {
-                    if (resp.msg === "TOTP required") {
+                const resp = await this._xhr('POST', `/google/authorize?token=${token}`, {}, cancelToken, { 'Content-Type': 'application/json' });
+                if (!resp || !('access_token' in resp)) {
+                    if (resp.msg === 'TOTP required') {
                         return LoginResponse.NEEDS_TOTP;
                     }
-                    throw new StandardError(401, "Invalid Google login response");
+                    throw new StandardError(401, 'Invalid Google login response');
                 }
                 this.setAuthState(AuthState.AUTHENTICATED);
                 this.socket.auth = { token: resp.access_token };
@@ -533,7 +521,7 @@ export class AvroQueryClient {
             },
             onError: (err) => {
                 this.config.authManager.clearCache();
-                throw new StandardError(err.status, err.message || "Google Login failed");
+                throw new StandardError(err.status, err.message || 'Google Login failed');
             },
         });
     }
@@ -541,12 +529,12 @@ export class AvroQueryClient {
         const queryClient = this.getQueryClient();
         return useMutation({
             mutationFn: async ({ token, cancelToken, }) => {
-                const resp = await this._xhr("POST", `/apple/authorize?token=${encodeURIComponent(token)}`, {}, cancelToken, { "Content-Type": "application/json" });
-                if (!resp || !("access_token" in resp)) {
-                    if (resp.msg === "TOTP required") {
+                const resp = await this._xhr('POST', `/apple/authorize?token=${encodeURIComponent(token)}`, {}, cancelToken, { 'Content-Type': 'application/json' });
+                if (!resp || !('access_token' in resp)) {
+                    if (resp.msg === 'TOTP required') {
                         return LoginResponse.NEEDS_TOTP;
                     }
-                    throw new StandardError(401, "Invalid Apple login response");
+                    throw new StandardError(401, 'Invalid Apple login response');
                 }
                 this.setAuthState(AuthState.AUTHENTICATED);
                 this.socket.auth = { token: resp.access_token };
@@ -564,7 +552,7 @@ export class AvroQueryClient {
             },
             onError: (err) => {
                 this.config.authManager.clearCache();
-                throw new StandardError(err.status, err.message || "Apple Login failed");
+                throw new StandardError(err.status, err.message || 'Apple Login failed');
             },
         });
     }
@@ -580,17 +568,12 @@ export class AvroQueryClient {
     setCompanyId(companyId) {
         const previousId = this.companyId;
         this.companyId = companyId;
-        console.log(`[socket-debug] setCompanyId called: ${companyId}, socket.connected=${this.socket.connected}, prev=${previousId}`);
         // If the socket is already connected, leave the old room and join the new one.
         if (this.socket.connected) {
             if (previousId && previousId !== companyId) {
-                this.socket.emit("leave_company", { company_id: previousId });
+                this.socket.emit('leave_company', { company_id: previousId });
             }
-            this.socket.emit("join_company", { company_id: companyId });
-            console.log(`[socket-debug] setCompanyId emitted join_company for ${companyId}`);
-        }
-        else {
-            console.warn(`[socket-debug] setCompanyId: socket not connected, will join on next connect`);
+            this.socket.emit('join_company', { company_id: companyId });
         }
         return this.config.authManager.setCompanyId(companyId);
     }
@@ -645,13 +628,12 @@ export class AvroQueryClient {
      */
     async _syncEntity(queryClient, params) {
         const { action, entityKey, id, fetchPath, construct } = params;
-        console.log(`[socket-debug] _syncEntity: action=${action}, entity=${entityKey}, id=${id}, fetchPath=${fetchPath}`);
         const predicate = (q) => matchesEntityKey(q, entityKey);
         const invalidate = () => queryClient.invalidateQueries({ predicate });
         // ─── DELETE ─────────────────────────────────────────
-        if (action === "delete") {
+        if (action === 'delete') {
             queryClient.removeQueries({ queryKey: [entityKey, id], exact: true });
-            queryClient.setQueriesData({ predicate, type: "active" }, (old) => {
+            queryClient.setQueriesData({ predicate }, (old) => {
                 if (!old)
                     return old;
                 if (old.pages && Array.isArray(old.pages)) {
@@ -679,10 +661,9 @@ export class AvroQueryClient {
                 staleTime: 0,
             });
             const item = construct ? construct(raw) : raw;
-            console.log(`[socket-debug] _syncEntity fetched ${entityKey}/${id}:`, item);
             queryClient.setQueryData([entityKey, id], item);
-            if (action === "create") {
-                queryClient.setQueriesData({ predicate, type: "active" }, (old) => {
+            if (action === 'create') {
+                queryClient.setQueriesData({ predicate }, (old) => {
                     if (!old)
                         return old;
                     if (old.pages && Array.isArray(old.pages)) {
@@ -703,7 +684,7 @@ export class AvroQueryClient {
             }
             else {
                 // UPDATE — replace in every active list / infinite-query cache
-                queryClient.setQueriesData({ predicate, type: "active" }, (old) => {
+                queryClient.setQueriesData({ predicate }, (old) => {
                     if (!old)
                         return old;
                     if (old.pages && Array.isArray(old.pages)) {
@@ -718,7 +699,6 @@ export class AvroQueryClient {
                     return old;
                 });
             }
-            console.log(`[socket-debug] _syncEntity completed ${action} for ${entityKey}/${id}`);
             return item;
         }
         catch (err) {
@@ -732,7 +712,7 @@ export class AvroQueryClient {
         return useMutation({
             mutationFn: async (cancelToken) => {
                 await this.post({
-                    path: "/logout",
+                    path: '/logout',
                     cancelToken,
                 });
                 await this.config.authManager.clearCache();
@@ -747,276 +727,276 @@ export class AvroQueryClient {
             },
             onError: (err) => {
                 this.clearCache();
-                console.error("Logout failed:", err);
-                throw new StandardError(500, "Logout failed");
+                console.error('Logout failed:', err);
+                throw new StandardError(500, 'Logout failed');
             },
         });
     }
     fetchJobs(body = {}, companyId, cancelToken, headers = {}) {
         const companyIdToUse = companyId ?? this.companyId;
-        if (!companyIdToUse || companyIdToUse.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!companyIdToUse || companyIdToUse.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${companyIdToUse}/jobs`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${companyIdToUse}/jobs`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid jobs response");
+                throw new StandardError(400, 'Invalid jobs response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch jobs:", err);
+            console.error('Failed to fetch jobs:', err);
             throw new StandardError(500, `Failed to fetch jobs: ${err.message ?? err}`);
         });
     }
     fetchChats(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/chats`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/chats`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid chats response");
+                throw new StandardError(400, 'Invalid chats response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch chats:", err);
-            throw new StandardError(500, "Failed to fetch chats");
+            console.error('Failed to fetch chats:', err);
+            throw new StandardError(500, 'Failed to fetch chats');
         });
     }
     fetchMessages(chatId, body = {}, cancelToken, headers = {}) {
-        if (!chatId || chatId.trim() === "") {
-            throw new StandardError(400, "Chat ID is required");
+        if (!chatId || chatId.trim() === '') {
+            throw new StandardError(400, 'Chat ID is required');
         }
-        return this._fetch("POST", `/chat/${chatId}/messages`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/chat/${chatId}/messages`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid messages response");
+                throw new StandardError(400, 'Invalid messages response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch messages:", err);
-            throw new StandardError(500, "Failed to fetch messages");
+            console.error('Failed to fetch messages:', err);
+            throw new StandardError(500, 'Failed to fetch messages');
         });
     }
     async fetchPrepayments(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/prepayments`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/prepayments`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid prepayments response");
+                throw new StandardError(400, 'Invalid prepayments response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch prepayments:", err);
-            throw new StandardError(500, "Failed to fetch prepayments");
+            console.error('Failed to fetch prepayments:', err);
+            throw new StandardError(500, 'Failed to fetch prepayments');
         });
     }
     async fetchWaivers(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/waivers`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/waivers`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid waivers response");
+                throw new StandardError(400, 'Invalid waivers response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch waivers:", err);
-            throw new StandardError(500, "Failed to fetch waivers");
+            console.error('Failed to fetch waivers:', err);
+            throw new StandardError(500, 'Failed to fetch waivers');
         });
     }
     async fetchEvents(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/events`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/events`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid events response");
+                throw new StandardError(400, 'Invalid events response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch events:", err);
-            throw new StandardError(500, "Failed to fetch events");
+            console.error('Failed to fetch events:', err);
+            throw new StandardError(500, 'Failed to fetch events');
         });
     }
     fetchMonths(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/months`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/months`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid months response");
+                throw new StandardError(400, 'Invalid months response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch months:", err);
-            throw new StandardError(500, "Failed to fetch months");
+            console.error('Failed to fetch months:', err);
+            throw new StandardError(500, 'Failed to fetch months');
         });
     }
     fetchBills(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/bills`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/bills`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid bills response");
+                throw new StandardError(400, 'Invalid bills response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch bills:", err);
-            throw new StandardError(500, "Failed to fetch bills");
+            console.error('Failed to fetch bills:', err);
+            throw new StandardError(500, 'Failed to fetch bills');
         });
     }
     fetchRoutes(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/routes`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/routes`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid routes response");
+                throw new StandardError(400, 'Invalid routes response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch routes:", err);
-            throw new StandardError(500, "Failed to fetch routes");
+            console.error('Failed to fetch routes:', err);
+            throw new StandardError(500, 'Failed to fetch routes');
         });
     }
     fetchTeams(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/teams`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/teams`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid teams response");
+                throw new StandardError(400, 'Invalid teams response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch teams:", err);
-            throw new StandardError(500, "Failed to fetch teams");
+            console.error('Failed to fetch teams:', err);
+            throw new StandardError(500, 'Failed to fetch teams');
         });
     }
     fetchLabels(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/labels`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/labels`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid labels response");
+                throw new StandardError(400, 'Invalid labels response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch labels:", err);
-            throw new StandardError(500, "Failed to fetch labels");
+            console.error('Failed to fetch labels:', err);
+            throw new StandardError(500, 'Failed to fetch labels');
         });
     }
     fetchGroups(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/groups`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/groups`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid groups response");
+                throw new StandardError(400, 'Invalid groups response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch groups:", err);
-            throw new StandardError(500, "Failed to fetch groups");
+            console.error('Failed to fetch groups:', err);
+            throw new StandardError(500, 'Failed to fetch groups');
         });
     }
     fetchSkills(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/skills`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/skills`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid skills response");
+                throw new StandardError(400, 'Invalid skills response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch skills:", err);
-            throw new StandardError(500, "Failed to fetch skills");
+            console.error('Failed to fetch skills:', err);
+            throw new StandardError(500, 'Failed to fetch skills');
         });
     }
     fetchSessions(body = {}, cancelToken, headers = {}) {
-        if (!this.companyId || this.companyId.trim() === "") {
-            throw new StandardError(400, "Company ID is required");
+        if (!this.companyId || this.companyId.trim() === '') {
+            throw new StandardError(400, 'Company ID is required');
         }
-        return this._fetch("POST", `/company/${this.companyId}/sessions`, JSON.stringify(body), cancelToken, {
+        return this._fetch('POST', `/company/${this.companyId}/sessions`, JSON.stringify(body), cancelToken, {
             ...headers,
-            "Content-Type": "application/json",
+            'Content-Type': 'application/json',
         })
             .then((response) => {
             if (!response || !Array.isArray(response)) {
-                throw new StandardError(400, "Invalid sessions response");
+                throw new StandardError(400, 'Invalid sessions response');
             }
             return response;
         })
             .catch((err) => {
-            console.error("Failed to fetch sessions:", err);
-            throw new StandardError(500, "Failed to fetch sessions");
+            console.error('Failed to fetch sessions:', err);
+            throw new StandardError(500, 'Failed to fetch sessions');
         });
     }
     /* ── Email delivery tracking ──────────────────────────────────────── */
@@ -1029,7 +1009,7 @@ export class AvroQueryClient {
         if (this._emailListenersInit)
             return;
         this._emailListenersInit = true;
-        this.socket.on("email_succeeded", (data) => {
+        this.socket.on('email_succeeded', (data) => {
             const entry = this._emailTracking.get(data.request_id);
             if (!entry)
                 return;
@@ -1040,7 +1020,7 @@ export class AvroQueryClient {
             }, 5000);
             entry.onSuccess?.(data);
         });
-        this.socket.on("email_failed", (data) => {
+        this.socket.on('email_failed', (data) => {
             const entry = this._emailTracking.get(data.request_id);
             if (!entry)
                 return;
@@ -1093,7 +1073,7 @@ export class AvroQueryClient {
             return this.post({
                 path: `/bill/${billId}/email`,
                 data: JSON.stringify(body),
-                headers: { "Content-Type": "application/json" },
+                headers: { 'Content-Type': 'application/json' },
             });
         }
         catch (error) {