Default client RPC waits to 60 seconds (#1789)

* fix(client): wait longer for session responses

* fix(client): default RPC waits to sixty seconds

* fix(app): preserve detached stream scroll on delayed history

Code drift: longer client RPC waits let delayed timeline responses arrive after a user scroll-away, so web stream anchoring must not reattach on transient scroll-top resets.

Restore the 15s connect deadline and leave app initialization slack above the default 60s session RPC wait.

* fix(client): keep helper waits within caller deadlines

Review fix: the 60s default session RPC wait leaked into wait previews and waitForAgentUpsert helper fetches. Bound those helper RPCs to the caller deadline or a short best-effort preview timeout, and allow small scroll ranges to reattach at bottom.

* fix(client): respect caller timeout budgets

* fix(cli): keep diagnostic probes responsive

* Refactor daemon client request options

* Preserve daemon client legacy overloads

packages/cli/src/commands/daemon/local-daemon.ts

@@ -667,7 +667,9 @@ async function requestLifecycleShutdown(
     };
   }
 
-  const client = await tryConnectToDaemon({ host, timeout: Math.min(timeoutMs, 5000) });
+  const deadline = Date.now() + timeoutMs;
+  const remainingTimeoutMs = () => Math.max(1, deadline - Date.now());
+  const client = await tryConnectToDaemon({ host, timeout: Math.min(remainingTimeoutMs(), 5000) });
   if (!client) {
     return {
       requested: false,
@@ -676,7 +678,7 @@ async function requestLifecycleShutdown(
   }
 
   try {
-    await client.shutdownServer();
+    await client.shutdownServer({ timeout: Math.min(remainingTimeoutMs(), 5000) });
     return { requested: true };
   } catch (error) {
     return {
@@ -696,8 +698,10 @@ export async function stopLocalDaemon(
   const timeoutMs = options.timeoutMs ?? DEFAULT_STOP_TIMEOUT_MS;
   const killTimeoutMs = options.killTimeoutMs ?? DEFAULT_KILL_TIMEOUT_MS;
   const state = resolveLocalDaemonState({ home: options.home });
+  const deadline = Date.now() + timeoutMs;
+  const remainingTimeoutMs = () => Math.max(1, deadline - Date.now());
 
-  const shutdownAttempt = await requestLifecycleShutdown(state, timeoutMs);
+  const shutdownAttempt = await requestLifecycleShutdown(state, remainingTimeoutMs());
   const lifecycleRequested = shutdownAttempt.requested;
 
   if (!state.pidInfo || (!state.running && !lifecycleRequested)) {
@@ -720,7 +724,7 @@ export async function stopLocalDaemon(
   const { stopped, forced } = await waitForStopAfterRequest({
     state,
     pid,
-    timeoutMs,
+    timeoutMs: remainingTimeoutMs(),
     killTimeoutMs,
     force: options.force,
   });

packages/cli/src/commands/daemon/pair.ts

@@ -10,6 +10,8 @@ interface PairOptions {
   json?: boolean;
 }
 
+const PAIRING_DAEMON_RPC_TIMEOUT_MS = 1500;
+
 export function pairCommand(): Command {
   return addJsonOption(new Command("pair").description("Print the daemon pairing QR code and link"))
     .option("--home <path>", "Paseo home directory (default: ~/.paseo)")
@@ -35,7 +37,9 @@ export async function runPairCommand(options: PairOptions): Promise<void> {
         client.getLastServerInfoMessage()?.features?.daemonStatusRpc === true;
       if (supportsDaemonStatusRpc) {
         try {
-          const offer = await client.getDaemonPairingOffer();
+          const offer = await client.getDaemonPairingOffer({
+            timeout: PAIRING_DAEMON_RPC_TIMEOUT_MS,
+          });
           await client.close().catch(() => {});
           outputPairingResult(
             { relayEnabled: offer.relayEnabled, url: offer.url, qr: offer.qr ?? null },

packages/cli/src/commands/daemon/status.ts

@@ -6,6 +6,8 @@ import type { CommandOptions, ListResult, OutputSchema } from "../../output/inde
 import { resolveLocalDaemonState, resolveTcpHostFromListen } from "./local-daemon.js";
 import { resolveNodePathFromPid } from "./runtime-toolchain.js";
 
+const DAEMON_STATUS_PROBE_TIMEOUT_MS = 1500;
+
 interface ProviderBinaryStatus {
   label: string;
   path: string | null;
@@ -276,7 +278,10 @@ async function probeDaemonOverWebsocket(args: {
   const supportsDaemonStatusRpc =
     client.getLastServerInfoMessage()?.features?.daemonStatusRpc === true;
   try {
-    const agentsPayload = await client.fetchAgents({ filter: { includeArchived: true } });
+    const agentsPayload = await client.fetchAgents({
+      filter: { includeArchived: true },
+      timeout: DAEMON_STATUS_PROBE_TIMEOUT_MS,
+    });
     const agents = agentsPayload.entries.map((entry) => entry.agent);
     const runningAgents = agents.filter((a) => a.status === "running").length;
     const idleAgents = agents.filter((a) => a.status === "idle").length;
@@ -284,7 +289,9 @@ async function probeDaemonOverWebsocket(args: {
     let daemonProviders: ProviderBinaryStatus[] | undefined;
     if (supportsDaemonStatusRpc) {
       try {
-        const statusPayload = await client.getDaemonStatus();
+        const statusPayload = await client.getDaemonStatus({
+          timeout: DAEMON_STATUS_PROBE_TIMEOUT_MS,
+        });
         const labelMap = new Map(PROVIDER_BINARIES.map((p) => [p.binary, p.label]));
         daemonProviders = statusPayload.providers.map((p) => ({
           label: labelMap.get(p.provider) ?? p.provider,