@codingame/monaco-vscode-chat-service-override 32.0.2 → 33.0.5

package/index.d.ts

@@ -1,5 +1,5 @@
 import { type IEditorOverrideServices } from "@codingame/monaco-vscode-api/vscode/vs/editor/standalone/browser/standaloneServices";
-import type { IDefaultAccount } from "./vscode/src/vs/base/common/defaultAccount.js";
+import type { IDefaultAccount } from "@codingame/monaco-vscode-api/vscode/vs/base/common/defaultAccount";
 export interface ChatServiceOverrideOptions {
     defaultAccount?: IDefaultAccount;
 }

package/index.js

@@ -52,7 +52,7 @@ import { ChatTodoListService } from './vscode/src/vs/workbench/contrib/chat/comm
 import { IChatLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatLayoutService.service';
 import { ChatLayoutService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatLayoutService.js';
 import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
-import { AiEditTelemetryServiceImpl } from './vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl.js';
+import { AiEditTelemetryServiceImpl } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { ChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
@@ -73,13 +73,13 @@ import { IAgentTitleBarStatusService } from '@codingame/monaco-vscode-api/vscode
 import { ILanguageModelsConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelsConfiguration.service';
 import { IChatTipService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatTipService.service';
 import { IChatEditingExplanationModelManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.service';
-import { IChatToolOutputStateCache } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.service';
+import { IChatOutputPartStateCache } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatOutputPartStateCache.service';
 import { AgentSessionProjectionService } from './vscode/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentSessionProjectionService.js';
 import { AgentTitleBarStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService';
 import { LanguageModelsConfigurationService } from './vscode/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.js';
 import { ChatTipService } from './vscode/src/vs/workbench/contrib/chat/browser/chatTipService.js';
 import { ChatEditingExplanationModelManager } from './vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingExplanationModelManager.js';
-import { ChatToolOutputStateCache } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatToolOutputStateCache.js';
+import { ChatOutputPartStateCache } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatOutputPartStateCache.js';
 import { TerminalSandboxService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalSandboxService';
 import { IAICustomizationWorkspaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/aiCustomizationWorkspaceService.service';
 import { IAgentPluginService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service';
@@ -133,17 +133,25 @@ import { AgentHostPermissionService } from './vscode/src/vs/workbench/services/a
 import { ToolResultCompressorService } from './vscode/src/vs/workbench/contrib/chat/browser/tools/toolResultCompressorService.js';
 import { ChatInputNotificationService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
 import { ChatPhoneInputPresenterService } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter';
+import { IAgentHostUntitledProvisionalSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service';
+import { IAgentHostDebugLogsExportService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction.service';
+import { AgentHostUntitledProvisionalSessionService } from './vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.js';
+import { BrowserAgentHostDebugLogsExportService } from './vscode/src/vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction.js';
 import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
+import './vscode/src/vs/workbench/contrib/chat/browser/chat.shared.contribution.js';
 import './vscode/src/vs/workbench/contrib/chat/browser/chat.view.contribution.js';
 import './vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/terminal.chatAgentTools.contribution.js';
 import './vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.js';
 import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
 import './vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js';
+import './vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContext.contribution.js';
+import './vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarousel.contribution.js';
 import { ITerminalSandboxService } from '@codingame/monaco-vscode-api/vscode/vs/platform/sandbox/common/terminalSandboxService.service';
 
 class DefaultAccountService {
     constructor(defaultAccount) {
         this.defaultAccount = defaultAccount;
+        this.resolveGitHubUrl = (path) => path;
         this.currentDefaultAccount = null;
         this.onDidChangePolicyData = Event.None;
         this.policyData = null;
@@ -201,7 +209,7 @@ function getServiceOverride({ defaultAccount } = {}) {
         [ILanguageModelsConfigurationService.toString()]: new SyncDescriptor(LanguageModelsConfigurationService, [], true),
         [IChatTipService.toString()]: new SyncDescriptor(ChatTipService, [], true),
         [IChatEditingExplanationModelManager.toString()]: new SyncDescriptor(ChatEditingExplanationModelManager, [], true),
-        [IChatToolOutputStateCache.toString()]: new SyncDescriptor(ChatToolOutputStateCache, [], true),
+        [IChatOutputPartStateCache.toString()]: new SyncDescriptor(ChatOutputPartStateCache, [], true),
         [ITerminalSandboxService.toString()]: new SyncDescriptor(TerminalSandboxService, [], true),
         [ISandboxHelperService.toString()]: new SyncDescriptor(NullSandboxHelperService, [], true),
         [IAICustomizationWorkspaceService.toString()]: new SyncDescriptor(AICustomizationWorkspaceService, [], true),
@@ -228,7 +236,9 @@ function getServiceOverride({ defaultAccount } = {}) {
         [IPlanReviewFeedbackService.toString()]: new SyncDescriptor(PlanReviewFeedbackService, [], true),
         [IChatInputNotificationService.toString()]: new SyncDescriptor(ChatInputNotificationService, [], true),
         [IChatPhoneInputPresenter.toString()]: new SyncDescriptor(ChatPhoneInputPresenterService, [], true),
-        [IAgentHostPermissionService.toString()]: new SyncDescriptor(AgentHostPermissionService, [], true)
+        [IAgentHostPermissionService.toString()]: new SyncDescriptor(AgentHostPermissionService, [], true),
+        [IAgentHostUntitledProvisionalSessionService.toString()]: new SyncDescriptor(AgentHostUntitledProvisionalSessionService, [], true),
+        [IAgentHostDebugLogsExportService.toString()]: new SyncDescriptor(BrowserAgentHostDebugLogsExportService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "32.0.2",
+  "version": "33.0.5",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - chat service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "32.0.2",
-    "@codingame/monaco-vscode-katex-common": "32.0.2",
-    "@codingame/monaco-vscode-xterm-addons-common": "32.0.2",
-    "@codingame/monaco-vscode-xterm-common": "32.0.2"
+    "@codingame/monaco-vscode-api": "33.0.5",
+    "@codingame/monaco-vscode-katex-common": "33.0.5",
+    "@codingame/monaco-vscode-xterm-addons-common": "33.0.5",
+    "@codingame/monaco-vscode-xterm-common": "33.0.5"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/agentHost/browser/remoteAgentHostProtocolClient.d.ts

@@ -2,15 +2,33 @@ import { Disposable, IReference } from "@codingame/monaco-vscode-api/vscode/vs/b
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IAgentConnection, IAgentCreateSessionConfig, IAgentResolveSessionConfigParams, IAgentSessionConfigCompletionsParams, IAgentSessionMetadata, AuthenticateParams, AuthenticateResult } from "../common/agentService.js";
 import { type IAgentSubscription } from "../common/state/agentSubscription.js";
 import { IAgentHostPermissionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostPermissionService.service";
 import type { CommandMap } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/messages";
 import { type ActionEnvelope, type IRootConfigChangedAction, type SessionAction, type TerminalAction } from "../common/state/sessionActions.js";
-import { StateComponents, type RootState } from "@codingame/monaco-vscode-xterm-common/vscode/vs/platform/agentHost/common/state/sessionState";
+import { StateComponents, type RootState } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
 import { type IStateSnapshot } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionProtocol";
+import { type IVscodeUpgradeResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocolUpgrade";
 import { type IProtocolTransport } from "../common/state/sessionTransport.js";
 import { type CompletionsParams, type CompletionsResult, type CreateTerminalParams, type ResolveSessionConfigResult, type SessionConfigCompletionsResult } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/commands";
+import { ILoadEstimator } from "@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc.net";
+/**
+ * High-level connection state of a {@link RemoteAgentHostProtocolClient}.
+ * Exposed via {@link RemoteAgentHostProtocolClient.onDidChangeConnectionState}
+ * so consumers can surface transient reconnect activity in the UI.
+ */
+export declare enum AgentHostClientState {
+    /** Initial handshake in progress. */
+    Connecting = "connecting",
+    /** Transport is open and handshake/reconnect has completed. */
+    Connected = "connected",
+    /** Transport closed unexpectedly; an automatic reconnect is in flight or scheduled. */
+    Reconnecting = "reconnecting",
+    /** Client has been disposed or has given up reconnecting. Terminal state. */
+    Closed = "closed"
+}
 /**
  * A protocol-level client for a single remote agent host connection.
  * Manages the WebSocket transport, handshake, subscriptions, action dispatch,
@@ -23,10 +41,14 @@ export declare class RemoteAgentHostProtocolClient extends Disposable implements
     private readonly _logService;
     private readonly _fileService;
     private readonly _permissionService;
+    private readonly _configurationService;
     readonly _serviceBrand: undefined;
     private readonly _clientId;
     private readonly _address;
-    private readonly _transport;
+    private readonly _transportFactory;
+    private _transport;
+    /** Disposable holding the listeners attached to the current transport. */
+    private readonly _transportListeners;
     private readonly _connectionAuthority;
     private _serverSeq;
     private _nextClientSeq;
@@ -39,25 +61,47 @@ export declare class RemoteAgentHostProtocolClient extends Disposable implements
     readonly onDidNotification: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<import("@codingame/monaco-vscode-xterm-common/vscode/vs/platform/agentHost/common/state/protocol/notifications").ProtocolNotification>;
     private readonly _onDidClose;
     readonly onDidClose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private readonly _onDidChangeConnectionState;
+    readonly onDidChangeConnectionState: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<AgentHostClientState>;
+    /**
+     * Discriminated state union. Read via narrowing (`_state.kind === ...`);
+     * reconnect-only fields like the gate/outbox/attempt counter are only
+     * accessible while {@link _state.kind} is {@link AgentHostClientState.Reconnecting},
+     * and the close error is only accessible while it's {@link AgentHostClientState.Closed}.
+     */
+    private _state;
     /** Pending JSON-RPC requests keyed by request id. */
     private readonly _pendingRequests;
     private _nextRequestId;
-    private _isClosed;
-    private _closeError;
     /**
      * Timestamp of the most recent message of any kind received from the
-     * server. Updated in {@link _handleMessage}. Used by the watchdog to
-     * decide if the transport has gone silent.
+     * server. Used only for diagnostic logging when the close timer fires.
      */
     private _lastReadTime;
     /**
-     * Periodic check that fires {@link _handleClose} when there are
-     * outstanding requests *and* nothing has been received for
-     * {@link WATCHDOG_TIMEOUT_MS}ms. Detects silently-dead transports
-     * (e.g. SSH/tunnel after laptop sleep + network change) that don't
-     * produce a socket close event of their own. See {@link _watchdogTick}.
+     * Liveness watchdog — see {@link _resetLivenessTimers}.
+     *
+     * {@link _pingTimer} fires after {@link PING_INTERVAL_MS} of inbound
+     * silence and sends an application-level `ping` so we have something
+     * to time out on. {@link _closeTimer} fires after another
+     * {@link LIVENESS_TIMEOUT_MS} of continued silence and force-closes
+     * the transport so the renderer's reconnect logic kicks in. Both are
+     * reset on every received message, so busy connections generate no
+     * ping traffic at all.
+     *
+     * Detects silently-dead transports (e.g. SSH/tunnel after laptop
+     * sleep + network change) that don't produce a socket close event of
+     * their own.
+     */
+    private readonly _pingTimer;
+    private readonly _closeTimer;
+    /**
+     * Used to suppress watchdog-triggered closes when our own JS event loop
+     * has been pegged — in that case the silence is on our side, not the
+     * remote's, and tearing down the transport would just generate a useless
+     * reconnect cycle that aborts in-flight requests.
      */
-    private readonly _watchdog;
+    private readonly _loadEstimator;
     /**
      * Comparison keys of customization URIs we have already granted implicit
      * read access for on this connection. Dedupes repeat sends so we don't
@@ -67,12 +111,61 @@ export declare class RemoteAgentHostProtocolClient extends Disposable implements
     get clientId(): string;
     get address(): string;
     get defaultDirectory(): string | undefined;
-    constructor(address: string, transport: IProtocolTransport, _logService: ILogService, _fileService: IFileService, _permissionService: IAgentHostPermissionService);
+    get connectionState(): AgentHostClientState;
+    constructor(address: string, transportOrFactory: IProtocolTransport | (() => IProtocolTransport), loadEstimator: ILoadEstimator | undefined, _logService: ILogService, _fileService: IFileService, _permissionService: IAgentHostPermissionService, _configurationService: IConfigurationService);
+    /**
+     * Install a transport and wire listeners. Used both for the initial
+     * transport and for replacements created by the factory during a
+     * transport-level reconnect.
+     */
+    private _installTransport;
+    /**
+     * Transition to a new {@link ClientState}. Fires {@link onDidChangeConnectionState}
+     * only when the variant kind actually changes; in-place mutation of
+     * reconnect-state fields (e.g. swapping the gate on a failed retry) does
+     * NOT count as a transition and produces no event.
+     */
+    private _transitionTo;
+    private _newReconnectGate;
+    private _newReconnectState;
     dispose(): void;
     /**
      * Connect to the remote agent host and perform the protocol handshake.
      */
     connect(): Promise<void>;
+    /**
+     * Called from the transport's `onClose` event. When a {@link _transportFactory}
+     * is configured we attempt to soft-reconnect rather than fire `onDidClose` —
+     * the protocol-level `reconnect` request lets the server replay missed
+     * actions and preserves the `clientId` so pending tool calls etc. are not
+     * cancelled by the host-side disconnect timeout. Without a factory
+     * (passive-transport SSH/relay path) we fall back to "close means closed"
+     * and let the service decide whether to spin up a fresh client.
+     */
+    private _handleTransportClose;
+    private _scheduleReconnect;
+    private _attemptReconnect;
+    /**
+     * Apply a `reconnect` RPC result to the subscription manager. On `replay`
+     * we feed each missed envelope through the normal action path; on
+     * `snapshot` we reseat each named subscription with the fresh state and
+     * advance the server seq cursor accordingly.
+     */
+    private _applyReconnectResult;
+    /**
+     * Drain queued outgoing wire traffic after a successful soft reconnect:
+     *
+     * 1. Resend pending optimistic session actions that the server did NOT
+     *    echo back in the replay buffer (i.e. anything still on
+     *    {@link AgentSubscriptionManager.getPendingSessionActions}).
+     * 2. Flush every message that {@link _sendNotification} queued onto the
+     *    outbox while the gate was engaged.
+     *
+     * Replays are deduped against the outbox by `clientSeq` so a session
+     * action that was both optimistic-tracked AND queued during the
+     * reconnect window only goes out once.
+     */
+    private _drainAfterReconnect;
     get rootState(): IAgentSubscription<RootState>;
     getSubscription<T>(kind: StateComponents, resource: URI): IReference<IAgentSubscription<T>>;
     getSubscriptionUnmanaged<T>(_kind: StateComponents, resource: URI): IAgentSubscription<T> | undefined;
@@ -88,7 +181,7 @@ export declare class RemoteAgentHostProtocolClient extends Disposable implements
     /**
      * Dispatch a client action to the server. Returns the clientSeq used.
      */
-    dispatchAction(action: SessionAction | TerminalAction | IRootConfigChangedAction, _clientId: string, clientSeq: number): void;
+    private dispatchAction;
     /**
      * Create a new session on the remote agent host.
      */
@@ -96,6 +189,15 @@ export declare class RemoteAgentHostProtocolClient extends Disposable implements
     resolveSessionConfig(params: IAgentResolveSessionConfigParams): Promise<ResolveSessionConfigResult>;
     sessionConfigCompletions(params: IAgentSessionConfigCompletionsParams): Promise<SessionConfigCompletionsResult>;
     completions(params: CompletionsParams): Promise<CompletionsResult>;
+    /**
+     * Send an application-level ping and wait for the server's response.
+     * Used by {@link _watchdogTick} to keep idle connections under
+     * watchdog supervision; safe to call from external code as well.
+     *
+     * The returned promise rejects with a {@link ProtocolError} if the
+     * connection closes before a response arrives.
+     */
+    ping(): Promise<void>;
     /**
      * Returns the trigger characters captured from the `initialize` handshake.
      * Empty when the remote host did not announce any.
@@ -152,6 +254,19 @@ export declare class RemoteAgentHostProtocolClient extends Disposable implements
     resourceCopy(params: CommandMap["resourceCopy"]["params"]): Promise<CommandMap["resourceCopy"]["result"]>;
     resourceDelete(params: CommandMap["resourceDelete"]["params"]): Promise<CommandMap["resourceDelete"]["result"]>;
     resourceMove(params: CommandMap["resourceMove"]["params"]): Promise<CommandMap["resourceMove"]["result"]>;
+    /**
+     * Trigger the CLI-managed upgrade flow for this agent host using the
+     * method name advertised by the server (typically
+     * {@link VSCODE_UPGRADE_METHOD}). Callable before {@link connect} has
+     * completed — typically used when the host has just rejected our
+     * `initialize` with an `UnsupportedProtocolVersion` error. The
+     * transport stays open after the rejection, so the extension request
+     * rides over it without a special out-of-band path.
+     *
+     * The result mirrors the CLI's HTTP response: ok flag, whether the
+     * upgrade is needed / started, running/latest commits.
+     */
+    triggerVscodeUpgrade(method: string): Promise<IVscodeUpgradeResult>;
     private _handleMessage;
     private _handleClose;
     private _raceClose;
@@ -172,21 +287,52 @@ export declare class RemoteAgentHostProtocolClient extends Disposable implements
     private _sendRequest;
     /** Send a JSON-RPC request for a VS Code extension method (not in the protocol spec). */
     private _sendExtensionRequest;
+    private _updateTelemetryLevel;
+    /**
+     * Common path for outgoing JSON-RPC requests: gate on any in-flight
+     * reconnect (unless explicitly bypassed for the `reconnect` RPC itself),
+     * assign an id, register the pending deferred, and write to the wire.
+     *
+     * The bypass option is the single special case that exists: the
+     * `reconnect` request is sent from inside `_attemptReconnect` while the
+     * gate is engaged, so it can't wait on its own resolution.
+     */
+    private _dispatchRequest;
     private _toProtocolError;
     private _rejectPendingRequests;
     /**
-     * Fired on a {@link WATCHDOG_CHECK_INTERVAL_MS} interval. If the
-     * transport has at least one outstanding request that's been waiting
-     * for more than {@link WATCHDOG_TIMEOUT_MS} and no inbound message has
-     * arrived in the same window, declare the transport dead and trigger
-     * the renderer's reconnect path.
+     * Reset the liveness timers. Called once at construction (after the
+     * initial transport is installed), once on every received message
+     * (which is itself proof the remote is alive), and once after a
+     * successful soft reconnect.
+     *
+     * Two timers cooperate:
+     *
+     * 1. {@link _pingTimer} fires after {@link PING_INTERVAL_MS} of silence
+     *    and sends an application-level `ping` so the close timer has
+     *    something to time out on. Tolerates servers that don't implement
+     *    `ping` — the error response still resets both timers.
+     *
+     * 2. {@link _closeTimer} fires after {@link PING_INTERVAL_MS}+
+     *    {@link LIVENESS_TIMEOUT_MS} of continued silence and force-closes
+     *    the transport so the renderer's reconnect logic kicks in. Catches
+     *    silently-dead transports (e.g. SSH/tunnel after laptop sleep +
+     *    network change) that don't emit a socket close event of their own.
+     *
+     * After laptop sleep + wake the JS event loop is paused, so a timer
+     * armed before sleep fires immediately after wake. That's fine —
+     * any inbound message processed during the wake catch-up resets it
+     * before the close handler runs.
      *
-     * After laptop sleep + wake the JS event loop is paused, so the
-     * interval fires only once after wake. The lookback comparison still
-     * works — we're comparing wall-clock {@link Date.now()} values, not
-     * counting ticks.
+     * No-op while {@link _state.kind} is {@link AgentHostClientState.Reconnecting}
+     * or {@link AgentHostClientState.Closed}: the reconnect machinery
+     * owns scheduling in those states, and we don't want a stray inbound
+     * message during reconnect to re-arm the timers behind its back.
      */
-    private _watchdogTick;
+    private _resetLivenessTimers;
+    private _cancelLivenessTimers;
+    private _onPingTimer;
+    private _onCloseTimer;
     /**
      * Get the next client sequence number for optimistic dispatch.
      */