@dench.com/cli 2.8.5 → 2.8.7-staging.189

package/fs-daemon-pull-queue.ts

@@ -0,0 +1,35 @@
+/**
+ * Serialize pull-queue drains without dropping notifications that arrive
+ * while a drain is already in progress.
+ */
+export function createPullQueueDrain(args: {
+  processRequests: () => Promise<void>;
+  onError: (error: unknown) => void;
+}): () => Promise<void> {
+  let inFlight: Promise<void> | null = null;
+  let rerunRequested = false;
+
+  return function drain(): Promise<void> {
+    if (inFlight) {
+      rerunRequested = true;
+      return inFlight;
+    }
+
+    inFlight = (async () => {
+      try {
+        do {
+          rerunRequested = false;
+          try {
+            await args.processRequests();
+          } catch (error) {
+            args.onError(error);
+          }
+        } while (rerunRequested);
+      } finally {
+        inFlight = null;
+      }
+    })();
+
+    return inFlight;
+  };
+}

package/fs-daemon.ts

@@ -56,6 +56,7 @@ import {
   mkdir,
   readdir,
   readFile,
+  rename,
   stat,
   unlink,
   writeFile,
@@ -76,6 +77,7 @@ import {
   type MountInfo,
   readMountInfo,
 } from "./fs-daemon-mount";
+import { createPullQueueDrain } from "./fs-daemon-pull-queue";
 
 type FileTreeSyncRow = {
   path: string;
@@ -731,7 +733,34 @@ async function runDaemon(daemonArgs: Args): Promise<void> {
     status.recordBreakerEvent(breakerState);
     void status.flush();
   });
+
+  // Register the pull signal before publishing the daemon status. `fs pull`
+  // treats that status as readiness; publishing first left a startup window
+  // where SIGUSR2 was lost (or terminated the daemon) and the request timed
+  // out. A queued rerun also prevents signals received mid-drain from being
+  // coalesced away.
+  const drainPullRequests = createPullQueueDrain({
+    processRequests: () =>
+      processPullRequests({
+        client,
+        tracker,
+        workspace: daemonArgs.workspace,
+      }),
+    onError: (error) =>
+      console.error(
+        `[dench-fs-daemon] pull queue failed: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+      ),
+  });
+  process.on("SIGUSR2", () => {
+    console.log(`[dench-fs-daemon] SIGUSR2 received — processing pull queue`);
+    void drainPullRequests();
+  });
   await status.flush();
+  // Recover requests left behind if a previous daemon exited after the
+  // request file was written but before it could process the signal.
+  void drainPullRequests();
 
   let chokidar: typeof import("chokidar");
   try {
@@ -940,21 +969,6 @@ async function runDaemon(daemonArgs: Args): Promise<void> {
       .catch(() => undefined);
   });
 
-  process.on("SIGUSR2", () => {
-    console.log(`[dench-fs-daemon] SIGUSR2 received — processing pull queue`);
-    void processPullRequests({
-      client,
-      tracker,
-      workspace: daemonArgs.workspace,
-    }).catch((error) =>
-      console.error(
-        `[dench-fs-daemon] pull queue failed: ${
-          error instanceof Error ? error.message : String(error)
-        }`,
-      ),
-    );
-  });
-
   process.on("SIGTERM", () => {
     reconciler.stop();
     unsubscribe();
@@ -1505,11 +1519,15 @@ async function runPull(argv: string[]): Promise<void> {
   await mkdir(PULL_REQUEST_DIR, { recursive: true });
   const id = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
   const request: PullRequest = { id, paths, requestedAt: Date.now() };
-  await writeFile(
-    `${PULL_REQUEST_DIR}/request-${id}.json`,
-    JSON.stringify(request),
-    "utf-8",
-  );
+  const requestPath = `${PULL_REQUEST_DIR}/request-${id}.json`;
+  const temporaryRequestPath = `${requestPath}.${process.pid}.tmp`;
+  try {
+    await writeFile(temporaryRequestPath, JSON.stringify(request), "utf-8");
+    await rename(temporaryRequestPath, requestPath);
+  } catch (error) {
+    await unlink(temporaryRequestPath).catch(() => undefined);
+    throw error;
+  }
   process.kill(status.pid, "SIGUSR2");
   if (!wait) {
     const response = { ok: true, id, queued: paths };

package/lib/enrichment-gateway.ts

@@ -127,6 +127,14 @@ export type SearchJobsBody = {
   pageToken?: string;
 };
 
+/**
+ * FullEnrich hard cases run 40–120s end to end; a 90s budget produced
+ * spurious "No data returned" failures for jobs that later completed (and
+ * charged). 150s covers the observed tail while the 2s interval keeps
+ * fast results snappy.
+ */
+const DEFAULT_POLL_TIMEOUT_MS = 150000;
+
 export type EnrichmentGatewayOptions = {
   apiKey?: string;
   baseUrl?: string;
@@ -134,7 +142,7 @@ export type EnrichmentGatewayOptions = {
   fetchImpl?: FetchLike;
   /** Override the poll interval (ms) for testing. Default: 2000. */
   pollIntervalMs?: number;
-  /** Override the poll timeout (ms) for testing. Default: 30000. */
+  /** Override the poll timeout (ms) for testing. Default: 150000. */
   pollTimeoutMs?: number;
   /**
    * Optional abort signal — propagated to fetch and short-circuits the polling
@@ -448,9 +456,7 @@ async function pollForPersonResult(
   options: EnrichmentGatewayOptions,
 ): Promise<Record<string, unknown>> {
   const pollIntervalMs = options.pollIntervalMs ?? 2000;
-  // Default 90s: FullEnrich jobs for hard-to-find contacts can take 40–120s.
-  // 30s was too short and caused spurious "No data returned" FatalErrors.
-  const pollTimeoutMs = options.pollTimeoutMs ?? 90000;
+  const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
   const deadline = Date.now() + pollTimeoutMs;
 
   while (Date.now() < deadline) {
@@ -640,7 +646,7 @@ async function pollForBulkPersonResults(
   options: EnrichmentGatewayOptions,
 ): Promise<void> {
   const pollIntervalMs = options.pollIntervalMs ?? 2000;
-  const pollTimeoutMs = options.pollTimeoutMs ?? 90000;
+  const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
   const deadline = Date.now() + pollTimeoutMs;
 
   // Slots that this chunk is responsible for — anything still missing after
@@ -882,7 +888,7 @@ async function pollForReverseEmailResults(
   options: EnrichmentGatewayOptions,
 ): Promise<void> {
   const pollIntervalMs = options.pollIntervalMs ?? 2000;
-  const pollTimeoutMs = options.pollTimeoutMs ?? 90000;
+  const pollTimeoutMs = options.pollTimeoutMs ?? DEFAULT_POLL_TIMEOUT_MS;
   const deadline = Date.now() + pollTimeoutMs;
 
   const ownedIndexes = emails

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dench.com/cli",
-  "version": "2.8.5",
+  "version": "2.8.7-staging.189",
   "description": "Dench agent workspace CLI.",
   "type": "module",
   "bin": {
@@ -17,6 +17,7 @@
     "fs-daemon-binary.ts",
     "fs-daemon-flush.ts",
     "fs-daemon-mount.ts",
+    "fs-daemon-pull-queue.ts",
     "home-sync",
     "home-sync.ts",
     "home-sync-lib.ts",