@indigoai-us/hq-cli 5.345.187 → 5.345.188

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [5.345.188] — 2026-10-30
+- `hq agent inbox` and the `hq_inbox_read` MCP tool now bound the server read (token mint plus GET) at 30 s
+  (`HQ_AGENT_INBOX_TIMEOUT_MS`, floor 1000) and retry it once after a short delay, honouring the server's
+  numeric `Retry-After` up to 5 s, when the token mint is held by another process, the request times out or
+  fails in transport, or the server answers 408, 425, 429, 500, 502 or 503. A 504 is left to the existing
+  single retry inside the API client, and a 401, 403, 404 or an invalid 200 body is not retried. The
+  deadline now reaches the hq-cloud mint, so a retry no longer queues behind a first mint that is still
+  waiting on another process's lock. The list command sets `HQ_MACHINE_CREDS_FILE`,
+  `HQ_REQUIRE_MACHINE_IDENTITY` and `HQ_VAULT_API_URL` before minting, as `hq agent inbox done` already did.
+  The JSON output gains `stale: true|false` next to `source`; whenever a retry happened, including one that
+  succeeded, it also carries `attempts: 2`, and a note that still reports a fallback ends with
+  "(after 2 attempts)", so automation can tell a hard failure from a single blip (DEV-4065).
+- Keep downloaded revisions current and retry locally deleted files until the cloud confirms their removal.
+
 ## [5.345.187] — 2026-10-30
 - The HQ Anywhere person gate now follows the desktop Settings key `hq-anywhere-opt-out`. Turning HQ Anywhere on in the app enables `hq mcp serve` without a separate `hq-anywhere` write. Older servers that only have `hq-anywhere` still work.
 

package/dist/commands/agent-inbox.js

@@ -8,6 +8,7 @@ import chalk from "chalk";
 import * as os from "node:os";
 import { ensureCognitoToken } from "../utils/cognito-session.js";
 import { vaultApiFetch } from "../utils/vault-api.js";
+import { annotateInboxAttempts, fetchServerInboxWithRetry, parseRetryAfterSeconds, resolveAgentInboxTimeoutMs } from "../lib/agent-kit/inbox-fetch.js";
 import { redactAgentInboxItem } from "../lib/agent-kit/inbox-redact.js";
 import { markInboxDone, mergeAgentInbox, readDoneIds, summarizeInboxEntry } from "../lib/agent-kit/inbox-state.js";
 import { agentKitPaths } from "../lib/agent-kit/paths.js";
@@ -23,25 +24,56 @@ export function registerAgentInboxCommand(agent) {
         const paths = agentKitPaths(os.homedir(), process.env);
         const creds = requireExternalCreds(paths);
         const done = readDoneIds(paths);
+        // Pin the enrolled machine identity and API, as `done` does below, so the
+        // mint cannot fall through to a person session or another API base.
+        process.env.HQ_MACHINE_CREDS_FILE = paths.machineCredsPath;
+        process.env.HQ_REQUIRE_MACHINE_IDENTITY = "1";
+        process.env.HQ_VAULT_API_URL = creds.apiBaseUrl;
         // Merged with the server, never the local mirror alone: a dead kit
         // poller would otherwise make this command answer confidently with
-        // yesterday's mail and no sign anything was wrong.
-        const { entries, note, source } = await mergeAgentInbox(paths, async () => {
-            const token = await ensureCognitoToken({ tokenSource: "machine", interactive: false });
-            const res = await vaultApiFetch({
-                token,
-                baseUrl: creds.apiBaseUrl,
-                path: `/v1/agents/${encodeURIComponent(creds.entityUid)}/inbox`,
+        // yesterday's mail and no sign anything was wrong. The server read is
+        // bounded and retried once (inbox-fetch.ts) so a shared-lock mint, a
+        // 503 with Retry-After or a hung socket does not become a fallback.
+        let attempts = 1;
+        const merged = await mergeAgentInbox(paths, async () => {
+            const outcome = await fetchServerInboxWithRetry({
+                timeoutMs: resolveAgentInboxTimeoutMs(process.env),
+                mint: (signal) => ensureCognitoToken({ tokenSource: "machine", interactive: false, signal }),
+                fetch: async (token, signal) => {
+                    const res = await vaultApiFetch({
+                        token,
+                        baseUrl: creds.apiBaseUrl,
+                        path: `/v1/agents/${encodeURIComponent(creds.entityUid)}/inbox`,
+                        signal,
+                    });
+                    const retryAfterSeconds = parseRetryAfterSeconds(res.headers?.get?.("retry-after"));
+                    // Preserve a decode failure as an invalid body for mergeAgentInbox to
+                    // classify. Parser errors can contain response bytes: do not echo them.
+                    return {
+                        status: res.status,
+                        body: await res.json().catch(() => undefined),
+                        ...(retryAfterSeconds !== undefined ? { retryAfterSeconds } : {}),
+                    };
+                },
             });
-            // Preserve a decode failure as an invalid body for mergeAgentInbox to
-            // classify. Parser errors can contain response bytes: do not echo them.
-            return { status: res.status, body: await res.json().catch(() => undefined) };
+            attempts = outcome.attempts;
+            if (!outcome.ok)
+                throw outcome.error;
+            return outcome.response;
         });
+        const { entries, note, source, stale, attempts: attemptsMade } = annotateInboxAttempts(merged, attempts);
         const rows = entries
             .filter((e) => opts.all || !done.has(e.id))
             .map((e) => summarizeInboxEntry(redactAgentInboxItem(e), done.has(e.id)));
         if (opts.json) {
-            console.log(JSON.stringify({ count: rows.length, source, messages: rows, ...(note ? { note } : {}) }, null, 2));
+            console.log(JSON.stringify({
+                count: rows.length,
+                source,
+                stale,
+                ...(attemptsMade !== undefined ? { attempts: attemptsMade } : {}),
+                messages: rows,
+                ...(note ? { note } : {}),
+            }, null, 2));
             return;
         }
         if (note)

package/dist/commands/agent-mcp.js

@@ -13,6 +13,7 @@ import * as os from "node:os";
 import { CLI_VERSION } from "../cli-version.js";
 import { ensureCognitoToken } from "../utils/cognito-session.js";
 import { getCompanyUid, vaultApiFetch } from "../utils/vault-api.js";
+import { parseRetryAfterSeconds } from "../lib/agent-kit/inbox-fetch.js";
 import { McpServer } from "../lib/agent-kit/mcp/jsonrpc.js";
 import { createVaultObjectDownloader } from "../lib/agent-kit/attachment-download.js";
 import { buildAgentMcpTools } from "../lib/agent-kit/mcp/tools.js";
@@ -59,7 +60,7 @@ export function defaultMcpClients(creds, credsPath, paths = agentKitPaths(os.hom
         HQ_VAULT_API_URL: creds.apiBaseUrl,
         NO_COLOR: "1",
     };
-    const getToken = () => ensureCognitoToken({ tokenSource: "machine", interactive: false });
+    const getToken = (signal) => ensureCognitoToken({ tokenSource: "machine", interactive: false, signal });
     let companyUid;
     return {
         creds,
@@ -89,9 +90,11 @@ export function defaultMcpClients(creds, credsPath, paths = agentKitPaths(os.hom
                 method: init?.method,
                 body: init?.body,
                 query: init?.query,
+                signal: init?.signal,
             });
             const body = await res.json().catch(() => ({}));
-            return { status: res.status, body };
+            const retryAfterSeconds = parseRetryAfterSeconds(res.headers.get("retry-after"));
+            return { status: res.status, body, ...(retryAfterSeconds !== undefined ? { retryAfterSeconds } : {}) };
         },
     };
 }