From 987effc5ec3c326eea2d1cc365b53ba486f363a2 Mon Sep 17 00:00:00 2001
From: jelveh <nj@puter.com>
Date: Sat, 3 Jan 2026 19:34:30 -0800
Subject: [PATCH] Revert "Remove debug logs and improve query coalescing
 timeout (#2241)"

This reverts commit 71bee556f6ff47fb800a9119ab8baceca1c3a519.
---
 extensions/puterfs/PuterFSProvider.js         |  2 ++
 src/backend/src/helpers.js                    | 23 +++++--------------
 .../src/modules/web/WebServerService.js       |  1 +
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/extensions/puterfs/PuterFSProvider.js b/extensions/puterfs/PuterFSProvider.js
index c16d8da08..2e2526b13 100644
--- a/extensions/puterfs/PuterFSProvider.js
+++ b/extensions/puterfs/PuterFSProvider.js
@@ -345,6 +345,7 @@ export default class PuterFSProvider {
             } : {}),
         };
 
+        console.log('raw fsentry', raw_fsentry);
         const entryOp = await this.fsEntryController.insert(raw_fsentry);
 
         await entryOp.awaitDone();
@@ -667,6 +668,7 @@ export default class PuterFSProvider {
      * @returns {Promise<FSNode>}
      */
     async write_new ({ context, parent, name, file }) {
+        console.log('calling write new');
         const {
             tmp, fsentry_tmp, message, actor: inputActor, app_id,
         } = context.values;
diff --git a/src/backend/src/helpers.js b/src/backend/src/helpers.js
index 28cd1bc80..36ef53644 100644
--- a/src/backend/src/helpers.js
+++ b/src/backend/src/helpers.js
@@ -36,14 +36,7 @@ const tmp_provide_services = async ss => {
 };
 
 // TTL for pending get_app queries (request coalescing)
-const PENDING_QUERY_TTL = 3; // seconds
-const QUERY_TIMEOUT = 2000; // max ms to wait for a coalesced query
-
-// Wait for a promise, but give up after timeout
-const withTimeout = (promise, ms) => Promise.race([
-    promise,
-    new Promise((_, reject) => setTimeout(() => reject(new Error('Query timeout')), ms))
-]);
+const PENDING_QUERY_TTL = 2; // seconds
 
 async function is_empty (dir_uuid) {
     /** @type BaseDatabaseAccessService */
@@ -359,15 +352,11 @@ async function get_app (options) {
     const pendingKey = `pending_app:${queryKey}`;
     const pending = kv.get(pendingKey);
     if ( pending ) {
-        // Wait for existing query, but don't block forever
-        try {
-            log.info(`coalescing query for ${queryKey}`);
-            const result = await withTimeout(pending, QUERY_TIMEOUT);
-            return result ? { ...result } : null;
-        } catch (err) {
-            // Timeout or error - fall through and execute query directly
-            log.warn(`coalesced query failed for ${queryKey}, executing direct query`);
-        }
+        // Reuse the existing pending query
+        log.info(`coalescing query for ${queryKey}`);
+        const result = await pending;
+        // shallow clone the result
+        return result ? { ...result } : null;
     }
 
     // Create a new pending query
diff --git a/src/backend/src/modules/web/WebServerService.js b/src/backend/src/modules/web/WebServerService.js
index a495c5740..502a096a1 100644
--- a/src/backend/src/modules/web/WebServerService.js
+++ b/src/backend/src/modules/web/WebServerService.js
@@ -110,6 +110,7 @@ class WebServerService extends BaseService {
         const services = this.services;
         await services.emit('start.webserver');
         await services.emit('ready.webserver');
+        console.log('in case you care, ready.webserver hooks are done');
     }
 
     /**