@agentclientprotocol/codex-acp 1.0.1 → 1.1.0

package/dist/index.js

@@ -45,35 +45,34 @@ var require_is = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/is.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.stringArray = exports.array = exports.func = exports.error = exports.number = exports.string = exports.boolean = void 0;
+    exports.boolean = boolean4;
+    exports.string = string4;
+    exports.number = number4;
+    exports.error = error51;
+    exports.func = func;
+    exports.array = array2;
+    exports.stringArray = stringArray;
     function boolean4(value) {
       return value === true || value === false;
     }
-    exports.boolean = boolean4;
     function string4(value) {
       return typeof value === "string" || value instanceof String;
     }
-    exports.string = string4;
     function number4(value) {
       return typeof value === "number" || value instanceof Number;
     }
-    exports.number = number4;
     function error51(value) {
       return value instanceof Error;
     }
-    exports.error = error51;
     function func(value) {
       return typeof value === "function";
     }
-    exports.func = func;
     function array2(value) {
       return Array.isArray(value);
     }
-    exports.array = array2;
     function stringArray(value) {
       return array2(value) && value.every((elem) => string4(elem));
     }
-    exports.stringArray = stringArray;
   }
 });
 
@@ -81,9 +80,46 @@ var require_is = __commonJS({
 var require_messages = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/messages.js"(exports) {
     "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Message = exports.NotificationType9 = exports.NotificationType8 = exports.NotificationType7 = exports.NotificationType6 = exports.NotificationType5 = exports.NotificationType4 = exports.NotificationType3 = exports.NotificationType2 = exports.NotificationType1 = exports.NotificationType0 = exports.NotificationType = exports.RequestType9 = exports.RequestType8 = exports.RequestType7 = exports.RequestType6 = exports.RequestType5 = exports.RequestType4 = exports.RequestType3 = exports.RequestType2 = exports.RequestType1 = exports.RequestType = exports.RequestType0 = exports.AbstractMessageSignature = exports.ParameterStructures = exports.ResponseError = exports.ErrorCodes = void 0;
-    var is = require_is();
+    var is = __importStar(require_is());
     var ErrorCodes;
     (function(ErrorCodes2) {
       ErrorCodes2.ParseError = -32700;
@@ -103,6 +139,8 @@ var require_messages = __commonJS({
       ErrorCodes2.serverErrorEnd = -32e3;
     })(ErrorCodes || (exports.ErrorCodes = ErrorCodes = {}));
     var ResponseError = class _ResponseError extends Error {
+      code;
+      data;
       constructor(code, message, data) {
         super(message);
         this.code = is.number(code) ? code : ErrorCodes.UnknownErrorCode;
@@ -122,6 +160,23 @@ var require_messages = __commonJS({
     };
     exports.ResponseError = ResponseError;
     var ParameterStructures = class _ParameterStructures {
+      kind;
+      /**
+       * The parameter structure is automatically inferred on the number of parameters
+       * and the parameter type in case of a single param.
+       */
+      static auto = new _ParameterStructures("auto");
+      /**
+       * Forces `byPosition` parameter structure. This is useful if you have a single
+       * parameter which has a literal type.
+       */
+      static byPosition = new _ParameterStructures("byPosition");
+      /**
+       * Forces `byName` parameter structure. This is only useful when having a single
+       * parameter. The library will report errors if used with a different number of
+       * parameters.
+       */
+      static byName = new _ParameterStructures("byName");
       constructor(kind) {
         this.kind = kind;
       }
@@ -133,10 +188,9 @@ var require_messages = __commonJS({
       }
     };
     exports.ParameterStructures = ParameterStructures;
-    ParameterStructures.auto = new ParameterStructures("auto");
-    ParameterStructures.byPosition = new ParameterStructures("byPosition");
-    ParameterStructures.byName = new ParameterStructures("byName");
     var AbstractMessageSignature = class {
+      method;
+      numberOfParams;
       constructor(method, numberOfParams) {
         this.method = method;
         this.numberOfParams = numberOfParams;
@@ -147,12 +201,21 @@ var require_messages = __commonJS({
     };
     exports.AbstractMessageSignature = AbstractMessageSignature;
     var RequestType0 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 0);
       }
     };
     exports.RequestType0 = RequestType0;
     var RequestType2 = class extends AbstractMessageSignature {
+      _parameterStructures;
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method, _parameterStructures = ParameterStructures.auto) {
         super(method, 1);
         this._parameterStructures = _parameterStructures;
@@ -163,6 +226,11 @@ var require_messages = __commonJS({
     };
     exports.RequestType = RequestType2;
     var RequestType1 = class extends AbstractMessageSignature {
+      _parameterStructures;
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method, _parameterStructures = ParameterStructures.auto) {
         super(method, 1);
         this._parameterStructures = _parameterStructures;
@@ -173,54 +241,91 @@ var require_messages = __commonJS({
     };
     exports.RequestType1 = RequestType1;
     var RequestType22 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 2);
       }
     };
     exports.RequestType2 = RequestType22;
     var RequestType3 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 3);
       }
     };
     exports.RequestType3 = RequestType3;
     var RequestType4 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 4);
       }
     };
     exports.RequestType4 = RequestType4;
     var RequestType5 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 5);
       }
     };
     exports.RequestType5 = RequestType5;
     var RequestType6 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 6);
       }
     };
     exports.RequestType6 = RequestType6;
     var RequestType7 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 7);
       }
     };
     exports.RequestType7 = RequestType7;
     var RequestType8 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 8);
       }
     };
     exports.RequestType8 = RequestType8;
     var RequestType9 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 9);
       }
     };
     exports.RequestType9 = RequestType9;
     var NotificationType = class extends AbstractMessageSignature {
+      _parameterStructures;
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method, _parameterStructures = ParameterStructures.auto) {
         super(method, 1);
         this._parameterStructures = _parameterStructures;
@@ -231,12 +336,21 @@ var require_messages = __commonJS({
     };
     exports.NotificationType = NotificationType;
     var NotificationType0 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 0);
       }
     };
     exports.NotificationType0 = NotificationType0;
     var NotificationType1 = class extends AbstractMessageSignature {
+      _parameterStructures;
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method, _parameterStructures = ParameterStructures.auto) {
         super(method, 1);
         this._parameterStructures = _parameterStructures;
@@ -247,71 +361,103 @@ var require_messages = __commonJS({
     };
     exports.NotificationType1 = NotificationType1;
     var NotificationType2 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 2);
       }
     };
     exports.NotificationType2 = NotificationType2;
     var NotificationType3 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 3);
       }
     };
     exports.NotificationType3 = NotificationType3;
     var NotificationType4 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 4);
       }
     };
     exports.NotificationType4 = NotificationType4;
     var NotificationType5 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 5);
       }
     };
     exports.NotificationType5 = NotificationType5;
     var NotificationType6 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 6);
       }
     };
     exports.NotificationType6 = NotificationType6;
     var NotificationType7 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 7);
       }
     };
     exports.NotificationType7 = NotificationType7;
     var NotificationType8 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 8);
       }
     };
     exports.NotificationType8 = NotificationType8;
     var NotificationType9 = class extends AbstractMessageSignature {
+      /**
+       * Clients must not use this property. It is here to ensure correct typing.
+       */
+      _;
       constructor(method) {
         super(method, 9);
       }
     };
     exports.NotificationType9 = NotificationType9;
-    var Message2;
-    (function(Message3) {
+    var Message;
+    (function(Message2) {
       function isRequest(message) {
         const candidate = message;
         return candidate && is.string(candidate.method) && (is.string(candidate.id) || is.number(candidate.id));
       }
-      Message3.isRequest = isRequest;
+      Message2.isRequest = isRequest;
       function isNotification(message) {
         const candidate = message;
         return candidate && is.string(candidate.method) && message.id === void 0;
       }
-      Message3.isNotification = isNotification;
+      Message2.isNotification = isNotification;
       function isResponse(message) {
         const candidate = message;
         return candidate && (candidate.result !== void 0 || !!candidate.error) && (is.string(candidate.id) || is.number(candidate.id) || candidate.id === null);
       }
-      Message3.isResponse = isResponse;
-    })(Message2 || (exports.Message = Message2 = {}));
+      Message2.isResponse = isResponse;
+    })(Message || (exports.Message = Message = {}));
   }
 });
 
@@ -319,7 +465,6 @@ var require_messages = __commonJS({
 var require_linkedMap = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/linkedMap.js"(exports) {
     "use strict";
-    var _a3;
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.LRUCache = exports.LinkedMap = exports.Touch = void 0;
     var Touch;
@@ -331,8 +476,13 @@ var require_linkedMap = __commonJS({
       Touch2.AsNew = Touch2.Last;
     })(Touch || (exports.Touch = Touch = {}));
     var LinkedMap = class {
+      [Symbol.toStringTag] = "LinkedMap";
+      _map;
+      _head;
+      _tail;
+      _size;
+      _state;
       constructor() {
-        this[_a3] = "LinkedMap";
         this._map = /* @__PURE__ */ new Map();
         this._head = void 0;
         this._tail = void 0;
@@ -358,6 +508,14 @@ var require_linkedMap = __commonJS({
       get last() {
         return this._tail?.value;
       }
+      before(key) {
+        const item = this._map.get(key);
+        return item ? item.previous?.value : void 0;
+      }
+      after(key) {
+        const item = this._map.get(key);
+        return item ? item.next?.value : void 0;
+      }
       has(key) {
         return this._map.has(key);
       }
@@ -506,7 +664,7 @@ var require_linkedMap = __commonJS({
         };
         return iterator;
       }
-      [(_a3 = Symbol.toStringTag, Symbol.iterator)]() {
+      [Symbol.iterator]() {
         return this.entries();
       }
       trimOld(newSize) {
@@ -645,6 +803,8 @@ var require_linkedMap = __commonJS({
     };
     exports.LinkedMap = LinkedMap;
     var LRUCache = class extends LinkedMap {
+      _limit;
+      _ratio;
       constructor(limit, ratio = 1) {
         super();
         this._limit = limit;
@@ -691,15 +851,15 @@ var require_disposable = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Disposable = void 0;
-    var Disposable2;
-    (function(Disposable3) {
+    var Disposable;
+    (function(Disposable2) {
       function create(func) {
         return {
           dispose: func
         };
       }
-      Disposable3.create = create;
-    })(Disposable2 || (exports.Disposable = Disposable2 = {}));
+      Disposable2.create = create;
+    })(Disposable || (exports.Disposable = Disposable = {}));
   }
 });
 
@@ -732,9 +892,12 @@ var require_ral = __commonJS({
 var require_events = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/events.js"(exports) {
     "use strict";
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Emitter = exports.Event = void 0;
-    var ral_1 = require_ral();
+    var ral_1 = __importDefault(require_ral());
     var Event;
     (function(Event2) {
       const _disposable = { dispose() {
@@ -744,6 +907,8 @@ var require_events = __commonJS({
       };
     })(Event || (exports.Event = Event = {}));
     var CallbackList = class {
+      _callbacks;
+      _contexts;
       add(callback, context = null, bucket) {
         if (!this._callbacks) {
           this._callbacks = [];
@@ -798,6 +963,11 @@ var require_events = __commonJS({
       }
     };
     var Emitter2 = class _Emitter {
+      _options;
+      static _noop = function() {
+      };
+      _event;
+      _callbacks;
       constructor(_options) {
         this._options = _options;
       }
@@ -852,8 +1022,6 @@ var require_events = __commonJS({
       }
     };
     exports.Emitter = Emitter2;
-    Emitter2._noop = function() {
-    };
   }
 });
 
@@ -861,10 +1029,50 @@ var require_events = __commonJS({
 var require_cancellation = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/cancellation.js"(exports) {
     "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.CancellationTokenSource = exports.CancellationToken = void 0;
-    var ral_1 = require_ral();
-    var Is = require_is();
+    var ral_1 = __importDefault(require_ral());
+    var Is = __importStar(require_is());
     var events_1 = require_events();
     var CancellationToken;
     (function(CancellationToken2) {
@@ -889,9 +1097,8 @@ var require_cancellation = __commonJS({
       } };
     });
     var MutableToken = class {
-      constructor() {
-        this._isCancelled = false;
-      }
+      _isCancelled = false;
+      _emitter;
       cancel() {
         if (!this._isCancelled) {
           this._isCancelled = true;
@@ -921,6 +1128,7 @@ var require_cancellation = __commonJS({
       }
     };
     var CancellationTokenSource = class {
+      _token;
       get token() {
         if (!this._token) {
           this._token = new MutableToken();
@@ -959,6 +1167,7 @@ var require_sharedArrayCancellation = __commonJS({
       CancellationState2.Cancelled = 1;
     })(CancellationState || (CancellationState = {}));
     var SharedArraySenderStrategy = class {
+      buffers;
       constructor() {
         this.buffers = /* @__PURE__ */ new Map();
       }
@@ -989,6 +1198,7 @@ var require_sharedArrayCancellation = __commonJS({
     };
     exports.SharedArraySenderStrategy = SharedArraySenderStrategy;
     var SharedArrayBufferCancellationToken = class {
+      data;
       constructor(buffer) {
         this.data = new Int32Array(buffer, 0, 1);
       }
@@ -1000,6 +1210,7 @@ var require_sharedArrayCancellation = __commonJS({
       }
     };
     var SharedArrayBufferCancellationTokenSource = class {
+      token;
       constructor(buffer) {
         this.token = new SharedArrayBufferCancellationToken(buffer);
       }
@@ -1009,9 +1220,7 @@ var require_sharedArrayCancellation = __commonJS({
       }
     };
     var SharedArrayReceiverStrategy = class {
-      constructor() {
-        this.kind = "request";
-      }
+      kind = "request";
       createCancellationTokenSource(request) {
         const buffer = request.$cancellationData;
         if (buffer === void 0) {
@@ -1028,10 +1237,16 @@ var require_sharedArrayCancellation = __commonJS({
 var require_semaphore = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/semaphore.js"(exports) {
     "use strict";
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Semaphore = void 0;
-    var ral_1 = require_ral();
+    var ral_1 = __importDefault(require_ral());
     var Semaphore = class {
+      _capacity;
+      _active;
+      _waiting;
       constructor(capacity = 1) {
         if (capacity <= 0) {
           throw new Error("Capacity must be greater than 0");
@@ -1062,7 +1277,7 @@ var require_semaphore = __commonJS({
         const next = this._waiting.shift();
         this._active++;
         if (this._active > this._capacity) {
-          throw new Error(`To many thunks active`);
+          throw new Error(`Too many thunks active`);
         }
         try {
           const result = next.thunk();
@@ -1096,21 +1311,64 @@ var require_semaphore = __commonJS({
 var require_messageReader = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/messageReader.js"(exports) {
     "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ReadableStreamMessageReader = exports.AbstractMessageReader = exports.MessageReader = void 0;
-    var ral_1 = require_ral();
-    var Is = require_is();
+    var ral_1 = __importDefault(require_ral());
+    var Is = __importStar(require_is());
     var events_1 = require_events();
     var semaphore_1 = require_semaphore();
-    var MessageReader2;
-    (function(MessageReader3) {
+    var MessageReader;
+    (function(MessageReader2) {
       function is(value) {
-        let candidate = value;
+        const candidate = value;
         return candidate && Is.func(candidate.listen) && Is.func(candidate.dispose) && Is.func(candidate.onError) && Is.func(candidate.onClose) && Is.func(candidate.onPartialMessage);
       }
-      MessageReader3.is = is;
-    })(MessageReader2 || (exports.MessageReader = MessageReader2 = {}));
+      MessageReader2.is = is;
+    })(MessageReader || (exports.MessageReader = MessageReader = {}));
     var AbstractMessageReader = class {
+      errorEmitter;
+      closeEmitter;
+      partialMessageEmitter;
       constructor() {
         this.errorEmitter = new events_1.Emitter();
         this.closeEmitter = new events_1.Emitter();
@@ -1119,6 +1377,7 @@ var require_messageReader = __commonJS({
       dispose() {
         this.errorEmitter.dispose();
         this.closeEmitter.dispose();
+        this.partialMessageEmitter.dispose();
       }
       get onError() {
         return this.errorEmitter.event;
@@ -1188,6 +1447,15 @@ var require_messageReader = __commonJS({
       ResolvedMessageReaderOptions2.fromOptions = fromOptions;
     })(ResolvedMessageReaderOptions || (ResolvedMessageReaderOptions = {}));
     var ReadableStreamMessageReader = class extends AbstractMessageReader {
+      readable;
+      options;
+      callback;
+      nextMessageLength;
+      messageToken;
+      buffer;
+      partialMessageTimer;
+      _partialMessageTimeout;
+      readSemaphore;
       constructor(readable, options) {
         super();
         this.readable = readable;
@@ -1285,23 +1553,65 @@ ${JSON.stringify(Object.fromEntries(headers))}`));
 var require_messageWriter = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/messageWriter.js"(exports) {
     "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.WriteableStreamMessageWriter = exports.AbstractMessageWriter = exports.MessageWriter = void 0;
-    var ral_1 = require_ral();
-    var Is = require_is();
+    var ral_1 = __importDefault(require_ral());
+    var Is = __importStar(require_is());
     var semaphore_1 = require_semaphore();
     var events_1 = require_events();
     var ContentLength = "Content-Length: ";
     var CRLF = "\r\n";
-    var MessageWriter2;
-    (function(MessageWriter3) {
+    var MessageWriter;
+    (function(MessageWriter2) {
       function is(value) {
-        let candidate = value;
+        const candidate = value;
         return candidate && Is.func(candidate.dispose) && Is.func(candidate.onClose) && Is.func(candidate.onError) && Is.func(candidate.write);
       }
-      MessageWriter3.is = is;
-    })(MessageWriter2 || (exports.MessageWriter = MessageWriter2 = {}));
+      MessageWriter2.is = is;
+    })(MessageWriter || (exports.MessageWriter = MessageWriter = {}));
     var AbstractMessageWriter = class {
+      errorEmitter;
+      closeEmitter;
       constructor() {
         this.errorEmitter = new events_1.Emitter();
         this.closeEmitter = new events_1.Emitter();
@@ -1343,6 +1653,10 @@ var require_messageWriter = __commonJS({
       ResolvedMessageWriterOptions2.fromOptions = fromOptions;
     })(ResolvedMessageWriterOptions || (ResolvedMessageWriterOptions = {}));
     var WriteableStreamMessageWriter = class extends AbstractMessageWriter {
+      writable;
+      options;
+      errorCount;
+      writeSemaphore;
       constructor(writable, options) {
         super();
         this.writable = writable;
@@ -1403,6 +1717,9 @@ var require_messageBuffer = __commonJS({
     var LF = 10;
     var CRLF = "\r\n";
     var AbstractMessageBuffer = class {
+      _encoding;
+      _chunks;
+      _totalLength;
       constructor(encoding = "utf-8") {
         this._encoding = encoding;
         this._chunks = [];
@@ -1427,7 +1744,7 @@ var require_messageBuffer = __commonJS({
         row: while (chunkIndex < this._chunks.length) {
           const chunk = this._chunks[chunkIndex];
           offset = 0;
-          column: while (offset < chunk.length) {
+          while (offset < chunk.length) {
             const value = chunk[offset];
             switch (value) {
               case CR:
@@ -1516,7 +1833,7 @@ ${header}`);
         }
         const result = this.allocNative(byteCount);
         let resultOffset = 0;
-        let chunkIndex = 0;
+        const chunkIndex = 0;
         while (byteCount > 0) {
           const chunk = this._chunks[chunkIndex];
           if (chunk.byteLength > byteCount) {
@@ -1545,10 +1862,51 @@ ${header}`);
 var require_connection = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/connection.js"(exports) {
     "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.createMessageConnection = exports.ConnectionOptions = exports.MessageStrategy = exports.CancellationStrategy = exports.CancellationSenderStrategy = exports.CancellationReceiverStrategy = exports.RequestCancellationReceiverStrategy = exports.IdCancellationReceiverStrategy = exports.ConnectionStrategy = exports.ConnectionError = exports.ConnectionErrors = exports.LogTraceNotification = exports.SetTraceNotification = exports.TraceFormat = exports.TraceValues = exports.Trace = exports.NullLogger = exports.ProgressType = exports.ProgressToken = void 0;
-    var ral_1 = require_ral();
-    var Is = require_is();
+    exports.ConnectionOptions = exports.MessageStrategy = exports.CancellationStrategy = exports.CancellationSenderStrategy = exports.CancellationReceiverStrategy = exports.RequestCancellationReceiverStrategy = exports.IdCancellationReceiverStrategy = exports.ConnectionStrategy = exports.ConnectionError = exports.ConnectionErrors = exports.LogTraceNotification = exports.SetTraceNotification = exports.TraceFormat = exports.TraceValues = exports.TraceValue = exports.Trace = exports.NullLogger = exports.ProgressType = exports.ProgressToken = void 0;
+    exports.createMessageConnection = createMessageConnection2;
+    var ral_1 = __importDefault(require_ral());
+    var Is = __importStar(require_is());
     var messages_1 = require_messages();
     var linkedMap_1 = require_linkedMap();
     var events_1 = require_events();
@@ -1569,6 +1927,12 @@ var require_connection = __commonJS({
       ProgressNotification2.type = new messages_1.NotificationType("$/progress");
     })(ProgressNotification || (ProgressNotification = {}));
     var ProgressType = class {
+      /**
+       * Clients must not use these properties. They are here to ensure correct typing.
+       * in TypeScript
+       */
+      __;
+      _pr;
       constructor() {
       }
     };
@@ -1597,13 +1961,14 @@ var require_connection = __commonJS({
       Trace2[Trace2["Compact"] = 2] = "Compact";
       Trace2[Trace2["Verbose"] = 3] = "Verbose";
     })(Trace || (exports.Trace = Trace = {}));
-    var TraceValues;
-    (function(TraceValues2) {
-      TraceValues2.Off = "off";
-      TraceValues2.Messages = "messages";
-      TraceValues2.Compact = "compact";
-      TraceValues2.Verbose = "verbose";
-    })(TraceValues || (exports.TraceValues = TraceValues = {}));
+    var TraceValue;
+    (function(TraceValue2) {
+      TraceValue2.Off = "off";
+      TraceValue2.Messages = "messages";
+      TraceValue2.Compact = "compact";
+      TraceValue2.Verbose = "verbose";
+    })(TraceValue || (exports.TraceValue = TraceValue = {}));
+    exports.TraceValues = TraceValue;
     (function(Trace2) {
       function fromString(value) {
         if (!Is.string(value)) {
@@ -1674,6 +2039,7 @@ var require_connection = __commonJS({
       ConnectionErrors2[ConnectionErrors2["AlreadyListening"] = 3] = "AlreadyListening";
     })(ConnectionErrors || (exports.ConnectionErrors = ConnectionErrors = {}));
     var ConnectionError = class _ConnectionError extends Error {
+      code;
       constructor(code, message) {
         super(message);
         this.code = code;
@@ -1756,7 +2122,7 @@ var require_connection = __commonJS({
     (function(ConnectionOptions2) {
       function is(value) {
         const candidate = value;
-        return candidate && (CancellationStrategy.is(candidate.cancellationStrategy) || ConnectionStrategy.is(candidate.connectionStrategy) || MessageStrategy.is(candidate.messageStrategy));
+        return candidate && (CancellationStrategy.is(candidate.cancellationStrategy) || ConnectionStrategy.is(candidate.connectionStrategy) || MessageStrategy.is(candidate.messageStrategy) || Is.number(candidate.maxParallelism));
       }
       ConnectionOptions2.is = is;
     })(ConnectionOptions || (exports.ConnectionOptions = ConnectionOptions = {}));
@@ -1773,6 +2139,8 @@ var require_connection = __commonJS({
       let notificationSequenceNumber = 0;
       let unknownResponseSequenceNumber = 0;
       const version2 = "2.0";
+      const maxParallelism = options?.maxParallelism ?? -1;
+      let inFlight = 0;
       let starRequestHandler = void 0;
       const requestHandlers = /* @__PURE__ */ new Map();
       let starNotificationHandler = void 0;
@@ -1793,31 +2161,6 @@ var require_connection = __commonJS({
       const unhandledProgressEmitter = new events_1.Emitter();
       const disposeEmitter = new events_1.Emitter();
       const cancellationStrategy = options && options.cancellationStrategy ? options.cancellationStrategy : CancellationStrategy.Message;
-      function createRequestQueueKey(id) {
-        if (id === null) {
-          throw new Error(`Can't send requests with id null since the response can't be correlated.`);
-        }
-        return "req-" + id.toString();
-      }
-      function createResponseQueueKey(id) {
-        if (id === null) {
-          return "res-unknown-" + (++unknownResponseSequenceNumber).toString();
-        } else {
-          return "res-" + id.toString();
-        }
-      }
-      function createNotificationQueueKey() {
-        return "not-" + (++notificationSequenceNumber).toString();
-      }
-      function addMessageToQueue(queue, message) {
-        if (messages_1.Message.isRequest(message)) {
-          queue.set(createRequestQueueKey(message.id), message);
-        } else if (messages_1.Message.isResponse(message)) {
-          queue.set(createResponseQueueKey(message.id), message);
-        } else {
-          queue.set(createNotificationQueueKey(), message);
-        }
-      }
       function cancelUndispatched(_message) {
         return void 0;
       }
@@ -1846,40 +2189,86 @@ var require_connection = __commonJS({
       messageReader.onError(readErrorHandler);
       messageWriter.onClose(closeHandler);
       messageWriter.onError(writeErrorHandler);
+      function createRequestQueueKey(id) {
+        if (id === null) {
+          throw new Error(`Can't send requests with id null since the response can't be correlated.`);
+        }
+        return "req-" + id.toString();
+      }
+      function createResponseQueueKey(id) {
+        if (id === null) {
+          return "res-unknown-" + (++unknownResponseSequenceNumber).toString();
+        } else {
+          return "res-" + id.toString();
+        }
+      }
+      function createNotificationQueueKey() {
+        return "not-" + (++notificationSequenceNumber).toString();
+      }
+      function addMessageToQueue(queue, message) {
+        if (messages_1.Message.isRequest(message)) {
+          queue.set(createRequestQueueKey(message.id), message);
+        } else if (messages_1.Message.isResponse(message)) {
+          if (maxParallelism === -1) {
+            queue.set(createResponseQueueKey(message.id), message);
+          } else {
+            handleResponse(message);
+          }
+        } else {
+          queue.set(createNotificationQueueKey(), message);
+        }
+      }
       function triggerMessageQueue() {
         if (timer || messageQueue.size === 0) {
           return;
         }
-        timer = (0, ral_1.default)().timer.setImmediate(() => {
+        if (maxParallelism !== -1 && inFlight >= maxParallelism) {
+          return;
+        }
+        timer = (0, ral_1.default)().timer.setImmediate(async () => {
           timer = void 0;
-          processMessageQueue();
+          if (messageQueue.size === 0) {
+            return;
+          }
+          if (maxParallelism !== -1 && inFlight >= maxParallelism) {
+            return;
+          }
+          const message = messageQueue.shift();
+          let result;
+          try {
+            inFlight++;
+            const messageStrategy = options?.messageStrategy;
+            if (MessageStrategy.is(messageStrategy)) {
+              result = messageStrategy.handleMessage(message, handleMessage);
+            } else {
+              result = handleMessage(message);
+            }
+          } catch (error51) {
+            logger2.error(`Processing message queue failed: ${error51.toString()}`);
+          } finally {
+            if (result instanceof Promise) {
+              result.then(() => {
+                inFlight--;
+                triggerMessageQueue();
+              }).catch((error51) => {
+                logger2.error(`Processing message queue failed: ${error51.toString()}`);
+              });
+            } else {
+              inFlight--;
+            }
+            triggerMessageQueue();
+          }
         });
       }
-      function handleMessage(message) {
+      async function handleMessage(message) {
         if (messages_1.Message.isRequest(message)) {
-          handleRequest(message);
+          return handleRequest(message);
         } else if (messages_1.Message.isNotification(message)) {
-          handleNotification(message);
+          return handleNotification(message);
         } else if (messages_1.Message.isResponse(message)) {
-          handleResponse(message);
+          return handleResponse(message);
         } else {
-          handleInvalidMessage(message);
-        }
-      }
-      function processMessageQueue() {
-        if (messageQueue.size === 0) {
-          return;
-        }
-        const message = messageQueue.shift();
-        try {
-          const messageStrategy = options?.messageStrategy;
-          if (MessageStrategy.is(messageStrategy)) {
-            messageStrategy.handleMessage(message, handleMessage);
-          } else {
-            handleMessage(message);
-          }
-        } finally {
-          triggerMessageQueue();
+          return handleInvalidMessage(message);
         }
       }
       const callback = (message) => {
@@ -1914,9 +2303,9 @@ var require_connection = __commonJS({
           triggerMessageQueue();
         }
       };
-      function handleRequest(requestMessage) {
+      async function handleRequest(requestMessage) {
         if (isDisposed()) {
-          return;
+          return Promise.resolve();
         }
         function reply(resultOrError, method, startTime2) {
           const message = {
@@ -1929,7 +2318,7 @@ var require_connection = __commonJS({
             message.result = resultOrError === void 0 ? null : resultOrError;
           }
           traceSendingResponse(message, method, startTime2);
-          messageWriter.write(message).catch(() => logger2.error(`Sending response failed.`));
+          return messageWriter.write(message);
         }
         function replyError(error51, method, startTime2) {
           const message = {
@@ -1938,19 +2327,7 @@ var require_connection = __commonJS({
             error: error51.toJson()
           };
           traceSendingResponse(message, method, startTime2);
-          messageWriter.write(message).catch(() => logger2.error(`Sending response failed.`));
-        }
-        function replySuccess(result, method, startTime2) {
-          if (result === void 0) {
-            result = null;
-          }
-          const message = {
-            jsonrpc: version2,
-            id: requestMessage.id,
-            result
-          };
-          traceSendingResponse(message, method, startTime2);
-          messageWriter.write(message).catch(() => logger2.error(`Sending response failed.`));
+          return messageWriter.write(message);
         }
         traceReceivedRequest(requestMessage);
         const element = requestHandlers.get(requestMessage.method);
@@ -1975,60 +2352,38 @@ var require_connection = __commonJS({
             if (requestHandler) {
               if (requestMessage.params === void 0) {
                 if (type !== void 0 && type.numberOfParams !== 0) {
-                  replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InvalidParams, `Request ${requestMessage.method} defines ${type.numberOfParams} params but received none.`), requestMessage.method, startTime);
-                  return;
+                  return replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InvalidParams, `Request ${requestMessage.method} defines ${type.numberOfParams} params but received none.`), requestMessage.method, startTime);
                 }
                 handlerResult = requestHandler(cancellationSource.token);
               } else if (Array.isArray(requestMessage.params)) {
                 if (type !== void 0 && type.parameterStructures === messages_1.ParameterStructures.byName) {
-                  replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InvalidParams, `Request ${requestMessage.method} defines parameters by name but received parameters by position`), requestMessage.method, startTime);
-                  return;
+                  return replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InvalidParams, `Request ${requestMessage.method} defines parameters by name but received parameters by position`), requestMessage.method, startTime);
                 }
                 handlerResult = requestHandler(...requestMessage.params, cancellationSource.token);
               } else {
                 if (type !== void 0 && type.parameterStructures === messages_1.ParameterStructures.byPosition) {
-                  replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InvalidParams, `Request ${requestMessage.method} defines parameters by position but received parameters by name`), requestMessage.method, startTime);
-                  return;
+                  return replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InvalidParams, `Request ${requestMessage.method} defines parameters by position but received parameters by name`), requestMessage.method, startTime);
                 }
                 handlerResult = requestHandler(requestMessage.params, cancellationSource.token);
               }
             } else if (starRequestHandler) {
               handlerResult = starRequestHandler(requestMessage.method, requestMessage.params, cancellationSource.token);
             }
-            const promise2 = handlerResult;
-            if (!handlerResult) {
-              requestTokens.delete(tokenKey);
-              replySuccess(handlerResult, requestMessage.method, startTime);
-            } else if (promise2.then) {
-              promise2.then((resultOrError) => {
-                requestTokens.delete(tokenKey);
-                reply(resultOrError, requestMessage.method, startTime);
-              }, (error51) => {
-                requestTokens.delete(tokenKey);
-                if (error51 instanceof messages_1.ResponseError) {
-                  replyError(error51, requestMessage.method, startTime);
-                } else if (error51 && Is.string(error51.message)) {
-                  replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InternalError, `Request ${requestMessage.method} failed with message: ${error51.message}`), requestMessage.method, startTime);
-                } else {
-                  replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InternalError, `Request ${requestMessage.method} failed unexpectedly without providing any details.`), requestMessage.method, startTime);
-                }
-              });
-            } else {
-              requestTokens.delete(tokenKey);
-              reply(handlerResult, requestMessage.method, startTime);
-            }
+            const resultOrError = await handlerResult;
+            await reply(resultOrError, requestMessage.method, startTime);
           } catch (error51) {
-            requestTokens.delete(tokenKey);
             if (error51 instanceof messages_1.ResponseError) {
-              reply(error51, requestMessage.method, startTime);
+              await reply(error51, requestMessage.method, startTime);
             } else if (error51 && Is.string(error51.message)) {
-              replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InternalError, `Request ${requestMessage.method} failed with message: ${error51.message}`), requestMessage.method, startTime);
+              await replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InternalError, `Request ${requestMessage.method} failed with message: ${error51.message}`), requestMessage.method, startTime);
             } else {
-              replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InternalError, `Request ${requestMessage.method} failed unexpectedly without providing any details.`), requestMessage.method, startTime);
+              await replyError(new messages_1.ResponseError(messages_1.ErrorCodes.InternalError, `Request ${requestMessage.method} failed unexpectedly without providing any details.`), requestMessage.method, startTime);
             }
+          } finally {
+            requestTokens.delete(tokenKey);
           }
         } else {
-          replyError(new messages_1.ResponseError(messages_1.ErrorCodes.MethodNotFound, `Unhandled method ${requestMessage.method}`), requestMessage.method, startTime);
+          await replyError(new messages_1.ResponseError(messages_1.ErrorCodes.MethodNotFound, `Unhandled method ${requestMessage.method}`), requestMessage.method, startTime);
         }
       }
       function handleResponse(responseMessage) {
@@ -2067,7 +2422,7 @@ ${JSON.stringify(responseMessage.error, void 0, 4)}`);
           }
         }
       }
-      function handleNotification(message) {
+      async function handleNotification(message) {
         if (isDisposed()) {
           return;
         }
@@ -2095,11 +2450,11 @@ ${JSON.stringify(responseMessage.error, void 0, 4)}`);
                     logger2.error(`Notification ${message.method} defines ${type.numberOfParams} params but received none.`);
                   }
                 }
-                notificationHandler();
+                await notificationHandler();
               } else if (Array.isArray(message.params)) {
                 const params = message.params;
                 if (message.method === ProgressNotification.type.method && params.length === 2 && ProgressToken.is(params[0])) {
-                  notificationHandler({ token: params[0], value: params[1] });
+                  await notificationHandler({ token: params[0], value: params[1] });
                 } else {
                   if (type !== void 0) {
                     if (type.parameterStructures === messages_1.ParameterStructures.byName) {
@@ -2109,16 +2464,16 @@ ${JSON.stringify(responseMessage.error, void 0, 4)}`);
                       logger2.error(`Notification ${message.method} defines ${type.numberOfParams} params but received ${params.length} arguments`);
                     }
                   }
-                  notificationHandler(...params);
+                  await notificationHandler(...params);
                 }
               } else {
                 if (type !== void 0 && type.parameterStructures === messages_1.ParameterStructures.byPosition) {
                   logger2.error(`Notification ${message.method} defines parameters by position but received parameters by name`);
                 }
-                notificationHandler(message.params);
+                await notificationHandler(message.params);
               }
             } else if (starNotificationHandler) {
-              starNotificationHandler(message.method, message.params);
+              await starNotificationHandler(message.method, message.params);
             }
           } catch (error51) {
             if (error51.message) {
@@ -2167,9 +2522,7 @@ ${JSON.stringify(message, null, 4)}`);
         if (traceFormat === TraceFormat.Text) {
           let data = void 0;
           if ((trace === Trace.Verbose || trace === Trace.Compact) && message.params) {
-            data = `Params: ${stringifyTrace(message.params)}
-
-`;
+            data = `Params: ${stringifyTrace(message.params)}`;
           }
           tracer.log(`Sending request '${message.method} - (${message.id})'.`, data);
         } else {
@@ -2184,11 +2537,9 @@ ${JSON.stringify(message, null, 4)}`);
           let data = void 0;
           if (trace === Trace.Verbose || trace === Trace.Compact) {
             if (message.params) {
-              data = `Params: ${stringifyTrace(message.params)}
-
-`;
+              data = `Params: ${stringifyTrace(message.params)}`;
             } else {
-              data = "No parameters provided.\n\n";
+              data = "No parameters provided.";
             }
           }
           tracer.log(`Sending notification '${message.method}'.`, data);
@@ -2204,16 +2555,12 @@ ${JSON.stringify(message, null, 4)}`);
           let data = void 0;
           if (trace === Trace.Verbose || trace === Trace.Compact) {
             if (message.error && message.error.data) {
-              data = `Error data: ${stringifyTrace(message.error.data)}
-
-`;
+              data = `Error data: ${stringifyTrace(message.error.data)}`;
             } else {
               if (message.result) {
-                data = `Result: ${stringifyTrace(message.result)}
-
-`;
+                data = `Result: ${stringifyTrace(message.result)}`;
               } else if (message.error === void 0) {
-                data = "No result returned.\n\n";
+                data = "No result returned.";
               }
             }
           }
@@ -2229,9 +2576,7 @@ ${JSON.stringify(message, null, 4)}`);
         if (traceFormat === TraceFormat.Text) {
           let data = void 0;
           if ((trace === Trace.Verbose || trace === Trace.Compact) && message.params) {
-            data = `Params: ${stringifyTrace(message.params)}
-
-`;
+            data = `Params: ${stringifyTrace(message.params)}`;
           }
           tracer.log(`Received request '${message.method} - (${message.id})'.`, data);
         } else {
@@ -2246,11 +2591,9 @@ ${JSON.stringify(message, null, 4)}`);
           let data = void 0;
           if (trace === Trace.Verbose || trace === Trace.Compact) {
             if (message.params) {
-              data = `Params: ${stringifyTrace(message.params)}
-
-`;
+              data = `Params: ${stringifyTrace(message.params)}`;
             } else {
-              data = "No parameters provided.\n\n";
+              data = "No parameters provided.";
             }
           }
           tracer.log(`Received notification '${message.method}'.`, data);
@@ -2266,16 +2609,12 @@ ${JSON.stringify(message, null, 4)}`);
           let data = void 0;
           if (trace === Trace.Verbose || trace === Trace.Compact) {
             if (message.error && message.error.data) {
-              data = `Error data: ${stringifyTrace(message.error.data)}
-
-`;
+              data = `Error data: ${stringifyTrace(message.error.data)}`;
             } else {
               if (message.result) {
-                data = `Result: ${stringifyTrace(message.result)}
-
-`;
+                data = `Result: ${stringifyTrace(message.result)}`;
               } else if (message.error === void 0) {
-                data = "No result returned.\n\n";
+                data = "No result returned.";
               }
             }
           }
@@ -2393,7 +2732,7 @@ ${JSON.stringify(message, null, 4)}`);
               paramStart = 1;
               parameterStructures = first;
             }
-            let paramEnd = args.length;
+            const paramEnd = args.length;
             const numberOfParams = paramEnd - paramStart;
             switch (numberOfParams) {
               case 0:
@@ -2442,8 +2781,10 @@ ${JSON.stringify(message, null, 4)}`);
           return {
             dispose: () => {
               if (method !== void 0) {
-                notificationHandlers.delete(method);
-              } else {
+                if (notificationHandlers.get(method)?.handler === handler) {
+                  notificationHandlers.delete(method);
+                }
+              } else if (starNotificationHandler === type) {
                 starNotificationHandler = void 0;
               }
             }
@@ -2456,7 +2797,9 @@ ${JSON.stringify(message, null, 4)}`);
           progressHandlers.set(token, handler);
           return {
             dispose: () => {
-              progressHandlers.delete(token);
+              if (progressHandlers.get(token) === handler) {
+                progressHandlers.delete(token);
+              }
             }
           };
         },
@@ -2467,6 +2810,16 @@ ${JSON.stringify(message, null, 4)}`);
         sendRequest: (type, ...args) => {
           throwIfClosedOrDisposed();
           throwIfNotListening();
+          function sendCancellation(connection2, id2) {
+            const p = cancellationStrategy.sender.sendCancellation(connection2, id2);
+            if (p === void 0) {
+              logger2.log(`Received no promise from cancellation strategy when cancelling id ${id2}`);
+            } else {
+              p.catch(() => {
+                logger2.log(`Sending cancellation messages for id ${id2} failed.`);
+              });
+            }
+          }
           let method;
           let messageParams;
           let token = void 0;
@@ -2509,18 +2862,15 @@ ${JSON.stringify(message, null, 4)}`);
           }
           const id = sequenceNumber++;
           let disposable;
-          if (token) {
-            disposable = token.onCancellationRequested(() => {
-              const p = cancellationStrategy.sender.sendCancellation(connection, id);
-              if (p === void 0) {
-                logger2.log(`Received no promise from cancellation strategy when cancelling id ${id}`);
-                return Promise.resolve();
-              } else {
-                return p.catch(() => {
-                  logger2.log(`Sending cancellation messages for id ${id} failed`);
-                });
-              }
-            });
+          let tokenWasCancelled = false;
+          if (token !== void 0) {
+            if (token.isCancellationRequested) {
+              tokenWasCancelled = true;
+            } else {
+              disposable = token.onCancellationRequested(() => {
+                sendCancellation(connection, id);
+              });
+            }
           }
           const requestMessage = {
             jsonrpc: version2,
@@ -2547,6 +2897,9 @@ ${JSON.stringify(message, null, 4)}`);
             try {
               responsePromises.set(id, responsePromise);
               await messageWriter.write(requestMessage);
+              if (tokenWasCancelled) {
+                sendCancellation(connection, id);
+              }
             } catch (error51) {
               responsePromises.delete(id);
               responsePromise.reject(new messages_1.ResponseError(messages_1.ErrorCodes.MessageWriteError, error51.message ? error51.message : "Unknown reason"));
@@ -2579,8 +2932,10 @@ ${JSON.stringify(message, null, 4)}`);
                 return;
               }
               if (method !== void 0) {
-                requestHandlers.delete(method);
-              } else {
+                if (requestHandlers.get(method)?.handler === handler) {
+                  requestHandlers.delete(method);
+                }
+              } else if (starRequestHandler === type) {
                 starRequestHandler = void 0;
               }
             }
@@ -2656,17 +3011,16 @@ ${JSON.stringify(message, null, 4)}`);
         const verbose = trace === Trace.Verbose || trace === Trace.Compact;
         tracer.log(params.message, verbose ? params.verbose : void 0);
       });
-      connection.onNotification(ProgressNotification.type, (params) => {
+      connection.onNotification(ProgressNotification.type, async (params) => {
         const handler = progressHandlers.get(params.token);
         if (handler) {
-          handler(params.value);
+          await handler(params.value);
         } else {
           unhandledProgressEmitter.fire(params);
         }
       });
       return connection;
     }
-    exports.createMessageConnection = createMessageConnection2;
   }
 });
 
@@ -2674,9 +3028,12 @@ ${JSON.stringify(message, null, 4)}`);
 var require_api = __commonJS({
   "node_modules/vscode-jsonrpc/lib/common/api.js"(exports) {
     "use strict";
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ProgressType = exports.ProgressToken = exports.createMessageConnection = exports.NullLogger = exports.ConnectionOptions = exports.ConnectionStrategy = exports.AbstractMessageBuffer = exports.WriteableStreamMessageWriter = exports.AbstractMessageWriter = exports.MessageWriter = exports.ReadableStreamMessageReader = exports.AbstractMessageReader = exports.MessageReader = exports.SharedArrayReceiverStrategy = exports.SharedArraySenderStrategy = exports.CancellationToken = exports.CancellationTokenSource = exports.Emitter = exports.Event = exports.Disposable = exports.LRUCache = exports.Touch = exports.LinkedMap = exports.ParameterStructures = exports.NotificationType9 = exports.NotificationType8 = exports.NotificationType7 = exports.NotificationType6 = exports.NotificationType5 = exports.NotificationType4 = exports.NotificationType3 = exports.NotificationType2 = exports.NotificationType1 = exports.NotificationType0 = exports.NotificationType = exports.ErrorCodes = exports.ResponseError = exports.RequestType9 = exports.RequestType8 = exports.RequestType7 = exports.RequestType6 = exports.RequestType5 = exports.RequestType4 = exports.RequestType3 = exports.RequestType2 = exports.RequestType1 = exports.RequestType0 = exports.RequestType = exports.Message = exports.RAL = void 0;
-    exports.MessageStrategy = exports.CancellationStrategy = exports.CancellationSenderStrategy = exports.CancellationReceiverStrategy = exports.ConnectionError = exports.ConnectionErrors = exports.LogTraceNotification = exports.SetTraceNotification = exports.TraceFormat = exports.TraceValues = exports.Trace = void 0;
+    exports.MessageStrategy = exports.CancellationStrategy = exports.CancellationSenderStrategy = exports.RequestCancellationReceiverStrategy = exports.IdCancellationReceiverStrategy = exports.CancellationReceiverStrategy = exports.ConnectionError = exports.ConnectionErrors = exports.LogTraceNotification = exports.SetTraceNotification = exports.TraceFormat = exports.TraceValues = exports.TraceValue = exports.Trace = void 0;
     var messages_1 = require_messages();
     Object.defineProperty(exports, "Message", { enumerable: true, get: function() {
       return messages_1.Message;
@@ -2837,8 +3194,8 @@ var require_api = __commonJS({
     Object.defineProperty(exports, "Trace", { enumerable: true, get: function() {
       return connection_1.Trace;
     } });
-    Object.defineProperty(exports, "TraceValues", { enumerable: true, get: function() {
-      return connection_1.TraceValues;
+    Object.defineProperty(exports, "TraceValue", { enumerable: true, get: function() {
+      return connection_1.TraceValue;
     } });
     Object.defineProperty(exports, "TraceFormat", { enumerable: true, get: function() {
       return connection_1.TraceFormat;
@@ -2858,6 +3215,12 @@ var require_api = __commonJS({
     Object.defineProperty(exports, "CancellationReceiverStrategy", { enumerable: true, get: function() {
       return connection_1.CancellationReceiverStrategy;
     } });
+    Object.defineProperty(exports, "IdCancellationReceiverStrategy", { enumerable: true, get: function() {
+      return connection_1.IdCancellationReceiverStrategy;
+    } });
+    Object.defineProperty(exports, "RequestCancellationReceiverStrategy", { enumerable: true, get: function() {
+      return connection_1.RequestCancellationReceiverStrategy;
+    } });
     Object.defineProperty(exports, "CancellationSenderStrategy", { enumerable: true, get: function() {
       return connection_1.CancellationSenderStrategy;
     } });
@@ -2867,7 +3230,10 @@ var require_api = __commonJS({
     Object.defineProperty(exports, "MessageStrategy", { enumerable: true, get: function() {
       return connection_1.MessageStrategy;
     } });
-    var ral_1 = require_ral();
+    Object.defineProperty(exports, "TraceValues", { enumerable: true, get: function() {
+      return connection_1.TraceValues;
+    } });
+    var ral_1 = __importDefault(require_ral());
     exports.RAL = ral_1.default;
   }
 });
@@ -2880,6 +3246,7 @@ var require_ril = __commonJS({
     var util_1 = __require("util");
     var api_1 = require_api();
     var MessageBuffer = class _MessageBuffer extends api_1.AbstractMessageBuffer {
+      static emptyBuffer = Buffer.allocUnsafe(0);
       constructor(encoding = "utf-8") {
         super(encoding);
       }
@@ -2907,8 +3274,8 @@ var require_ril = __commonJS({
         return Buffer.allocUnsafe(length);
       }
     };
-    MessageBuffer.emptyBuffer = Buffer.allocUnsafe(0);
     var ReadableStreamWrapper = class {
+      stream;
       constructor(stream) {
         this.stream = stream;
       }
@@ -2930,6 +3297,7 @@ var require_ril = __commonJS({
       }
     };
     var WritableStreamWrapper = class {
+      stream;
       constructor(stream) {
         this.stream = stream;
       }
@@ -3045,24 +3413,59 @@ var require_main = __commonJS({
       if (k2 === void 0) k2 = k;
       o[k2] = m[k];
     }));
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
     var __exportStar = exports && exports.__exportStar || function(m, exports2) {
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports2, p)) __createBinding(exports2, m, p);
     };
+    var __importDefault = exports && exports.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.createMessageConnection = exports.createServerSocketTransport = exports.createClientSocketTransport = exports.createServerPipeTransport = exports.createClientPipeTransport = exports.generateRandomPipeName = exports.StreamMessageWriter = exports.StreamMessageReader = exports.SocketMessageWriter = exports.SocketMessageReader = exports.PortMessageWriter = exports.PortMessageReader = exports.IPCMessageWriter = exports.IPCMessageReader = void 0;
-    var ril_1 = require_ril();
+    exports.StreamMessageWriter = exports.StreamMessageReader = exports.SocketMessageWriter = exports.SocketMessageReader = exports.PortMessageWriter = exports.PortMessageReader = exports.IPCMessageWriter = exports.IPCMessageReader = void 0;
+    exports.generateRandomPipeName = generateRandomPipeName;
+    exports.createClientPipeTransport = createClientPipeTransport;
+    exports.createServerPipeTransport = createServerPipeTransport;
+    exports.createClientSocketTransport = createClientSocketTransport;
+    exports.createServerSocketTransport = createServerSocketTransport;
+    exports.createMessageConnection = createMessageConnection2;
+    var ril_1 = __importDefault(require_ril());
     ril_1.default.install();
-    var path6 = __require("path");
-    var os2 = __require("os");
+    var path6 = __importStar(__require("path"));
+    var os2 = __importStar(__require("os"));
+    var fs7 = __importStar(__require("fs"));
     var crypto_1 = __require("crypto");
     var net_1 = __require("net");
     var api_1 = require_api();
     __exportStar(require_api(), exports);
     var IPCMessageReader = class extends api_1.AbstractMessageReader {
+      process;
       constructor(process10) {
         super();
         this.process = process10;
-        let eventEmitter = this.process;
+        const eventEmitter = this.process;
         eventEmitter.on("error", (error51) => this.fireError(error51));
         eventEmitter.on("close", () => this.fireClose());
       }
@@ -3073,6 +3476,8 @@ var require_main = __commonJS({
     };
     exports.IPCMessageReader = IPCMessageReader;
     var IPCMessageWriter = class extends api_1.AbstractMessageWriter {
+      process;
+      errorCount;
       constructor(process10) {
         super();
         this.process = process10;
@@ -3108,6 +3513,7 @@ var require_main = __commonJS({
     };
     exports.IPCMessageWriter = IPCMessageWriter;
     var PortMessageReader = class extends api_1.AbstractMessageReader {
+      onData;
       constructor(port) {
         super();
         this.onData = new api_1.Emitter();
@@ -3123,6 +3529,8 @@ var require_main = __commonJS({
     };
     exports.PortMessageReader = PortMessageReader;
     var PortMessageWriter = class extends api_1.AbstractMessageWriter {
+      port;
+      errorCount;
       constructor(port) {
         super();
         this.port = port;
@@ -3154,6 +3562,7 @@ var require_main = __commonJS({
     };
     exports.SocketMessageReader = SocketMessageReader;
     var SocketMessageWriter = class extends api_1.WriteableStreamMessageWriter {
+      socket;
       constructor(socket, options) {
         super((0, ril_1.default)().stream.asWritableStream(socket), options);
         this.socket = socket;
@@ -3179,33 +3588,32 @@ var require_main = __commonJS({
     var XDG_RUNTIME_DIR = process.env["XDG_RUNTIME_DIR"];
     var safeIpcPathLengths = /* @__PURE__ */ new Map([
       ["linux", 107],
-      ["darwin", 103]
+      ["darwin", 102]
     ]);
     function generateRandomPipeName() {
-      const randomSuffix = (0, crypto_1.randomBytes)(21).toString("hex");
       if (process.platform === "win32") {
-        return `\\\\.\\pipe\\vscode-jsonrpc-${randomSuffix}-sock`;
-      }
-      let result;
-      if (XDG_RUNTIME_DIR) {
-        result = path6.join(XDG_RUNTIME_DIR, `vscode-ipc-${randomSuffix}.sock`);
-      } else {
-        result = path6.join(os2.tmpdir(), `vscode-${randomSuffix}.sock`);
+        return `\\\\.\\pipe\\lsp-${(0, crypto_1.randomBytes)(16).toString("hex")}-sock`;
       }
+      let randomLength = 32;
+      const fixedLength = "/lsp-.sock".length;
+      const tmpDir = fs7.realpathSync(XDG_RUNTIME_DIR ?? os2.tmpdir());
       const limit = safeIpcPathLengths.get(process.platform);
-      if (limit !== void 0 && result.length > limit) {
-        (0, ril_1.default)().console.warn(`WARNING: IPC handle "${result}" is longer than ${limit} characters.`);
+      if (limit !== void 0) {
+        randomLength = Math.min(limit - tmpDir.length - fixedLength, randomLength);
       }
-      return result;
+      if (randomLength < 16) {
+        throw new Error(`Unable to generate a random pipe name with ${randomLength} characters.`);
+      }
+      const randomSuffix = (0, crypto_1.randomBytes)(Math.floor(randomLength / 2)).toString("hex");
+      return path6.join(tmpDir, `lsp-${randomSuffix}.sock`);
     }
-    exports.generateRandomPipeName = generateRandomPipeName;
     function createClientPipeTransport(pipeName, encoding = "utf-8") {
       let connectResolve;
       const connected = new Promise((resolve, _reject) => {
         connectResolve = resolve;
       });
       return new Promise((resolve, reject) => {
-        let server = (0, net_1.createServer)((socket) => {
+        const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
             new SocketMessageReader(socket, encoding),
@@ -3223,7 +3631,6 @@ var require_main = __commonJS({
         });
       });
     }
-    exports.createClientPipeTransport = createClientPipeTransport;
     function createServerPipeTransport(pipeName, encoding = "utf-8") {
       const socket = (0, net_1.createConnection)(pipeName);
       return [
@@ -3231,7 +3638,6 @@ var require_main = __commonJS({
         new SocketMessageWriter(socket, encoding)
       ];
     }
-    exports.createServerPipeTransport = createServerPipeTransport;
     function createClientSocketTransport(port, encoding = "utf-8") {
       let connectResolve;
       const connected = new Promise((resolve, _reject) => {
@@ -3256,7 +3662,6 @@ var require_main = __commonJS({
         });
       });
     }
-    exports.createClientSocketTransport = createClientSocketTransport;
     function createServerSocketTransport(port, encoding = "utf-8") {
       const socket = (0, net_1.createConnection)(port, "127.0.0.1");
       return [
@@ -3264,7 +3669,6 @@ var require_main = __commonJS({
         new SocketMessageWriter(socket, encoding)
       ];
     }
-    exports.createServerSocketTransport = createServerSocketTransport;
     function isReadableStream(value) {
       const candidate = value;
       return candidate.read !== void 0 && candidate.addListener !== void 0;
@@ -3284,15 +3688,6 @@ var require_main = __commonJS({
       }
       return (0, api_1.createMessageConnection)(reader, writer, logger2, options);
     }
-    exports.createMessageConnection = createMessageConnection2;
-  }
-});
-
-// node_modules/vscode-jsonrpc/node.js
-var require_node = __commonJS({
-  "node_modules/vscode-jsonrpc/node.js"(exports, module) {
-    "use strict";
-    module.exports = require_main();
   }
 });
 
@@ -20352,9 +20747,20 @@ var methods = {
 var startActiveSession = /* @__PURE__ */ Symbol("startActiveSession");
 var AcpContext = class {
   cx;
+  currentRequestId;
   /** @internal */
-  constructor(cx) {
+  constructor(cx, currentRequestId) {
     this.cx = cx;
+    this.currentRequestId = currentRequestId;
+  }
+  /**
+   * JSON-RPC id of the request currently being handled.
+   *
+   * This is `undefined` for notification handlers and for contexts created
+   * outside an inbound request, such as `connect(...)` and `connectWith(...)`.
+   */
+  get requestId() {
+    return this.currentRequestId;
   }
   /** @internal */
   get connectionContext() {
@@ -20374,12 +20780,12 @@ var AcpContext = class {
   }
 };
 var AgentContext = class _AgentContext extends AcpContext {
-  constructor(cx) {
-    super(cx);
+  constructor(cx, requestId) {
+    super(cx, requestId);
   }
   /** @internal */
-  static create(cx) {
-    return new _AgentContext(cx);
+  static create(cx, requestId) {
+    return new _AgentContext(cx, requestId);
   }
   request(method, params, options) {
     const spec = clientRequestSpecsByMethod[method];
@@ -20390,12 +20796,12 @@ var AgentContext = class _AgentContext extends AcpContext {
   }
 };
 var ClientContext = class _ClientContext extends AcpContext {
-  constructor(cx) {
-    super(cx);
+  constructor(cx, requestId) {
+    super(cx, requestId);
   }
   /** @internal */
-  static create(cx) {
-    return new _ClientContext(cx);
+  static create(cx, requestId) {
+    return new _ClientContext(cx, requestId);
   }
   /** @internal */
   [startActiveSession](params, options) {
@@ -20764,7 +21170,7 @@ function notificationSpec(method, params) {
 }
 function registerAppRequest(builder, spec, context, handler) {
   builder.onReceiveRequest(spec.method, (params) => parseParams(spec.params, params), async (params, responder, cx) => {
-    const response = await handler(context(params, cx, responder.signal));
+    const response = await handler(context(params, cx, responder.signal, responder.id));
     await responder.respond(spec.mapResponse ? spec.mapResponse(response) : response);
   });
 }
@@ -20828,14 +21234,30 @@ var agentRequestSpecsByMethod = specsByMethod(agentRequestSpecs);
 var agentNotificationSpecsByMethod = specsByMethod(agentNotificationSpecs);
 var clientRequestSpecsByMethod = specsByMethod(clientRequestSpecs);
 var clientNotificationSpecsByMethod = specsByMethod(clientNotificationSpecs);
-function agentHandlerContext(params, client, signal) {
+function agentRequestContext(params, client, signal, requestId) {
+  return {
+    params,
+    requestId,
+    signal,
+    client
+  };
+}
+function agentNotificationContext(params, client, signal) {
   return {
     params,
     signal,
     client
   };
 }
-function clientHandlerContext(params, agent2, signal) {
+function clientRequestContext(params, agent2, signal, requestId) {
+  return {
+    params,
+    requestId,
+    signal,
+    agent: agent2
+  };
+}
+function clientNotificationContext(params, agent2, signal) {
   return {
     params,
     signal,
@@ -20957,11 +21379,11 @@ var AgentApp = class {
     return this.notification(spec, handlerOrParams);
   }
   request(spec, handler) {
-    registerAppRequest(this.builder, spec, (params, cx, signal) => agentHandlerContext(params, AgentContext.create(cx), signal), handler);
+    registerAppRequest(this.builder, spec, (params, cx, signal, requestId) => agentRequestContext(params, AgentContext.create(cx, requestId), signal, requestId), handler);
     return this;
   }
   notification(spec, handler) {
-    registerAppNotification(this.builder, spec, (params, cx, signal) => agentHandlerContext(params, AgentContext.create(cx), signal), handler);
+    registerAppNotification(this.builder, spec, (params, cx, signal) => agentNotificationContext(params, AgentContext.create(cx), signal), handler);
     return this;
   }
   connectConnection(target, options = {}) {
@@ -21054,11 +21476,11 @@ var ClientApp = class {
     return this.notification(spec, handlerOrParams);
   }
   request(spec, handler) {
-    registerAppRequest(this.builder, spec, (params, cx, signal) => clientHandlerContext(params, ClientContext.create(cx), signal), handler);
+    registerAppRequest(this.builder, spec, (params, cx, signal, requestId) => clientRequestContext(params, ClientContext.create(cx, requestId), signal, requestId), handler);
     return this;
   }
   notification(spec, handler) {
-    registerAppNotification(this.builder, spec, (params, cx, signal) => clientHandlerContext(params, ClientContext.create(cx), signal), handler);
+    registerAppNotification(this.builder, spec, (params, cx, signal) => clientNotificationContext(params, ClientContext.create(cx), signal), handler);
     return this;
   }
   connectConnection(target) {
@@ -21139,13 +21561,12 @@ var legacyClientNotificationMethods = /* @__PURE__ */ new Set([
 ]);
 
 // src/CodexJsonRpcConnection.ts
-var rpc = __toESM(require_node(), 1);
+var rpc = __toESM(require_main(), 1);
 import { spawn } from "node:child_process";
 import { createRequire } from "node:module";
 
 // src/StdUtils.ts
-var import_vscode_jsonrpc = __toESM(require_main(), 1);
-var import_node = __toESM(require_node(), 1);
+var import_node = __toESM(require_main(), 1);
 import { Readable, Writable } from "node:stream";
 function createJSONRPCWriter(writable) {
   return {
@@ -21391,43 +21812,271 @@ function isWin(patch) {
 function parsePatch(uniDiff) {
   const diffstr = uniDiff.split(/\n/), list = [];
   let i = 0;
+  function isGitDiffHeader(line) {
+    return /^diff --git /.test(line);
+  }
+  function isDiffHeader(line) {
+    return isGitDiffHeader(line) || /^Index:\s/.test(line) || /^diff(?: -r \w+)+\s/.test(line);
+  }
+  function isFileHeader(line) {
+    return /^(---|\+\+\+)\s/.test(line);
+  }
+  function isHunkHeader(line) {
+    return /^@@\s/.test(line);
+  }
   function parseIndex() {
+    var _a3;
     const index = {};
+    index.hunks = [];
     list.push(index);
+    let seenDiffHeader = false;
     while (i < diffstr.length) {
       const line = diffstr[i];
-      if (/^(---|\+\+\+|@@)\s/.test(line)) {
+      if (isFileHeader(line) || isHunkHeader(line)) {
         break;
       }
-      const headerMatch = /^(?:Index:|diff(?: -r \w+)+)\s+/.exec(line);
-      if (headerMatch) {
-        index.index = line.substring(headerMatch[0].length).trim();
+      if (isGitDiffHeader(line)) {
+        if (seenDiffHeader) {
+          return;
+        }
+        seenDiffHeader = true;
+        index.isGit = true;
+        const paths = parseGitDiffHeader(line);
+        if (paths) {
+          index.oldFileName = paths.oldFileName;
+          index.newFileName = paths.newFileName;
+        }
+        i++;
+        while (i < diffstr.length) {
+          const extLine = diffstr[i];
+          if (isFileHeader(extLine) || isHunkHeader(extLine) || isDiffHeader(extLine)) {
+            break;
+          }
+          const renameFromMatch = /^rename from (.*)/.exec(extLine);
+          if (renameFromMatch) {
+            index.oldFileName = "a/" + unquoteIfQuoted(renameFromMatch[1]);
+            index.isRename = true;
+          }
+          const renameToMatch = /^rename to (.*)/.exec(extLine);
+          if (renameToMatch) {
+            index.newFileName = "b/" + unquoteIfQuoted(renameToMatch[1]);
+            index.isRename = true;
+          }
+          const copyFromMatch = /^copy from (.*)/.exec(extLine);
+          if (copyFromMatch) {
+            index.oldFileName = "a/" + unquoteIfQuoted(copyFromMatch[1]);
+            index.isCopy = true;
+          }
+          const copyToMatch = /^copy to (.*)/.exec(extLine);
+          if (copyToMatch) {
+            index.newFileName = "b/" + unquoteIfQuoted(copyToMatch[1]);
+            index.isCopy = true;
+          }
+          const newFileModeMatch = /^new file mode (\d+)/.exec(extLine);
+          if (newFileModeMatch) {
+            index.isCreate = true;
+            index.newMode = newFileModeMatch[1];
+          }
+          const deletedFileModeMatch = /^deleted file mode (\d+)/.exec(extLine);
+          if (deletedFileModeMatch) {
+            index.isDelete = true;
+            index.oldMode = deletedFileModeMatch[1];
+          }
+          const oldModeMatch = /^old mode (\d+)/.exec(extLine);
+          if (oldModeMatch) {
+            index.oldMode = oldModeMatch[1];
+          }
+          const newModeMatch = /^new mode (\d+)/.exec(extLine);
+          if (newModeMatch) {
+            index.newMode = newModeMatch[1];
+          }
+          if (/^Binary files /.test(extLine)) {
+            index.isBinary = true;
+          }
+          i++;
+        }
+        continue;
+      } else if (isDiffHeader(line)) {
+        if (seenDiffHeader) {
+          return;
+        }
+        seenDiffHeader = true;
+        const headerMatch = /^(?:Index:|diff(?: -r \w+)+)\s+/.exec(line);
+        if (headerMatch) {
+          index.index = line.substring(headerMatch[0].length).trim();
+        }
       }
       i++;
     }
     parseFileHeader(index);
     parseFileHeader(index);
-    index.hunks = [];
+    if (index.oldFileName === void 0 !== (index.newFileName === void 0)) {
+      throw new Error("Missing " + (index.oldFileName !== void 0 ? '"+++ ..."' : '"--- ..."') + " file header for " + ((_a3 = index.oldFileName) !== null && _a3 !== void 0 ? _a3 : index.newFileName));
+    }
     while (i < diffstr.length) {
       const line = diffstr[i];
-      if (/^(Index:\s|diff\s|---\s|\+\+\+\s|===================================================================)/.test(line)) {
+      if (isDiffHeader(line) || isFileHeader(line) || /^===================================================================/.test(line)) {
         break;
-      } else if (/^@@/.test(line)) {
+      } else if (isHunkHeader(line)) {
         index.hunks.push(parseHunk());
-      } else if (line) {
-        throw new Error("Unknown line " + (i + 1) + " " + JSON.stringify(line));
       } else {
         i++;
       }
     }
   }
+  function parseGitDiffHeader(line) {
+    const rest = line.substring("diff --git ".length);
+    if (rest.startsWith('"')) {
+      const oldPath = parseQuotedFileName(rest);
+      if (oldPath === null) {
+        return null;
+      }
+      const afterOld = rest.substring(oldPath.rawLength + 1);
+      let newFileName;
+      if (afterOld.startsWith('"')) {
+        const newPath = parseQuotedFileName(afterOld);
+        if (newPath === null) {
+          return null;
+        }
+        newFileName = newPath.fileName;
+      } else {
+        newFileName = afterOld;
+      }
+      return {
+        oldFileName: oldPath.fileName,
+        newFileName
+      };
+    }
+    const quoteIdx = rest.indexOf('"');
+    if (quoteIdx > 0) {
+      const oldFileName = rest.substring(0, quoteIdx - 1);
+      const newPath = parseQuotedFileName(rest.substring(quoteIdx));
+      if (newPath === null) {
+        return null;
+      }
+      return {
+        oldFileName,
+        newFileName: newPath.fileName
+      };
+    }
+    if (rest.startsWith("a/")) {
+      const splits = [];
+      let idx = 0;
+      while (true) {
+        idx = rest.indexOf(" b/", idx + 1);
+        if (idx === -1) {
+          break;
+        }
+        splits.push(idx);
+      }
+      if (splits.length > 0) {
+        const mid = splits[Math.floor(splits.length / 2)];
+        return {
+          oldFileName: rest.substring(0, mid),
+          newFileName: rest.substring(mid + 1)
+        };
+      }
+    }
+    return null;
+  }
+  function unquoteIfQuoted(s) {
+    if (s.startsWith('"')) {
+      const parsed = parseQuotedFileName(s);
+      if (parsed) {
+        return parsed.fileName;
+      }
+    }
+    return s;
+  }
+  function parseQuotedFileName(s) {
+    if (!s.startsWith('"')) {
+      return null;
+    }
+    let result = "";
+    let j = 1;
+    while (j < s.length) {
+      if (s[j] === '"') {
+        return { fileName: result, rawLength: j + 1 };
+      }
+      if (s[j] === "\\" && j + 1 < s.length) {
+        j++;
+        switch (s[j]) {
+          case "a":
+            result += "\x07";
+            break;
+          case "b":
+            result += "\b";
+            break;
+          case "f":
+            result += "\f";
+            break;
+          case "n":
+            result += "\n";
+            break;
+          case "r":
+            result += "\r";
+            break;
+          case "t":
+            result += "	";
+            break;
+          case "v":
+            result += "\v";
+            break;
+          case "\\":
+            result += "\\";
+            break;
+          case '"':
+            result += '"';
+            break;
+          case "0":
+          case "1":
+          case "2":
+          case "3":
+          case "4":
+          case "5":
+          case "6":
+          case "7": {
+            if (j + 2 >= s.length || s[j + 1] < "0" || s[j + 1] > "7" || s[j + 2] < "0" || s[j + 2] > "7") {
+              return null;
+            }
+            const bytes = [parseInt(s.substring(j, j + 3), 8)];
+            j += 3;
+            while (s[j] === "\\" && s[j + 1] >= "0" && s[j + 1] <= "7") {
+              if (j + 3 >= s.length || s[j + 2] < "0" || s[j + 2] > "7" || s[j + 3] < "0" || s[j + 3] > "7") {
+                return null;
+              }
+              bytes.push(parseInt(s.substring(j + 1, j + 4), 8));
+              j += 4;
+            }
+            result += new TextDecoder("utf-8").decode(new Uint8Array(bytes));
+            continue;
+          }
+          // Note that in C, there are also three kinds of hex escape sequences:
+          // - \xhh
+          // - \uhhhh
+          // - \Uhhhhhhhh
+          // We do not bother to parse them here because, so far as we know,
+          // they are never emitted by any tools that generate unified diff
+          // format diffs, and so for now jsdiff does not consider them legal.
+          default:
+            return null;
+        }
+      } else {
+        result += s[j];
+      }
+      j++;
+    }
+    return null;
+  }
   function parseFileHeader(index) {
     const fileHeaderMatch = /^(---|\+\+\+)\s+/.exec(diffstr[i]);
     if (fileHeaderMatch) {
       const prefix = fileHeaderMatch[1], data = diffstr[i].substring(3).trim().split("	", 2), header = (data[1] || "").trim();
-      let fileName = data[0].replace(/\\\\/g, "\\");
-      if (fileName.startsWith('"') && fileName.endsWith('"')) {
-        fileName = fileName.substr(1, fileName.length - 2);
+      let fileName = data[0];
+      if (fileName.startsWith('"')) {
+        fileName = unquoteIfQuoted(fileName);
+      } else {
+        fileName = fileName.replace(/\\\\/g, "\\");
       }
       if (prefix === "---") {
         index.oldFileName = fileName;
@@ -21484,6 +22133,9 @@ function parsePatch(uniDiff) {
     if (removeCount !== hunk.oldLines) {
       throw new Error("Removed line count did not match for hunk at line " + (chunkHeaderIndex + 1));
     }
+    if (i < diffstr.length && diffstr[i] && /^[+ -]/.test(diffstr[i]) && !isFileHeader(diffstr[i])) {
+      throw new Error("Hunk at line " + (chunkHeaderIndex + 1) + " has more lines than expected (expected " + hunk.oldLines + " old lines and " + hunk.newLines + " new lines)");
+    }
     return hunk;
   }
   while (i < diffstr.length) {
@@ -21671,11 +22323,23 @@ function applyStructuredPatch(source, patch, options = {}) {
 }
 
 // node_modules/diff/libesm/patch/reverse.js
+function swapPrefix(fileName) {
+  if (fileName === void 0 || fileName === "/dev/null") {
+    return fileName;
+  }
+  if (fileName.startsWith("a/")) {
+    return "b/" + fileName.slice(2);
+  }
+  if (fileName.startsWith("b/")) {
+    return "a/" + fileName.slice(2);
+  }
+  return fileName;
+}
 function reversePatch(structuredPatch) {
   if (Array.isArray(structuredPatch)) {
     return structuredPatch.map((patch) => reversePatch(patch)).reverse();
   }
-  return Object.assign(Object.assign({}, structuredPatch), { oldFileName: structuredPatch.newFileName, oldHeader: structuredPatch.newHeader, newFileName: structuredPatch.oldFileName, newHeader: structuredPatch.oldHeader, hunks: structuredPatch.hunks.map((hunk) => {
+  const reversed = Object.assign(Object.assign({}, structuredPatch), { oldFileName: structuredPatch.isGit ? swapPrefix(structuredPatch.newFileName) : structuredPatch.newFileName, oldHeader: structuredPatch.newHeader, newFileName: structuredPatch.isGit ? swapPrefix(structuredPatch.oldFileName) : structuredPatch.oldFileName, newHeader: structuredPatch.oldHeader, oldMode: structuredPatch.newMode, newMode: structuredPatch.oldMode, isCreate: structuredPatch.isDelete, isDelete: structuredPatch.isCreate, hunks: structuredPatch.hunks.map((hunk) => {
     return {
       oldLines: hunk.newLines,
       oldStart: hunk.newStart,
@@ -21692,6 +22356,16 @@ function reversePatch(structuredPatch) {
       })
     };
   }) });
+  if (structuredPatch.isCopy) {
+    reversed.newFileName = "/dev/null";
+    reversed.newHeader = void 0;
+    reversed.isDelete = true;
+    delete reversed.isCreate;
+    delete reversed.isCopy;
+    delete reversed.isRename;
+    reversed.hunks = [];
+  }
+  return reversed;
 }
 
 // src/CodexToolCallMapper.ts
@@ -21861,18 +22535,18 @@ function createImageGenerationCompleteUpdate(item) {
   return {
     sessionUpdate: "tool_call_update",
     toolCallId: item.id,
-    status: imageGenerationToolStatus(item.status),
+    status: imageGenerationTerminalStatus(item.status),
     content: imageGenerationContent(item),
     rawOutput: imageGenerationRawOutput(item)
   };
 }
-function createImageGenerationUpdate(item) {
+function createImageGenerationUpdate(item, options) {
   return {
     sessionUpdate: "tool_call",
     toolCallId: item.id,
     kind: "other",
     title: "Image generation",
-    status: imageGenerationToolStatus(item.status),
+    status: options?.terminalStatus ? imageGenerationTerminalStatus(item.status) : imageGenerationToolStatus(item.status),
     content: imageGenerationContent(item),
     rawOutput: imageGenerationRawOutput(item)
   };
@@ -22214,6 +22888,19 @@ function imageGenerationToolStatus(status) {
       return "completed";
   }
 }
+function imageGenerationTerminalStatus(status) {
+  switch (status) {
+    case "failed":
+      return "failed";
+    case "completed":
+    case "generating":
+    case "in_progress":
+    case "inProgress":
+    case "incomplete":
+    default:
+      return "completed";
+  }
+}
 function imageGenerationContent(item) {
   const content = [];
   if (item.revisedPrompt && item.revisedPrompt.trim() !== "") {
@@ -22344,6 +23031,53 @@ function recoverCorruptedDiff(diff) {
   return diff.replace(/\n\nMoved to: .*$/, "");
 }
 
+// src/ContentChunks.ts
+function createUserMessageChunk(content, messageId) {
+  if (messageId) {
+    return {
+      sessionUpdate: "user_message_chunk",
+      messageId,
+      content
+    };
+  }
+  return {
+    sessionUpdate: "user_message_chunk",
+    content
+  };
+}
+function createAgentMessageChunk(content, messageId) {
+  if (messageId) {
+    return {
+      sessionUpdate: "agent_message_chunk",
+      messageId,
+      content
+    };
+  }
+  return {
+    sessionUpdate: "agent_message_chunk",
+    content
+  };
+}
+function createAgentThoughtChunk(content, messageId) {
+  if (messageId) {
+    return {
+      sessionUpdate: "agent_thought_chunk",
+      messageId,
+      content
+    };
+  }
+  return {
+    sessionUpdate: "agent_thought_chunk",
+    content
+  };
+}
+function createAgentTextMessageChunk(text, messageId) {
+  return createAgentMessageChunk({ type: "text", text }, messageId);
+}
+function createAgentTextThoughtChunk(text, messageId) {
+  return createAgentThoughtChunk({ type: "text", text }, messageId);
+}
+
 // src/CodexEventHandler.ts
 var CodexEventHandler = class {
   connection;
@@ -22499,104 +23233,65 @@ var CodexEventHandler = class {
     };
   }
   async createTextEvent(event) {
-    return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text: event.delta
-      }
-    };
+    return createAgentTextMessageChunk(event.delta, event.itemId);
   }
   async createConfigWarningEvent(event) {
     const detailsText = event.details ? `
 
 ${event.details}` : "";
-    return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text: `Config warning: ${event.summary}${detailsText}
+    return createAgentTextMessageChunk(`Config warning: ${event.summary}${detailsText}
 
-`
-      }
-    };
+`);
   }
   createWarningEvent(event) {
-    return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text: `Warning: ${event.message}
+    return createAgentTextMessageChunk(`Warning: ${event.message}
 
-`
-      }
-    };
+`);
   }
   createModelReroutedEvent(event) {
-    return {
-      sessionUpdate: "agent_thought_chunk",
-      content: {
-        type: "text",
-        text: `Model rerouted from ${event.fromModel} to ${event.toModel} (${event.reason}).
+    return createAgentTextThoughtChunk(`Model rerouted from ${event.fromModel} to ${event.toModel} (${event.reason}).
 
-`
-      }
-    };
+`);
   }
   createThreadGoalUpdatedEvent(event) {
-    const status = this.formatThreadGoalStatus(event.goal.status);
-    const objective = event.goal.objective.trim();
-    const text = objective.includes("\n") ? `Goal updated (${status}):
-${objective}` : `Goal updated (${status}): ${objective}`;
-    return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text
-      }
-    };
-  }
-  formatThreadGoalStatus(status) {
-    switch (status) {
-      case "active":
-        return "active";
-      case "paused":
-        return "paused";
-      case "budgetLimited":
-        return "budget limited";
-      case "blocked":
-        return "blocked";
-      case "usageLimited":
-        return "usage limited";
-      case "complete":
-        return "complete";
+    const goalSnapshot = this.createThreadGoalSnapshot(event);
+    if (this.sameThreadGoalSnapshot(this.sessionState.currentGoal, goalSnapshot)) {
+      return null;
     }
+    this.sessionState.currentGoal = goalSnapshot;
+    return this.createCodexSessionInfoUpdate({
+      goal: goalSnapshot
+    });
   }
   createThreadGoalClearedEvent(_event) {
+    if (this.sessionState.currentGoal === null) {
+      return null;
+    }
+    this.sessionState.currentGoal = null;
+    return this.createCodexSessionInfoUpdate({
+      goal: null
+    });
+  }
+  createThreadGoalSnapshot(event) {
     return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text: "Goal cleared."
-      }
+      objective: event.goal.objective.trim(),
+      status: event.goal.status,
+      tokenBudget: event.goal.tokenBudget
     };
   }
+  sameThreadGoalSnapshot(left, right) {
+    return left !== null && left !== void 0 && left.objective === right.objective && left.status === right.status && left.tokenBudget === right.tokenBudget;
+  }
   createReasoningDeltaEvent(event) {
     this.seenReasoningDeltaItemIds.add(event.itemId);
-    return this.createAgentThoughtEvent(event.delta);
+    return this.createAgentThoughtEvent(event.delta, event.itemId);
   }
   createReasoningSectionBreakEvent(event) {
     this.seenReasoningDeltaItemIds.add(event.itemId);
-    return this.createAgentThoughtEvent("\n\n");
+    return this.createAgentThoughtEvent("\n\n", event.itemId);
   }
-  createAgentThoughtEvent(text) {
-    return {
-      sessionUpdate: "agent_thought_chunk",
-      content: {
-        type: "text",
-        text
-      }
-    };
+  createAgentThoughtEvent(text, messageId) {
+    return createAgentTextThoughtChunk(text, messageId);
   }
   async createItemEvent(event) {
     switch (event.item.type) {
@@ -22666,7 +23361,7 @@ ${objective}` : `Goal updated (${status}): ${objective}`;
         if (this.activeImageGenerationItems.delete(event.item.id)) {
           return createImageGenerationCompleteUpdate(event.item);
         }
-        return createImageGenerationUpdate(event.item);
+        return createImageGenerationUpdate(event.item, { terminalStatus: true });
       case "reasoning":
         if (this.seenReasoningDeltaItemIds.delete(event.item.id)) {
           return null;
@@ -22697,29 +23392,17 @@ ${objective}` : `Goal updated (${status}): ${objective}`;
     if (text.length === 0) {
       return null;
     }
-    return this.createAgentThoughtEvent(text);
+    return this.createAgentThoughtEvent(text, item.id);
   }
   createExitedReviewModeEvent(item) {
     const text = item.review.trim();
     if (text.length === 0) {
       return null;
     }
-    return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text
-      }
-    };
+    return createAgentTextMessageChunk(text);
   }
   createContextCompactedEvent() {
-    return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text: "*Context compacted to fit the model's context window.*\n\n"
-      }
-    };
+    return createAgentTextMessageChunk("*Context compacted to fit the model's context window.*\n\n");
   }
   createCommandOutputDeltaEvent(event) {
     if (this.terminalCommandIds.has(event.itemId) && event.delta.length > 0) {
@@ -22846,15 +23529,9 @@ ${event.stdin}
     } else if (this.isAuthenticationRequiredError(error51)) {
       this.failure = this.sessionState.authConfigured ? RequestError.internalError(this.createTurnErrorData(params.error)) : RequestError.authRequired(this.createTurnErrorData(params.error), params.error.message);
     }
-    return {
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text: `${params.error.message}
+    return createAgentTextMessageChunk(`${params.error.message}
 
-`
-      }
-    };
+`);
   }
   isAuthenticationRequiredError(error51) {
     return error51 === "unauthorized" || this.getHttpStatusCode(error51) === 401;
@@ -23592,10 +24269,15 @@ var isWsl = () => {
     return true;
   }
   try {
-    return fs4.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft") ? !isInsideContainer() : false;
+    if (fs4.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
+      return !isInsideContainer();
+    }
   } catch {
-    return false;
   }
+  if (fs4.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs4.existsSync("/run/WSL")) {
+    return !isInsideContainer();
+  }
+  return false;
 };
 var is_wsl_default = process3.env.__IS_WSL_TEST__ ? isWsl : isWsl();
 
@@ -23634,6 +24316,20 @@ executePowerShell.argumentsPrefix = [
 executePowerShell.encodeCommand = (command) => Buffer2.from(command, "utf16le").toString("base64");
 executePowerShell.escapeArgument = (value) => `'${String(value).replaceAll("'", "''")}'`;
 
+// node_modules/wsl-utils/utilities.js
+function parseMountPointFromConfig(content) {
+  for (const line of content.split("\n")) {
+    if (/^\s*#/.test(line)) {
+      continue;
+    }
+    const match = /^\s*root\s*=\s*(?<mountPoint>"[^"]*"|'[^']*'|[^#]*)/.exec(line);
+    if (!match) {
+      continue;
+    }
+    return match.groups.mountPoint.trim().replaceAll(/^["']|["']$/g, "");
+  }
+}
+
 // node_modules/wsl-utils/index.js
 var execFile2 = promisify2(childProcess2.execFile);
 var wslDrivesMountPoint = /* @__PURE__ */ (() => {
@@ -23654,11 +24350,11 @@ var wslDrivesMountPoint = /* @__PURE__ */ (() => {
       return defaultMountPoint;
     }
     const configContent = await fs5.readFile(configFilePath, { encoding: "utf8" });
-    const configMountPoint = /(?<!#.*)root\s*=\s*(?<mountPoint>.*)/g.exec(configContent);
-    if (!configMountPoint) {
+    const parsedMountPoint = parseMountPointFromConfig(configContent);
+    if (parsedMountPoint === void 0) {
       return defaultMountPoint;
     }
-    mountPoint = configMountPoint.groups.mountPoint.trim();
+    mountPoint = parsedMountPoint;
     mountPoint = mountPoint.endsWith("/") ? mountPoint : `${mountPoint}/`;
     return mountPoint;
   };
@@ -23802,11 +24498,11 @@ async function defaultBrowser(_execFileAsync = execFileAsync3) {
     throw new UnknownBrowserError(`Cannot find Windows browser in stdout: ${JSON.stringify(stdout)}`);
   }
   const { id } = match.groups;
-  const browser = windowsBrowserProgIds[id];
-  if (!browser) {
-    throw new UnknownBrowserError(`Unknown browser ID: ${id}`);
-  }
-  return browser;
+  const dotIndex = id.lastIndexOf(".");
+  const hyphenIndex = id.lastIndexOf("-");
+  const baseIdByDot = dotIndex === -1 ? void 0 : id.slice(0, dotIndex);
+  const baseIdByHyphen = hyphenIndex === -1 ? void 0 : id.slice(0, hyphenIndex);
+  return windowsBrowserProgIds[id] ?? windowsBrowserProgIds[baseIdByDot] ?? windowsBrowserProgIds[baseIdByHyphen] ?? { name: id, id };
 }
 
 // node_modules/default-browser/index.js
@@ -24259,7 +24955,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "1.0.1",
+  version: "1.1.0",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -24309,19 +25005,19 @@ var package_default = {
   license: "Apache-2.0",
   type: "module",
   devDependencies: {
-    "@types/node": "^24.10.1",
+    "@types/node": "^26.0.1",
     esbuild: "^0.28.1",
     "mcp-hello-world": "^1.1.2",
     tsx: "^4.20.6",
-    typescript: "^5.9.3",
-    vitest: "^4.0.10"
+    typescript: "^6.0.3",
+    vitest: "^4.1.9"
   },
   dependencies: {
-    "@agentclientprotocol/sdk": "^1.0.0",
-    "@openai/codex": "^0.142.2",
-    diff: "^8.0.3",
+    "@agentclientprotocol/sdk": "^1.1.0",
+    "@openai/codex": "^0.142.5",
+    diff: "^9.0.0",
     open: "^11.0.0",
-    "vscode-jsonrpc": "^8.2.1",
+    "vscode-jsonrpc": "^9.0.1",
     zod: "^4.0.0"
   }
 };
@@ -24563,15 +25259,37 @@ var CodexAcpClient = class {
   async deleteSession(sessionId) {
     await this.codexClient.threadArchive({ threadId: sessionId });
   }
-  async runReview(sessionId, target, onTurnStarted) {
-    return await this.codexClient.runReview({
+  async runReview(sessionId, target, onTurnStarted) {
+    return await this.codexClient.runReview({
+      threadId: sessionId,
+      target,
+      delivery: "inline"
+    }, onTurnStarted);
+  }
+  async runCompact(sessionId) {
+    await this.codexClient.runCompact({ threadId: sessionId });
+  }
+  async setGoal(sessionId, objective, onTurnStarted) {
+    return await this.codexClient.runGoalSet({
+      threadId: sessionId,
+      objective,
+      status: "active"
+    }, onTurnStarted);
+  }
+  async setGoalStatus(sessionId, status) {
+    await this.codexClient.runGoalSet({
+      threadId: sessionId,
+      status
+    });
+  }
+  async resumeGoal(sessionId, onTurnStarted) {
+    return await this.codexClient.runGoalSet({
       threadId: sessionId,
-      target,
-      delivery: "inline"
+      status: "active"
     }, onTurnStarted);
   }
-  async runCompact(sessionId) {
-    await this.codexClient.runCompact({ threadId: sessionId });
+  async clearGoal(sessionId) {
+    await this.codexClient.runGoalClear({ threadId: sessionId });
   }
   async awaitMcpServerStartup(serverNames, afterVersion) {
     return await this.codexClient.awaitMcpServerStartup(serverNames, afterVersion);
@@ -25088,22 +25806,27 @@ var CodexCommands = class {
     this.runWithProcessCheck = runWithProcessCheck;
     this.onLogout = onLogout;
   }
-  async publish(sessionId) {
+  async publish(sessionState) {
     try {
-      const skillsResponse = await this.runWithProcessCheck(() => this.codexAcpClient.listSkills());
+      const skillsResponse = await this.runWithProcessCheck(() => this.codexAcpClient.listSkills(this.createSkillsListParams(sessionState)));
       const availableCommands = this.buildAvailableCommands(skillsResponse?.data ?? []);
       if (availableCommands.length === 0) {
         return;
       }
-      const session = new ACPSessionConnection(this.connection, sessionId);
+      const session = new ACPSessionConnection(this.connection, sessionState.sessionId);
       await session.update({
         sessionUpdate: "available_commands_update",
         availableCommands
       });
     } catch (err) {
-      logger.error(`Failed to publish available commands for session ${sessionId}`, err);
+      logger.error(`Failed to publish available commands for session ${sessionState.sessionId}`, err);
     }
   }
+  createSkillsListParams(sessionState) {
+    return {
+      cwds: [sessionState.cwd, ...sessionState.additionalDirectories]
+    };
+  }
   buildAvailableCommands(skillsEntries) {
     const commands = /* @__PURE__ */ new Map();
     for (const builtin of this.getBuiltinCommands()) {
@@ -25163,6 +25886,11 @@ var CodexCommands = class {
         description: "Summarize conversation to avoid hitting the context limit.",
         input: null
       },
+      {
+        name: "goal",
+        description: "Set, pause, resume, or clear a task goal.",
+        input: { hint: "[<objective>|clear|pause|resume]" }
+      },
       {
         name: "logout",
         description: "Sign out of Codex. This option is available when you are logged in via ChatGPT.",
@@ -25195,6 +25923,9 @@ var CodexCommands = class {
         await this.runWithProcessCheck(() => this.codexAcpClient.runCompact(sessionId));
         return { handled: true };
       }
+      case "goal": {
+        return await this.runGoalCommand(sessionState, command.rest, options);
+      }
       case "review": {
         const target = this.buildReviewTarget(command.rest);
         const turnCompleted = await this.runReviewCommand(sessionState, target, options);
@@ -25226,24 +25957,18 @@ var CodexCommands = class {
       case "status": {
         const session = new ACPSessionConnection(this.connection, sessionId);
         const message = this.buildStatusMessage(sessionState);
-        await session.update({
-          sessionUpdate: "agent_message_chunk",
-          content: { type: "text", text: message }
-        });
+        await session.update(createAgentTextMessageChunk(message));
         return { handled: true };
       }
       case "logout": {
         await this.runWithProcessCheck(() => this.codexAcpClient.logout());
         await this.onLogout();
         const session = new ACPSessionConnection(this.connection, sessionId);
-        await session.update({
-          sessionUpdate: "agent_message_chunk",
-          content: { type: "text", text: "Logged out from Codex account." }
-        });
+        await session.update(createAgentTextMessageChunk("Logged out from Codex account."));
         return { handled: true };
       }
       case "skills": {
-        const response = await this.runWithProcessCheck(() => this.codexAcpClient.listSkills());
+        const response = await this.runWithProcessCheck(() => this.codexAcpClient.listSkills(this.createSkillsListParams(sessionState)));
         const skills = (response?.data ?? []).flatMap((entry) => entry.skills);
         const lines = skills.map((skill) => {
           const description = skill.shortDescription ?? skill.description ?? "";
@@ -25251,10 +25976,7 @@ var CodexCommands = class {
         });
         const text = lines.length > 0 ? ["Available skills:", ...lines].join("\n") : "No skills configured.";
         const session = new ACPSessionConnection(this.connection, sessionId);
-        await session.update({
-          sessionUpdate: "agent_message_chunk",
-          content: { type: "text", text }
-        });
+        await session.update(createAgentTextMessageChunk(text));
         return { handled: true };
       }
       case "mcp": {
@@ -25268,10 +25990,7 @@ var CodexCommands = class {
         const lines = [...configuredServers, ...sessionServers];
         const text = lines.length > 0 ? ["Configured MCP servers:", ...lines].join("\n") : "No MCP servers configured.";
         const session = new ACPSessionConnection(this.connection, sessionId);
-        await session.update({
-          sessionUpdate: "agent_message_chunk",
-          content: { type: "text", text }
-        });
+        await session.update(createAgentTextMessageChunk(text));
         return { handled: true };
       }
       default:
@@ -25280,18 +25999,68 @@ var CodexCommands = class {
     }
   }
   async runReviewCommand(sessionState, target, options) {
+    options.onTurnStartPending?.();
     return await this.runWithProcessCheck(() => this.codexAcpClient.runReview(
       sessionState.sessionId,
       target,
       (turnId, threadId) => {
-        if (options.onTurnStarted) {
-          options.onTurnStarted(turnId, threadId);
-        } else {
-          sessionState.currentTurnId = turnId;
-        }
+        this.handleCommandTurnStarted(sessionState, options, turnId, threadId);
       }
     ));
   }
+  async runGoalCommand(sessionState, rest, options) {
+    const sessionId = sessionState.sessionId;
+    const argument = rest.trim();
+    if (argument.length === 0) {
+      await this.sendCommandUsageMessage("goal", "[<objective>|clear|pause|resume]", sessionId);
+      return { handled: true };
+    }
+    switch (argument.toLowerCase()) {
+      case "pause":
+        await this.runWithProcessCheck(() => this.codexAcpClient.setGoalStatus(sessionId, "paused"));
+        return { handled: true };
+      case "resume":
+        options.onTurnStartPending?.();
+        return this.createGoalCommandResult(await this.runWithProcessCheck(() => this.codexAcpClient.resumeGoal(
+          sessionId,
+          (turnId) => {
+            this.handleCommandTurnStarted(sessionState, options, turnId, sessionId);
+          }
+        )));
+      case "clear":
+        await this.runWithProcessCheck(() => this.codexAcpClient.clearGoal(sessionId));
+        return { handled: true };
+    }
+    if (argument.length > 4e3) {
+      const session = new ACPSessionConnection(this.connection, sessionId);
+      await session.update(createAgentTextMessageChunk('Command "/goal" requires goal text of at most 4000 characters.'));
+      return { handled: true };
+    }
+    options.onTurnStartPending?.();
+    return this.createGoalCommandResult(await this.runWithProcessCheck(() => this.codexAcpClient.setGoal(
+      sessionId,
+      argument,
+      (turnId) => {
+        this.handleCommandTurnStarted(sessionState, options, turnId, sessionId);
+      }
+    )));
+  }
+  handleCommandTurnStarted(sessionState, options, turnId, threadId) {
+    if (options.onTurnStarted) {
+      options.onTurnStarted(turnId, threadId);
+    } else {
+      sessionState.currentTurnId = turnId;
+    }
+  }
+  createGoalCommandResult(turnCompleted) {
+    if (turnCompleted === null) {
+      return { handled: true };
+    }
+    return {
+      handled: true,
+      turnCompleted
+    };
+  }
   buildReviewTarget(instructions) {
     if (instructions.length === 0) {
       return { type: "uncommittedChanges" };
@@ -25303,13 +26072,7 @@ var CodexCommands = class {
   }
   async sendCommandUsageMessage(name, inputHint, sessionId) {
     const session = new ACPSessionConnection(this.connection, sessionId);
-    await session.update({
-      sessionUpdate: "agent_message_chunk",
-      content: {
-        type: "text",
-        text: `Command "/${name}" requires ${inputHint}.`
-      }
-    });
+    await session.update(createAgentTextMessageChunk(`Command "/${name}" requires ${inputHint}.`));
   }
   async sendUnknownCommandMessage(name, sessionId) {
     const lines = this.getBuiltinCommands().map((command) => `- /${command.name}: ${command.description}`);
@@ -25321,10 +26084,7 @@ var CodexCommands = class {
       text.push(...lines);
     }
     const session = new ACPSessionConnection(this.connection, sessionId);
-    await session.update({
-      sessionUpdate: "agent_message_chunk",
-      content: { type: "text", text: text.join("\n") }
-    });
+    await session.update(createAgentTextMessageChunk(text.join("\n")));
   }
   buildStatusMessage(sessionState) {
     const agentMode = sessionState.agentMode;
@@ -25467,7 +26227,7 @@ function historyFallbackUpdateKey(update) {
     case "user_message_chunk":
     case "agent_message_chunk":
     case "agent_thought_chunk":
-      return `${update.sessionUpdate}:${JSON.stringify(update.content)}`;
+      return `${update.sessionUpdate}:${update.messageId ?? ""}:${JSON.stringify(update.content)}`;
     case "tool_call":
       return `tool_call:${update.toolCallId}:start`;
     case "tool_call_update":
@@ -26431,6 +27191,7 @@ function isExtMethodRequest(request) {
 
 // src/FastModeConfig.ts
 var FAST_MODE_CONFIG_ID = "fast-mode";
+var FAST_MODE_CATEGORY = "model_config";
 var FAST_MODE_ON = "on";
 var FAST_MODE_OFF = "off";
 var FAST_MODE_DESCRIPTION = "1.5x speed, increased usage";
@@ -26440,12 +27201,25 @@ function modelSupportsFast(model) {
 function resolveFastServiceTier(fastModeEnabled, currentModelSupportsFast) {
   return fastModeEnabled && currentModelSupportsFast ? "fast" : null;
 }
-function createFastModeConfigOption(fastModeEnabled) {
+function clientSupportsBooleanConfigOptions(clientCapabilities) {
+  return clientCapabilities?.session?.configOptions?.boolean != null;
+}
+function createFastModeConfigOption(fastModeEnabled, useBooleanConfigOption = false) {
+  if (useBooleanConfigOption) {
+    return {
+      id: FAST_MODE_CONFIG_ID,
+      name: "Fast mode",
+      description: FAST_MODE_DESCRIPTION,
+      category: FAST_MODE_CATEGORY,
+      type: "boolean",
+      currentValue: fastModeEnabled
+    };
+  }
   return {
     id: FAST_MODE_CONFIG_ID,
     name: "Fast mode",
     description: FAST_MODE_DESCRIPTION,
-    category: FAST_MODE_CONFIG_ID,
+    category: FAST_MODE_CATEGORY,
     type: "select",
     currentValue: fastModeEnabled ? FAST_MODE_ON : FAST_MODE_OFF,
     options: [
@@ -26489,6 +27263,7 @@ var CodexAcpServer = class _CodexAcpServer {
   availableCommands;
   clientInfo;
   terminalOutputMode;
+  booleanConfigOptionsSupported;
   sessions;
   pendingMcpStartupSessions;
   pendingTurnStarts;
@@ -26511,6 +27286,7 @@ var CodexAcpServer = class _CodexAcpServer {
     this.getRecentStderr = getRecentStderr ?? (() => "");
     this.clientInfo = null;
     this.terminalOutputMode = "terminal_output_delta";
+    this.booleanConfigOptionsSupported = false;
     this.availableCommands = new CodexCommands(
       connection,
       codexAcpClient,
@@ -26522,6 +27298,7 @@ var CodexAcpServer = class _CodexAcpServer {
     logger.log("Initialize request received");
     this.clientInfo = _params.clientInfo ?? null;
     this.terminalOutputMode = resolveTerminalOutputMode(_params.clientCapabilities);
+    this.booleanConfigOptionsSupported = clientSupportsBooleanConfigOptions(_params.clientCapabilities);
     await this.runWithProcessCheck(() => this.codexAcpClient.initialize(_params));
     return {
       protocolVersion: PROTOCOL_VERSION,
@@ -26734,7 +27511,7 @@ You have been logged out. Please try again.`);
       });
       this.publishMcpStartupStatusAsync(sessionId);
     }
-    this.publishAvailableCommandsAsync(sessionId);
+    this.publishAvailableCommandsAsync(sessionState);
     const sessionModelState = this.createModelState(models, currentModelId);
     const sessionModeState = sessionState.agentMode.toSessionModeState();
     return [sessionId, sessionModelState, sessionModeState];
@@ -26931,22 +27708,18 @@ You have been logged out. Please try again.`);
     });
     const sessionState = this.sessions.get(params.sessionId);
     if (!sessionState) throw new Error(`Session ${params.sessionId} not found`);
-    if (typeof params.value !== "string") {
-      throw RequestError.invalidParams();
-    }
-    const value = params.value;
     switch (params.configId) {
       case FAST_MODE_CONFIG_ID:
-        this.applyFastModeChange(sessionState, value);
+        this.applyFastModeChange(sessionState, params);
         break;
       case MODE_CONFIG_ID:
-        this.applyModeChange(sessionState, value);
+        this.applyModeChange(sessionState, this.stringConfigValue(params));
         break;
       case MODEL_CONFIG_ID:
-        this.applyModelChange(sessionState, value);
+        this.applyModelChange(sessionState, this.stringConfigValue(params));
         break;
       case REASONING_EFFORT_CONFIG_ID:
-        this.applyReasoningEffortChange(sessionState, value);
+        this.applyReasoningEffortChange(sessionState, this.stringConfigValue(params));
         break;
       default:
         throw RequestError.invalidParams();
@@ -26955,12 +27728,23 @@ You have been logged out. Please try again.`);
       configOptions: this.createSessionConfigOptions(sessionState)
     };
   }
-  applyFastModeChange(sessionState, value) {
+  applyFastModeChange(sessionState, params) {
+    const value = params.value;
+    if (typeof value === "boolean") {
+      sessionState.fastModeEnabled = value;
+      return;
+    }
     if (value !== FAST_MODE_ON && value !== FAST_MODE_OFF) {
       throw RequestError.invalidParams();
     }
     sessionState.fastModeEnabled = value === FAST_MODE_ON;
   }
+  stringConfigValue(params) {
+    if (typeof params.value !== "string") {
+      throw RequestError.invalidParams();
+    }
+    return params.value;
+  }
   applyModeChange(sessionState, value) {
     const newMode = AgentMode.find(value);
     if (!newMode) {
@@ -27042,7 +27826,12 @@ You have been logged out. Please try again.`);
         createReasoningEffortConfigOption(sessionState.supportedReasoningEfforts, currentModelId.effort)
       );
     }
-    configOptions.push(createFastModeConfigOption(sessionState.fastModeEnabled));
+    if (sessionState.currentModelSupportsFast) {
+      configOptions.push(createFastModeConfigOption(
+        sessionState.fastModeEnabled,
+        this.booleanConfigOptionsSupported
+      ));
+    }
     return configOptions;
   }
   createSessionConfigOptionsResponse(sessionState) {
@@ -27056,8 +27845,8 @@ You have been logged out. Please try again.`);
   isSessionConfigEnabled() {
     return !isJetBrains2026_1Client(this.clientInfo);
   }
-  publishAvailableCommandsAsync(sessionId) {
-    void this.availableCommands.publish(sessionId);
+  publishAvailableCommandsAsync(sessionState) {
+    void this.availableCommands.publish(sessionState);
   }
   findCurrentModel(models, currentModelId) {
     const modelId = ModelId.fromString(currentModelId);
@@ -27148,7 +27937,7 @@ You have been logged out. Please try again.`);
       });
       this.publishMcpStartupStatusAsync(sessionId);
     }
-    await this.availableCommands.publish(sessionId);
+    await this.availableCommands.publish(sessionState);
     const sessionModelState = this.createModelState(models, currentModelId);
     const sessionModeState = sessionState.agentMode.toSessionModeState();
     return {
@@ -27188,6 +27977,7 @@ You have been logged out. Please try again.`);
       case "agentMessage":
         return [{
           sessionUpdate: "agent_message_chunk",
+          messageId: item.id,
           content: { type: "text", text: item.text }
         }];
       case "reasoning":
@@ -27226,23 +28016,19 @@ You have been logged out. Please try again.`);
   }
   createUserMessageUpdates(item) {
     const updates = [];
+    const messageId = item.id;
     for (const input of item.content) {
       const blocks = this.userInputToContentBlocks(input);
       for (const block of blocks) {
-        updates.push({
-          sessionUpdate: "user_message_chunk",
-          content: block
-        });
+        updates.push(createUserMessageChunk(block, messageId));
       }
     }
     return updates;
   }
   createReasoningUpdates(item) {
     const parts = item.summary.length > 0 ? item.summary : item.content;
-    return parts.map((text) => ({
-      sessionUpdate: "agent_thought_chunk",
-      content: { type: "text", text }
-    }));
+    const messageId = item.id;
+    return parts.map((text) => createAgentTextThoughtChunk(text, messageId));
   }
   createWebSearchUpdate(item) {
     return {
@@ -27563,6 +28349,13 @@ ${item.text}`
     sessionState.lastTokenUsage = null;
     const activePrompt = this.trackActivePrompt(params.sessionId);
     let pendingTurnStart = null;
+    const ensurePendingTurnStart = () => {
+      if (pendingTurnStart === null) {
+        pendingTurnStart = this.createPendingTurnStart();
+        this.pendingTurnStarts.set(params.sessionId, pendingTurnStart);
+      }
+      return pendingTurnStart;
+    };
     const disposePromptRequestCancellation = this.observePromptRequestCancellation(signal, sessionState, activePrompt);
     try {
       const eventHandler = new CodexEventHandler(this.connection, sessionState);
@@ -27581,6 +28374,9 @@ ${item.text}`
         return this.cancelledPromptResponse(sessionState);
       }
       const commandPromise = this.availableCommands.tryHandleCommand(params.prompt, sessionState, {
+        onTurnStartPending: () => {
+          ensurePendingTurnStart();
+        },
         onTurnStarted: (turnId, threadId) => {
           const turn = { threadId, turnId };
           activePrompt.currentTurn = turn;
@@ -27589,6 +28385,7 @@ ${item.text}`
             return;
           }
           sessionState.currentTurnId = turnId;
+          pendingTurnStart?.resolve(turnId);
         }
       });
       void commandPromise.catch((err) => {
@@ -27641,8 +28438,7 @@ ${item.text}`
         sessionState.fastModeEnabled,
         sessionState.currentModelSupportsFast
       );
-      pendingTurnStart = this.createPendingTurnStart();
-      this.pendingTurnStarts.set(params.sessionId, pendingTurnStart);
+      ensurePendingTurnStart();
       const sendPromptPromise = this.runWithProcessCheck(
         () => this.codexAcpClient.sendPrompt(
           params,
@@ -27699,10 +28495,11 @@ ${item.text}`
       logger.log("Prompt completed", { sessionId: params.sessionId });
       disposePromptRequestCancellation();
       sessionState.currentTurnId = null;
-      if (pendingTurnStart !== null && this.pendingTurnStarts.get(params.sessionId) === pendingTurnStart) {
+      const registeredPendingTurnStart = this.pendingTurnStarts.get(params.sessionId);
+      if (registeredPendingTurnStart !== void 0) {
         this.pendingTurnStarts.delete(params.sessionId);
+        registeredPendingTurnStart.resolve(null);
       }
-      pendingTurnStart?.resolve(null);
       activePrompt.complete();
     }
   }
@@ -27719,13 +28516,7 @@ ${item.text}`
     }
     await this.connection.notify(methods.client.session.update, {
       sessionId,
-      update: {
-        sessionUpdate: "agent_message_chunk",
-        content: {
-          type: "text",
-          text: "*Conversation interrupted*"
-        }
-      }
+      update: createAgentTextMessageChunk("*Conversation interrupted*")
     });
   }
   buildQuotaMeta(sessionState) {
@@ -27786,22 +28577,24 @@ function mergeHistoryUpdates(responseItemFallbackUpdates, threadUpdates) {
     }
     merged.push(update);
   };
-  const flushFallbackThrough = (targetKey) => {
-    const matchIndex = responseItemFallbackUpdates.findIndex((update, index) => index >= fallbackIndex && historyUpdateKey(update) === targetKey);
+  const flushFallbackBeforeMatchingDuplicate = (targetUpdate) => {
+    const targetKey = historyUpdateKey(targetUpdate);
+    const targetContentKey = historyUpdateContentKey(targetUpdate);
+    if (!targetKey && !targetContentKey) {
+      return;
+    }
+    const matchIndex = responseItemFallbackUpdates.findIndex((update, index) => index >= fallbackIndex && (targetKey !== null && historyUpdateKey(update) === targetKey || targetContentKey !== null && historyUpdateContentKey(update) === targetContentKey));
     if (matchIndex === -1) {
-      return false;
+      return;
     }
-    while (fallbackIndex <= matchIndex) {
+    while (fallbackIndex < matchIndex) {
       pushUpdate(responseItemFallbackUpdates[fallbackIndex]);
       fallbackIndex += 1;
     }
-    return true;
+    fallbackIndex += 1;
   };
   for (const update of threadUpdates) {
-    const key = historyUpdateKey(update);
-    if (key && flushFallbackThrough(key)) {
-      continue;
-    }
+    flushFallbackBeforeMatchingDuplicate(update);
     pushUpdate(update);
   }
   while (fallbackIndex < responseItemFallbackUpdates.length) {
@@ -27815,7 +28608,7 @@ function historyUpdateKey(update) {
     case "user_message_chunk":
     case "agent_message_chunk":
     case "agent_thought_chunk":
-      return `${update.sessionUpdate}:${JSON.stringify(update.content)}`;
+      return `${update.sessionUpdate}:${update.messageId ?? ""}:${JSON.stringify(update.content)}`;
     case "tool_call":
       return `tool_call:${update.toolCallId}:start`;
     case "tool_call_update":
@@ -27824,16 +28617,27 @@ function historyUpdateKey(update) {
       return null;
   }
 }
+function historyUpdateContentKey(update) {
+  switch (update.sessionUpdate) {
+    case "user_message_chunk":
+    case "agent_message_chunk":
+    case "agent_thought_chunk":
+      return `${update.sessionUpdate}:${JSON.stringify(update.content)}`;
+    default:
+      return historyUpdateKey(update);
+  }
+}
 function getRequestedMcpServerNames(mcpServers) {
   return Array.from(new Set(mcpServers.map((server) => sanitizeMcpServerName(server.name))));
 }
 
 // src/CodexAppServerClient.ts
-var import_node2 = __toESM(require_node(), 1);
+var import_node2 = __toESM(require_main(), 1);
 var CommandExecutionApprovalRequest = new import_node2.RequestType("item/commandExecution/requestApproval");
 var FileChangeApprovalRequest = new import_node2.RequestType("item/fileChange/requestApproval");
 var PermissionsApprovalRequest = new import_node2.RequestType("item/permissions/requestApproval");
 var McpServerElicitationRequest = new import_node2.RequestType("mcpServer/elicitation/request");
+var GOAL_RUNTIME_EFFECTS_GRACE_MS = 1e3;
 var CodexAppServerClient = class {
   connection;
   approvalHandlers = /* @__PURE__ */ new Map();
@@ -27844,6 +28648,10 @@ var CodexAppServerClient = class {
   pendingTurnCompletionResolvers = /* @__PURE__ */ new Map();
   pendingCompactionCompletionResolvers = /* @__PURE__ */ new Map();
   turnCompletionCaptures = /* @__PURE__ */ new Map();
+  turnRoutingCaptures = /* @__PURE__ */ new Map();
+  threadStatusCaptures = /* @__PURE__ */ new Map();
+  threadGoalUpdateCaptures = /* @__PURE__ */ new Map();
+  threadGoalClearedCaptures = /* @__PURE__ */ new Map();
   staleTurnIds = /* @__PURE__ */ new Map();
   constructor(connection) {
     this.connection = connection;
@@ -27864,15 +28672,21 @@ var CodexAppServerClient = class {
       if (isCompactionCompletedNotification(serverNotification)) {
         this.recordCompactionCompleted(serverNotification);
       }
+      if (isThreadStatusChangedNotification(serverNotification)) {
+        this.recordThreadStatusChanged(serverNotification.params);
+      }
+      if (isThreadGoalUpdatedNotification(serverNotification)) {
+        this.recordThreadGoalUpdated(serverNotification.params);
+      }
+      if (isThreadGoalClearedNotification(serverNotification)) {
+        this.recordThreadGoalCleared(serverNotification.params);
+      }
       const routing = extractTurnRouting(serverNotification);
-      const staleTurnNotification = this.isStaleTurn(routing.threadId, routing.turnId);
-      if (staleTurnNotification) {
-        if (isTurnCompletedNotification(serverNotification) && routing.threadId !== null && routing.turnId !== null) {
-          this.clearStaleTurn(routing.threadId, routing.turnId);
-        }
-        for (const callback of this.codexEventHandlers) {
-          callback({ eventType: "notification", ...serverNotification });
-        }
+      if (this.handleStaleTurnNotification(serverNotification, routing)) {
+        return;
+      }
+      this.recordTurnRouting(routing);
+      if (this.handleStaleTurnNotification(serverNotification, routing)) {
         return;
       }
       this.notify(serverNotification);
@@ -27974,6 +28788,174 @@ var CodexAppServerClient = class {
       releaseCapture();
     }
   }
+  async runGoalSet(params, onTurnStarted, runtimeEffectsGraceMs = GOAL_RUNTIME_EFFECTS_GRACE_MS) {
+    let goalTurnId = null;
+    const capturedCompletions = [];
+    let resolveGoalTurnCompleted = () => {
+    };
+    const goalTurnCompleted = new Promise((resolve) => {
+      resolveGoalTurnCompleted = resolve;
+    });
+    const releaseCompletionCapture = this.captureTurnCompletions(params.threadId, (event) => {
+      capturedCompletions.push(event);
+      if (goalTurnId === event.turn.id) {
+        resolveGoalTurnCompleted(event);
+      }
+    });
+    let resolveGoalTurnStarted = () => {
+    };
+    const goalTurnStarted = new Promise((resolve) => {
+      resolveGoalTurnStarted = resolve;
+    });
+    let resolveGoalUpdateHandled = () => {
+    };
+    const matchingGoalUpdateHandled = new Promise((resolve) => {
+      resolveGoalUpdateHandled = () => resolve(null);
+    });
+    let goalUpdateHandled = false;
+    let expectedGoal = null;
+    const noGoalTurnStarted = this.createNoGoalTurnStartedPromise(runtimeEffectsGraceMs);
+    const capturedGoalUpdates = [];
+    const releaseRoutingCapture = this.captureTurnRoutings(params.threadId, (turnId) => {
+      if (!goalUpdateHandled || goalTurnId !== null) {
+        return;
+      }
+      goalTurnId = turnId;
+      onTurnStarted?.(turnId);
+      resolveGoalTurnStarted(turnId);
+    });
+    const releaseGoalUpdateCapture = this.captureThreadGoalUpdates(params.threadId, (event) => {
+      capturedGoalUpdates.push(event);
+      if (expectedGoal !== null && goalsMatch(event.goal, expectedGoal)) {
+        goalUpdateHandled = true;
+        resolveGoalUpdateHandled();
+        noGoalTurnStarted.goalUpdated();
+      }
+    });
+    const releaseStatusCapture = this.captureThreadStatuses(params.threadId, (status) => {
+      if (!goalUpdateHandled || goalTurnId !== null) {
+        return;
+      }
+      noGoalTurnStarted.threadStatusChanged(status);
+    });
+    try {
+      const goalSetResponse = await this.threadGoalSet(params);
+      expectedGoal = goalSetResponse.goal;
+      if (capturedGoalUpdates.some((event) => goalsMatch(event.goal, expectedGoal))) {
+        goalUpdateHandled = true;
+        resolveGoalUpdateHandled();
+        noGoalTurnStarted.goalUpdated();
+      }
+      if (expectedGoal.status !== "active") {
+        await matchingGoalUpdateHandled;
+        return null;
+      }
+      const turnId = goalTurnId ?? await Promise.race([goalTurnStarted, noGoalTurnStarted.promise]);
+      noGoalTurnStarted.release();
+      releaseRoutingCapture();
+      releaseStatusCapture();
+      releaseGoalUpdateCapture();
+      if (turnId === null) {
+        return null;
+      }
+      const earlyCompletion = capturedCompletions.find((event) => event.turn.id === turnId);
+      if (earlyCompletion) {
+        return earlyCompletion;
+      }
+      return await goalTurnCompleted;
+    } finally {
+      noGoalTurnStarted.release();
+      releaseCompletionCapture();
+      releaseRoutingCapture();
+      releaseStatusCapture();
+      releaseGoalUpdateCapture();
+    }
+  }
+  async runGoalClear(params) {
+    let goalClearedHandled = false;
+    let resolveGoalClearedHandled = () => {
+    };
+    const matchingGoalClearedHandled = new Promise((resolve) => {
+      resolveGoalClearedHandled = () => resolve();
+    });
+    const releaseGoalClearedCapture = this.captureThreadGoalClears(params.threadId, () => {
+      goalClearedHandled = true;
+      resolveGoalClearedHandled();
+    });
+    try {
+      const response = await this.threadGoalClear(params);
+      if (!response.cleared || goalClearedHandled) {
+        return;
+      }
+      await matchingGoalClearedHandled;
+    } finally {
+      releaseGoalClearedCapture();
+    }
+  }
+  createNoGoalTurnStartedPromise(runtimeEffectsGraceMs) {
+    let released = false;
+    let resolved = false;
+    let goalUpdated = false;
+    let activeAfterGoalUpdate = false;
+    let timeout = null;
+    let resolveNoGoalTurnStarted = () => {
+    };
+    const clearTimer = () => {
+      if (timeout !== null) {
+        clearTimeout(timeout);
+        timeout = null;
+      }
+    };
+    const resolveNoTurn = () => {
+      if (released || resolved) {
+        return;
+      }
+      resolved = true;
+      clearTimer();
+      resolveNoGoalTurnStarted();
+    };
+    const scheduleNoTurnTimer = () => {
+      if (released || resolved || !goalUpdated || activeAfterGoalUpdate || timeout !== null) {
+        return;
+      }
+      timeout = setTimeout(resolveNoTurn, runtimeEffectsGraceMs);
+    };
+    const release = () => {
+      if (released) {
+        return;
+      }
+      released = true;
+      clearTimer();
+    };
+    const promise2 = new Promise((resolve) => {
+      resolveNoGoalTurnStarted = () => {
+        resolve(null);
+      };
+    });
+    const handleGoalUpdated = () => {
+      goalUpdated = true;
+      scheduleNoTurnTimer();
+    };
+    const handleThreadStatusChanged = (status) => {
+      if (!goalUpdated || released || resolved) {
+        return;
+      }
+      if (status.type === "active") {
+        activeAfterGoalUpdate = true;
+        clearTimer();
+        return;
+      }
+      if (activeAfterGoalUpdate) {
+        resolveNoTurn();
+      }
+    };
+    return {
+      promise: promise2,
+      release,
+      goalUpdated: handleGoalUpdated,
+      threadStatusChanged: handleThreadStatusChanged
+    };
+  }
   async runCompact(params) {
     const compactionCompleted = this.awaitCompactionCompleted(params.threadId);
     await this.threadCompactStart(params);
@@ -28014,6 +28996,12 @@ var CodexAppServerClient = class {
   async threadCompactStart(params) {
     return await this.sendRequest({ method: "thread/compact/start", params });
   }
+  async threadGoalSet(params) {
+    return await this.sendRequest({ method: "thread/goal/set", params });
+  }
+  async threadGoalClear(params) {
+    return await this.sendRequest({ method: "thread/goal/clear", params });
+  }
   async listMcpServerStatus(params) {
     return await this.sendRequest({ method: "mcpServerStatus/list", params });
   }
@@ -28145,6 +29133,57 @@ var CodexAppServerClient = class {
       resolve(event);
     }
   }
+  recordThreadStatusChanged(event) {
+    const captures = this.threadStatusCaptures.get(event.threadId);
+    if (!captures) {
+      return;
+    }
+    for (const capture of captures) {
+      capture(event.status);
+    }
+  }
+  recordThreadGoalUpdated(event) {
+    const captures = this.threadGoalUpdateCaptures.get(event.threadId);
+    if (!captures) {
+      return;
+    }
+    for (const capture of captures) {
+      capture(event);
+    }
+  }
+  recordThreadGoalCleared(event) {
+    const captures = this.threadGoalClearedCaptures.get(event.threadId);
+    if (!captures) {
+      return;
+    }
+    for (const capture of captures) {
+      capture();
+    }
+  }
+  recordTurnRouting(routing) {
+    if (routing.threadId === null || routing.turnId === null) {
+      return;
+    }
+    const captures = this.turnRoutingCaptures.get(routing.threadId);
+    if (!captures) {
+      return;
+    }
+    for (const capture of captures) {
+      capture(routing.turnId);
+    }
+  }
+  handleStaleTurnNotification(notification, routing) {
+    if (!this.isStaleTurn(routing.threadId, routing.turnId)) {
+      return false;
+    }
+    if (isTurnCompletedNotification(notification) && routing.threadId !== null && routing.turnId !== null) {
+      this.clearStaleTurn(routing.threadId, routing.turnId);
+    }
+    for (const callback of this.codexEventHandlers) {
+      callback({ eventType: "notification", ...notification });
+    }
+    return true;
+  }
   isStaleTurn(threadId, turnId) {
     if (threadId === null || turnId === null) {
       return false;
@@ -28186,6 +29225,70 @@ var CodexAppServerClient = class {
       }
     };
   }
+  captureTurnRoutings(threadId, capture) {
+    const captures = this.turnRoutingCaptures.get(threadId) ?? /* @__PURE__ */ new Set();
+    captures.add(capture);
+    this.turnRoutingCaptures.set(threadId, captures);
+    let released = false;
+    return () => {
+      if (released) {
+        return;
+      }
+      released = true;
+      captures.delete(capture);
+      if (captures.size === 0) {
+        this.turnRoutingCaptures.delete(threadId);
+      }
+    };
+  }
+  captureThreadStatuses(threadId, capture) {
+    const captures = this.threadStatusCaptures.get(threadId) ?? /* @__PURE__ */ new Set();
+    captures.add(capture);
+    this.threadStatusCaptures.set(threadId, captures);
+    let released = false;
+    return () => {
+      if (released) {
+        return;
+      }
+      released = true;
+      captures.delete(capture);
+      if (captures.size === 0) {
+        this.threadStatusCaptures.delete(threadId);
+      }
+    };
+  }
+  captureThreadGoalUpdates(threadId, capture) {
+    const captures = this.threadGoalUpdateCaptures.get(threadId) ?? /* @__PURE__ */ new Set();
+    captures.add(capture);
+    this.threadGoalUpdateCaptures.set(threadId, captures);
+    let released = false;
+    return () => {
+      if (released) {
+        return;
+      }
+      released = true;
+      captures.delete(capture);
+      if (captures.size === 0) {
+        this.threadGoalUpdateCaptures.delete(threadId);
+      }
+    };
+  }
+  captureThreadGoalClears(threadId, capture) {
+    const captures = this.threadGoalClearedCaptures.get(threadId) ?? /* @__PURE__ */ new Set();
+    captures.add(capture);
+    this.threadGoalClearedCaptures.set(threadId, captures);
+    let released = false;
+    return () => {
+      if (released) {
+        return;
+      }
+      released = true;
+      captures.delete(capture);
+      if (captures.size === 0) {
+        this.threadGoalClearedCaptures.delete(threadId);
+      }
+    };
+  }
   resolveMcpServerStartupResolvers() {
     const pendingResolvers = [];
     for (const resolver of this.mcpServerStartupResolvers) {
@@ -28248,12 +29351,24 @@ function isMcpServerStatusUpdatedNotification(notification) {
 function isTurnCompletedNotification(notification) {
   return notification.method === "turn/completed";
 }
+function isThreadStatusChangedNotification(notification) {
+  return notification.method === "thread/status/changed";
+}
+function isThreadGoalUpdatedNotification(notification) {
+  return notification.method === "thread/goal/updated";
+}
+function isThreadGoalClearedNotification(notification) {
+  return notification.method === "thread/goal/cleared";
+}
 function isCompactionCompletedNotification(notification) {
   if (notification.method === "thread/compacted") {
     return true;
   }
   return notification.method === "item/completed" && notification.params.item.type === "contextCompaction";
 }
+function goalsMatch(left, right) {
+  return left.threadId === right.threadId && left.objective === right.objective && left.status === right.status && left.tokenBudget === right.tokenBudget && left.updatedAt === right.updatedAt;
+}
 function extractThreadId(notification) {
   const params = notification.params;
   if (params && typeof params.threadId === "string") {