clisbot 0.1.54-beta.1 → 0.1.54-beta.3

package/dist/main.js

@@ -13037,10 +13037,10 @@ var require_follow_redirects = __commonJS((exports, module) => {
     if (++this._redirectCount > this._options.maxRedirects) {
       throw new TooManyRedirectsError;
     }
-    var requestHeaders;
+    var requestHeaders2;
     var beforeRedirect = this._options.beforeRedirect;
     if (beforeRedirect) {
-      requestHeaders = Object.assign({
+      requestHeaders2 = Object.assign({
         Host: response.req.getHeader("host")
       }, this._options.headers);
     }
@@ -13069,7 +13069,7 @@ var require_follow_redirects = __commonJS((exports, module) => {
       var requestDetails = {
         url: currentUrl,
         method,
-        headers: requestHeaders
+        headers: requestHeaders2
       };
       beforeRedirect(this._options, responseDetails, requestDetails);
       this._sanitizeOptions(this._options);
@@ -15747,7 +15747,7 @@ var require_axios = __commonJS((exports, module) => {
     return new Promise(function dispatchXhrRequest(resolve, reject) {
       const _config = resolveConfig(config);
       let requestData = _config.data;
-      const requestHeaders = AxiosHeaders.from(_config.headers).normalize();
+      const requestHeaders2 = AxiosHeaders.from(_config.headers).normalize();
       let {
         responseType,
         onUploadProgress,
@@ -15824,9 +15824,9 @@ var require_axios = __commonJS((exports, module) => {
         reject(new AxiosError(timeoutErrorMessage, transitional.clarifyTimeoutError ? AxiosError.ETIMEDOUT : AxiosError.ECONNABORTED, config, request));
         request = null;
       };
-      requestData === undefined && requestHeaders.setContentType(null);
+      requestData === undefined && requestHeaders2.setContentType(null);
       if ("setRequestHeader" in request) {
-        utils$1.forEach(requestHeaders.toJSON(), function setRequestHeader(val, key) {
+        utils$1.forEach(requestHeaders2.toJSON(), function setRequestHeader(val, key) {
           request.setRequestHeader(key, val);
         });
       }
@@ -15990,10 +15990,10 @@ var require_axios = __commonJS((exports, module) => {
     isFunction
   } = utils$1;
   var globalFetchAPI = (({
-    Request,
+    Request: Request2,
     Response: Response2
   }) => ({
-    Request,
+    Request: Request2,
     Response: Response2
   }))(utils$1.global);
   var {
@@ -16013,21 +16013,21 @@ var require_axios = __commonJS((exports, module) => {
     }, globalFetchAPI, env);
     const {
       fetch: envFetch,
-      Request,
+      Request: Request2,
       Response: Response2
     } = env;
     const isFetchSupported = envFetch ? isFunction(envFetch) : typeof fetch === "function";
-    const isRequestSupported = isFunction(Request);
+    const isRequestSupported = isFunction(Request2);
     const isResponseSupported = isFunction(Response2);
     if (!isFetchSupported) {
       return false;
     }
     const isReadableStreamSupported = isFetchSupported && isFunction(ReadableStream$1);
-    const encodeText = isFetchSupported && (typeof TextEncoder$1 === "function" ? ((encoder) => (str) => encoder.encode(str))(new TextEncoder$1) : async (str) => new Uint8Array(await new Request(str).arrayBuffer()));
+    const encodeText = isFetchSupported && (typeof TextEncoder$1 === "function" ? ((encoder) => (str) => encoder.encode(str))(new TextEncoder$1) : async (str) => new Uint8Array(await new Request2(str).arrayBuffer()));
     const supportsRequestStream = isRequestSupported && isReadableStreamSupported && test(() => {
       let duplexAccessed = false;
       const body = new ReadableStream$1;
-      const hasContentType = new Request(platform.origin, {
+      const hasContentType = new Request2(platform.origin, {
         body,
         method: "POST",
         get duplex() {
@@ -16061,7 +16061,7 @@ var require_axios = __commonJS((exports, module) => {
         return body.size;
       }
       if (utils$1.isSpecCompliantForm(body)) {
-        const _request = new Request(platform.origin, {
+        const _request = new Request2(platform.origin, {
           method: "POST",
           body
         });
@@ -16106,7 +16106,7 @@ var require_axios = __commonJS((exports, module) => {
       let requestContentLength;
       try {
         if (onUploadProgress && supportsRequestStream && method !== "get" && method !== "head" && (requestContentLength = await resolveBodyLength(headers, data)) !== 0) {
-          let _request = new Request(url2, {
+          let _request = new Request2(url2, {
             method: "POST",
             body: data,
             duplex: "half"
@@ -16123,7 +16123,7 @@ var require_axios = __commonJS((exports, module) => {
         if (!utils$1.isString(withCredentials)) {
           withCredentials = withCredentials ? "include" : "omit";
         }
-        const isCredentialsSupported = isRequestSupported && "credentials" in Request.prototype;
+        const isCredentialsSupported = isRequestSupported && "credentials" in Request2.prototype;
         const resolvedOptions = {
           ...fetchOptions,
           signal: composedSignal,
@@ -16133,7 +16133,7 @@ var require_axios = __commonJS((exports, module) => {
           duplex: "half",
           credentials: isCredentialsSupported ? withCredentials : undefined
         };
-        request = isRequestSupported && new Request(url2, resolvedOptions);
+        request = isRequestSupported && new Request2(url2, resolvedOptions);
         let response = await (isRequestSupported ? _fetch(request, fetchOptions) : _fetch(url2, resolvedOptions));
         const isStreamResponse = supportsResponseStream && (responseType === "stream" || responseType === "response");
         if (supportsResponseStream && (onDownloadProgress || isStreamResponse && unsubscribe)) {
@@ -16177,10 +16177,10 @@ var require_axios = __commonJS((exports, module) => {
     let env = config && config.env || {};
     const {
       fetch: fetch2,
-      Request,
+      Request: Request2,
       Response: Response2
     } = env;
-    const seeds = [Request, Response2, fetch2];
+    const seeds = [Request2, Response2, fetch2];
     let len = seeds.length, i = len, seed, target, map = seedCache;
     while (i--) {
       seed = seeds[i];
@@ -20591,34 +20591,34 @@ var require_logger2 = __commonJS((exports) => {
 var require_safe_buffer = __commonJS((exports, module) => {
   /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
   var buffer = __require("buffer");
-  var Buffer2 = buffer.Buffer;
+  var Buffer3 = buffer.Buffer;
   function copyProps(src, dst) {
     for (var key in src) {
       dst[key] = src[key];
     }
   }
-  if (Buffer2.from && Buffer2.alloc && Buffer2.allocUnsafe && Buffer2.allocUnsafeSlow) {
+  if (Buffer3.from && Buffer3.alloc && Buffer3.allocUnsafe && Buffer3.allocUnsafeSlow) {
     module.exports = buffer;
   } else {
     copyProps(buffer, exports);
     exports.Buffer = SafeBuffer;
   }
   function SafeBuffer(arg, encodingOrOffset, length) {
-    return Buffer2(arg, encodingOrOffset, length);
+    return Buffer3(arg, encodingOrOffset, length);
   }
-  SafeBuffer.prototype = Object.create(Buffer2.prototype);
-  copyProps(Buffer2, SafeBuffer);
+  SafeBuffer.prototype = Object.create(Buffer3.prototype);
+  copyProps(Buffer3, SafeBuffer);
   SafeBuffer.from = function(arg, encodingOrOffset, length) {
     if (typeof arg === "number") {
       throw new TypeError("Argument must not be a number");
     }
-    return Buffer2(arg, encodingOrOffset, length);
+    return Buffer3(arg, encodingOrOffset, length);
   };
   SafeBuffer.alloc = function(size, fill, encoding) {
     if (typeof size !== "number") {
       throw new TypeError("Argument must be a number");
     }
-    var buf = Buffer2(size);
+    var buf = Buffer3(size);
     if (fill !== undefined) {
       if (typeof encoding === "string") {
         buf.fill(fill, encoding);
@@ -20634,7 +20634,7 @@ var require_safe_buffer = __commonJS((exports, module) => {
     if (typeof size !== "number") {
       throw new TypeError("Argument must be a number");
     }
-    return Buffer2(size);
+    return Buffer3(size);
   };
   SafeBuffer.allocUnsafeSlow = function(size) {
     if (typeof size !== "number") {
@@ -20646,7 +20646,7 @@ var require_safe_buffer = __commonJS((exports, module) => {
 
 // node_modules/jws/lib/data-stream.js
 var require_data_stream = __commonJS((exports, module) => {
-  var Buffer2 = require_safe_buffer().Buffer;
+  var Buffer3 = require_safe_buffer().Buffer;
   var Stream = __require("stream");
   var util3 = __require("util");
   function DataStream(data) {
@@ -20654,11 +20654,11 @@ var require_data_stream = __commonJS((exports, module) => {
     this.writable = true;
     this.readable = true;
     if (!data) {
-      this.buffer = Buffer2.alloc(0);
+      this.buffer = Buffer3.alloc(0);
       return this;
     }
     if (typeof data.pipe === "function") {
-      this.buffer = Buffer2.alloc(0);
+      this.buffer = Buffer3.alloc(0);
       data.pipe(this);
       return this;
     }
@@ -20676,7 +20676,7 @@ var require_data_stream = __commonJS((exports, module) => {
   }
   util3.inherits(DataStream, Stream);
   DataStream.prototype.write = function write(data) {
-    this.buffer = Buffer2.concat([this.buffer, Buffer2.from(data)]);
+    this.buffer = Buffer3.concat([this.buffer, Buffer3.from(data)]);
     this.emit("data", data);
   };
   DataStream.prototype.end = function end(data) {
@@ -20713,7 +20713,7 @@ var require_param_bytes_for_alg = __commonJS((exports, module) => {
 
 // node_modules/ecdsa-sig-formatter/src/ecdsa-sig-formatter.js
 var require_ecdsa_sig_formatter = __commonJS((exports, module) => {
-  var Buffer2 = require_safe_buffer().Buffer;
+  var Buffer3 = require_safe_buffer().Buffer;
   var getParamBytesForAlg = require_param_bytes_for_alg();
   var MAX_OCTET = 128;
   var CLASS_UNIVERSAL = 0;
@@ -20726,10 +20726,10 @@ var require_ecdsa_sig_formatter = __commonJS((exports, module) => {
     return base64.replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
   }
   function signatureAsBuffer(signature) {
-    if (Buffer2.isBuffer(signature)) {
+    if (Buffer3.isBuffer(signature)) {
       return signature;
     } else if (typeof signature === "string") {
-      return Buffer2.from(signature, "base64");
+      return Buffer3.from(signature, "base64");
     }
     throw new TypeError("ECDSA signature must be a Base64 string or a Buffer");
   }
@@ -20777,7 +20777,7 @@ var require_ecdsa_sig_formatter = __commonJS((exports, module) => {
       throw new Error('Expected to consume entire buffer, but "' + (inputLength - offset) + '" bytes remain');
     }
     var rPadding = paramBytes - rLength, sPadding = paramBytes - sLength;
-    var dst = Buffer2.allocUnsafe(rPadding + rLength + sPadding + sLength);
+    var dst = Buffer3.allocUnsafe(rPadding + rLength + sPadding + sLength);
     for (offset = 0;offset < rPadding; ++offset) {
       dst[offset] = 0;
     }
@@ -20815,7 +20815,7 @@ var require_ecdsa_sig_formatter = __commonJS((exports, module) => {
     var sLength = paramBytes - sPadding;
     var rsBytes = 1 + 1 + rLength + 1 + 1 + sLength;
     var shortLength = rsBytes < MAX_OCTET;
-    var dst = Buffer2.allocUnsafe((shortLength ? 2 : 3) + rsBytes);
+    var dst = Buffer3.allocUnsafe((shortLength ? 2 : 3) + rsBytes);
     var offset = 0;
     dst[offset++] = ENCODED_TAG_SEQ;
     if (shortLength) {
@@ -20850,11 +20850,11 @@ var require_ecdsa_sig_formatter = __commonJS((exports, module) => {
 
 // node_modules/buffer-equal-constant-time/index.js
 var require_buffer_equal_constant_time = __commonJS((exports, module) => {
-  var Buffer2 = __require("buffer").Buffer;
+  var Buffer3 = __require("buffer").Buffer;
   var SlowBuffer = __require("buffer").SlowBuffer;
   module.exports = bufferEq;
   function bufferEq(a, b) {
-    if (!Buffer2.isBuffer(a) || !Buffer2.isBuffer(b)) {
+    if (!Buffer3.isBuffer(a) || !Buffer3.isBuffer(b)) {
       return false;
     }
     if (a.length !== b.length) {
@@ -20867,21 +20867,21 @@ var require_buffer_equal_constant_time = __commonJS((exports, module) => {
     return c === 0;
   }
   bufferEq.install = function() {
-    Buffer2.prototype.equal = SlowBuffer.prototype.equal = function equal(that) {
+    Buffer3.prototype.equal = SlowBuffer.prototype.equal = function equal(that) {
       return bufferEq(this, that);
     };
   };
-  var origBufEqual = Buffer2.prototype.equal;
+  var origBufEqual = Buffer3.prototype.equal;
   var origSlowBufEqual = SlowBuffer.prototype.equal;
   bufferEq.restore = function() {
-    Buffer2.prototype.equal = origBufEqual;
+    Buffer3.prototype.equal = origBufEqual;
     SlowBuffer.prototype.equal = origSlowBufEqual;
   };
 });
 
 // node_modules/jwa/index.js
 var require_jwa = __commonJS((exports, module) => {
-  var Buffer2 = require_safe_buffer().Buffer;
+  var Buffer3 = require_safe_buffer().Buffer;
   var crypto3 = __require("crypto");
   var formatEcdsa = require_ecdsa_sig_formatter();
   var util3 = __require("util");
@@ -20897,7 +20897,7 @@ var require_jwa = __commonJS((exports, module) => {
     MSG_INVALID_SECRET += "or a KeyObject";
   }
   function checkIsPublicKey(key) {
-    if (Buffer2.isBuffer(key)) {
+    if (Buffer3.isBuffer(key)) {
       return;
     }
     if (typeof key === "string") {
@@ -20920,7 +20920,7 @@ var require_jwa = __commonJS((exports, module) => {
     }
   }
   function checkIsPrivateKey(key) {
-    if (Buffer2.isBuffer(key)) {
+    if (Buffer3.isBuffer(key)) {
       return;
     }
     if (typeof key === "string") {
@@ -20932,7 +20932,7 @@ var require_jwa = __commonJS((exports, module) => {
     throw typeError(MSG_INVALID_SIGNER_KEY);
   }
   function checkIsSecretKey(key) {
-    if (Buffer2.isBuffer(key)) {
+    if (Buffer3.isBuffer(key)) {
       return;
     }
     if (typeof key === "string") {
@@ -20970,7 +20970,7 @@ var require_jwa = __commonJS((exports, module) => {
     return new TypeError(errMsg);
   }
   function bufferOrString(obj) {
-    return Buffer2.isBuffer(obj) || typeof obj === "string";
+    return Buffer3.isBuffer(obj) || typeof obj === "string";
   }
   function normalizeInput(thing) {
     if (!bufferOrString(thing))
@@ -21001,7 +21001,7 @@ var require_jwa = __commonJS((exports, module) => {
   function createHmacVerifier(bits) {
     return function verify(thing, signature, secret) {
       var computedSig = createHmacSigner(bits)(thing, secret);
-      return timingSafeEqual2(Buffer2.from(signature), Buffer2.from(computedSig));
+      return timingSafeEqual2(Buffer3.from(signature), Buffer3.from(computedSig));
     };
   }
   function createKeySigner(bits) {
@@ -21105,11 +21105,11 @@ var require_jwa = __commonJS((exports, module) => {
 
 // node_modules/jws/lib/tostring.js
 var require_tostring = __commonJS((exports, module) => {
-  var Buffer2 = __require("buffer").Buffer;
+  var Buffer3 = __require("buffer").Buffer;
   module.exports = function toString(obj) {
     if (typeof obj === "string")
       return obj;
-    if (typeof obj === "number" || Buffer2.isBuffer(obj))
+    if (typeof obj === "number" || Buffer3.isBuffer(obj))
       return obj.toString();
     return JSON.stringify(obj);
   };
@@ -21117,14 +21117,14 @@ var require_tostring = __commonJS((exports, module) => {
 
 // node_modules/jws/lib/sign-stream.js
 var require_sign_stream = __commonJS((exports, module) => {
-  var Buffer2 = require_safe_buffer().Buffer;
+  var Buffer3 = require_safe_buffer().Buffer;
   var DataStream = require_data_stream();
   var jwa = require_jwa();
   var Stream = __require("stream");
   var toString = require_tostring();
   var util3 = __require("util");
   function base64url(string, encoding) {
-    return Buffer2.from(string, encoding).toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
+    return Buffer3.from(string, encoding).toString("base64").replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_");
   }
   function jwsSecuredInput(header, payload, encoding) {
     encoding = encoding || "utf8";
@@ -21190,7 +21190,7 @@ var require_sign_stream = __commonJS((exports, module) => {
 
 // node_modules/jws/lib/verify-stream.js
 var require_verify_stream = __commonJS((exports, module) => {
-  var Buffer2 = require_safe_buffer().Buffer;
+  var Buffer3 = require_safe_buffer().Buffer;
   var DataStream = require_data_stream();
   var jwa = require_jwa();
   var Stream = __require("stream");
@@ -21211,7 +21211,7 @@ var require_verify_stream = __commonJS((exports, module) => {
   }
   function headerFromJWS(jwsSig) {
     var encodedHeader = jwsSig.split(".", 1)[0];
-    return safeJsonParse(Buffer2.from(encodedHeader, "base64").toString("binary"));
+    return safeJsonParse(Buffer3.from(encodedHeader, "base64").toString("binary"));
   }
   function securedInputFromJWS(jwsSig) {
     return jwsSig.split(".", 2).join(".");
@@ -21222,7 +21222,7 @@ var require_verify_stream = __commonJS((exports, module) => {
   function payloadFromJWS(jwsSig, encoding) {
     encoding = encoding || "utf8";
     var payload = jwsSig.split(".")[1];
-    return Buffer2.from(payload, "base64").toString(encoding);
+    return Buffer3.from(payload, "base64").toString(encoding);
   }
   function isValidJws(string) {
     return JWS_REGEX.test(string) && !!headerFromJWS(string);
@@ -26005,7 +26005,7 @@ var require_http_errors = __commonJS((exports, module) => {
 // node_modules/safer-buffer/safer.js
 var require_safer = __commonJS((exports, module) => {
   var buffer = __require("buffer");
-  var Buffer2 = buffer.Buffer;
+  var Buffer3 = buffer.Buffer;
   var safer = {};
   var key;
   for (key in buffer) {
@@ -26016,14 +26016,14 @@ var require_safer = __commonJS((exports, module) => {
     safer[key] = buffer[key];
   }
   var Safer = safer.Buffer = {};
-  for (key in Buffer2) {
-    if (!Buffer2.hasOwnProperty(key))
+  for (key in Buffer3) {
+    if (!Buffer3.hasOwnProperty(key))
       continue;
     if (key === "allocUnsafe" || key === "allocUnsafeSlow")
       continue;
-    Safer[key] = Buffer2[key];
+    Safer[key] = Buffer3[key];
   }
-  safer.Buffer.prototype = Buffer2.prototype;
+  safer.Buffer.prototype = Buffer3.prototype;
   if (!Safer.from || Safer.from === Uint8Array.from) {
     Safer.from = function(value, encodingOrOffset, length) {
       if (typeof value === "number") {
@@ -26032,7 +26032,7 @@ var require_safer = __commonJS((exports, module) => {
       if (value && typeof value.length === "undefined") {
         throw new TypeError("The first argument must be one of type string, Buffer, ArrayBuffer, Array, or Array-like Object. Received type " + typeof value);
       }
-      return Buffer2(value, encodingOrOffset, length);
+      return Buffer3(value, encodingOrOffset, length);
     };
   }
   if (!Safer.alloc) {
@@ -26043,7 +26043,7 @@ var require_safer = __commonJS((exports, module) => {
       if (size < 0 || size >= 2 * (1 << 30)) {
         throw new RangeError('The value "' + size + '" is invalid for option "size"');
       }
-      var buf = Buffer2(size);
+      var buf = Buffer3(size);
       if (!fill || fill.length === 0) {
         buf.fill(0);
       } else if (typeof encoding === "string") {
@@ -26128,7 +26128,7 @@ var require_merge_exports = __commonJS((exports, module) => {
 
 // node_modules/iconv-lite/encodings/internal.js
 var require_internal = __commonJS((exports, module) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   module.exports = {
     utf8: { type: "_internal", bomAware: true },
     cesu8: { type: "_internal", bomAware: true },
@@ -26150,7 +26150,7 @@ var require_internal = __commonJS((exports, module) => {
     } else if (this.enc === "cesu8") {
       this.enc = "utf8";
       this.encoder = InternalEncoderCesu8;
-      if (Buffer2.from("eda0bdedb2a9", "hex").toString() !== "\uD83D\uDCA9") {
+      if (Buffer3.from("eda0bdedb2a9", "hex").toString() !== "\uD83D\uDCA9") {
         this.decoder = InternalDecoderCesu8;
         this.defaultCharUnicode = iconv.defaultCharUnicode;
       }
@@ -26163,8 +26163,8 @@ var require_internal = __commonJS((exports, module) => {
     this.decoder = new StringDecoder(codec.enc);
   }
   InternalDecoder.prototype.write = function(buf) {
-    if (!Buffer2.isBuffer(buf)) {
-      buf = Buffer2.from(buf);
+    if (!Buffer3.isBuffer(buf)) {
+      buf = Buffer3.from(buf);
     }
     return this.decoder.write(buf);
   };
@@ -26175,7 +26175,7 @@ var require_internal = __commonJS((exports, module) => {
     this.enc = codec.enc;
   }
   InternalEncoder.prototype.write = function(str) {
-    return Buffer2.from(str, this.enc);
+    return Buffer3.from(str, this.enc);
   };
   InternalEncoder.prototype.end = function() {};
   function InternalEncoderBase64(options, codec) {
@@ -26186,14 +26186,14 @@ var require_internal = __commonJS((exports, module) => {
     var completeQuads = str.length - str.length % 4;
     this.prevStr = str.slice(completeQuads);
     str = str.slice(0, completeQuads);
-    return Buffer2.from(str, "base64");
+    return Buffer3.from(str, "base64");
   };
   InternalEncoderBase64.prototype.end = function() {
-    return Buffer2.from(this.prevStr, "base64");
+    return Buffer3.from(this.prevStr, "base64");
   };
   function InternalEncoderCesu8(options, codec) {}
   InternalEncoderCesu8.prototype.write = function(str) {
-    var buf = Buffer2.alloc(str.length * 3);
+    var buf = Buffer3.alloc(str.length * 3);
     var bufIdx = 0;
     for (var i = 0;i < str.length; i++) {
       var charCode = str.charCodeAt(i);
@@ -26288,20 +26288,20 @@ var require_internal = __commonJS((exports, module) => {
         str = str.slice(0, str.length - 1);
       }
     }
-    return Buffer2.from(str, this.enc);
+    return Buffer3.from(str, this.enc);
   };
   InternalEncoderUtf8.prototype.end = function() {
     if (this.highSurrogate) {
       var str = this.highSurrogate;
       this.highSurrogate = "";
-      return Buffer2.from(str, this.enc);
+      return Buffer3.from(str, this.enc);
     }
   };
 });
 
 // node_modules/iconv-lite/encodings/utf32.js
 var require_utf32 = __commonJS((exports) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   exports._utf32 = Utf32Codec;
   function Utf32Codec(codecOptions, iconv) {
     this.iconv = iconv;
@@ -26319,8 +26319,8 @@ var require_utf32 = __commonJS((exports) => {
     this.highSurrogate = 0;
   }
   Utf32Encoder.prototype.write = function(str) {
-    var src = Buffer2.from(str, "ucs2");
-    var dst = Buffer2.alloc(src.length * 2);
+    var src = Buffer3.from(str, "ucs2");
+    var dst = Buffer3.alloc(src.length * 2);
     var write32 = this.isLE ? dst.writeUInt32LE : dst.writeUInt32BE;
     var offset = 0;
     for (var i = 0;i < src.length; i += 2) {
@@ -26356,7 +26356,7 @@ var require_utf32 = __commonJS((exports) => {
     if (!this.highSurrogate) {
       return;
     }
-    var buf = Buffer2.alloc(4);
+    var buf = Buffer3.alloc(4);
     if (this.isLE) {
       buf.writeUInt32LE(this.highSurrogate, 0);
     } else {
@@ -26376,7 +26376,7 @@ var require_utf32 = __commonJS((exports) => {
     }
     var i = 0;
     var codepoint = 0;
-    var dst = Buffer2.alloc(src.length + 4);
+    var dst = Buffer3.alloc(src.length + 4);
     var offset = 0;
     var isLE = this.isLE;
     var overflow = this.overflow;
@@ -26535,7 +26535,7 @@ var require_utf32 = __commonJS((exports) => {
 
 // node_modules/iconv-lite/encodings/utf16.js
 var require_utf16 = __commonJS((exports) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   exports.utf16be = Utf16BECodec;
   function Utf16BECodec() {}
   Utf16BECodec.prototype.encoder = Utf16BEEncoder;
@@ -26543,7 +26543,7 @@ var require_utf16 = __commonJS((exports) => {
   Utf16BECodec.prototype.bomAware = true;
   function Utf16BEEncoder() {}
   Utf16BEEncoder.prototype.write = function(str) {
-    var buf = Buffer2.from(str, "ucs2");
+    var buf = Buffer3.from(str, "ucs2");
     for (var i = 0;i < buf.length; i += 2) {
       var tmp = buf[i];
       buf[i] = buf[i + 1];
@@ -26559,7 +26559,7 @@ var require_utf16 = __commonJS((exports) => {
     if (buf.length == 0) {
       return "";
     }
-    var buf2 = Buffer2.alloc(buf.length + 1);
+    var buf2 = Buffer3.alloc(buf.length + 1);
     var i = 0;
     var j = 0;
     if (this.overflowByte !== -1) {
@@ -26678,7 +26678,7 @@ var require_utf16 = __commonJS((exports) => {
 
 // node_modules/iconv-lite/encodings/utf7.js
 var require_utf7 = __commonJS((exports) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   exports.utf7 = Utf7Codec;
   exports.unicode11utf7 = "utf7";
   function Utf7Codec(codecOptions, iconv) {
@@ -26692,7 +26692,7 @@ var require_utf7 = __commonJS((exports) => {
     this.iconv = codec.iconv;
   }
   Utf7Encoder.prototype.write = function(str) {
-    return Buffer2.from(str.replace(nonDirectChars, function(chunk) {
+    return Buffer3.from(str.replace(nonDirectChars, function(chunk) {
       return "+" + (chunk === "+" ? "" : this.iconv.encode(chunk, "utf16-be").toString("base64").replace(/=+$/, "")) + "-";
     }.bind(this)));
   };
@@ -26729,7 +26729,7 @@ var require_utf7 = __commonJS((exports) => {
             res += "+";
           } else {
             var b64str = base64Accum + this.iconv.decode(buf.slice(lastI, i2), "ascii");
-            res += this.iconv.decode(Buffer2.from(b64str, "base64"), "utf16-be");
+            res += this.iconv.decode(Buffer3.from(b64str, "base64"), "utf16-be");
           }
           if (buf[i2] != minusChar) {
             i2--;
@@ -26747,7 +26747,7 @@ var require_utf7 = __commonJS((exports) => {
       var canBeDecoded = b64str.length - b64str.length % 8;
       base64Accum = b64str.slice(canBeDecoded);
       b64str = b64str.slice(0, canBeDecoded);
-      res += this.iconv.decode(Buffer2.from(b64str, "base64"), "utf16-be");
+      res += this.iconv.decode(Buffer3.from(b64str, "base64"), "utf16-be");
     }
     this.inBase64 = inBase64;
     this.base64Accum = base64Accum;
@@ -26756,7 +26756,7 @@ var require_utf7 = __commonJS((exports) => {
   Utf7Decoder.prototype.end = function() {
     var res = "";
     if (this.inBase64 && this.base64Accum.length > 0) {
-      res = this.iconv.decode(Buffer2.from(this.base64Accum, "base64"), "utf16-be");
+      res = this.iconv.decode(Buffer3.from(this.base64Accum, "base64"), "utf16-be");
     }
     this.inBase64 = false;
     this.base64Accum = "";
@@ -26772,14 +26772,14 @@ var require_utf7 = __commonJS((exports) => {
   function Utf7IMAPEncoder(options, codec) {
     this.iconv = codec.iconv;
     this.inBase64 = false;
-    this.base64Accum = Buffer2.alloc(6);
+    this.base64Accum = Buffer3.alloc(6);
     this.base64AccumIdx = 0;
   }
   Utf7IMAPEncoder.prototype.write = function(str) {
     var inBase64 = this.inBase64;
     var base64Accum = this.base64Accum;
     var base64AccumIdx = this.base64AccumIdx;
-    var buf = Buffer2.alloc(str.length * 5 + 10);
+    var buf = Buffer3.alloc(str.length * 5 + 10);
     var bufIdx = 0;
     for (var i2 = 0;i2 < str.length; i2++) {
       var uChar = str.charCodeAt(i2);
@@ -26818,7 +26818,7 @@ var require_utf7 = __commonJS((exports) => {
     return buf.slice(0, bufIdx);
   };
   Utf7IMAPEncoder.prototype.end = function() {
-    var buf = Buffer2.alloc(10);
+    var buf = Buffer3.alloc(10);
     var bufIdx = 0;
     if (this.inBase64) {
       if (this.base64AccumIdx > 0) {
@@ -26855,7 +26855,7 @@ var require_utf7 = __commonJS((exports) => {
             res += "&";
           } else {
             var b64str = base64Accum + this.iconv.decode(buf.slice(lastI, i2), "ascii").replace(/,/g, "/");
-            res += this.iconv.decode(Buffer2.from(b64str, "base64"), "utf16-be");
+            res += this.iconv.decode(Buffer3.from(b64str, "base64"), "utf16-be");
           }
           if (buf[i2] != minusChar) {
             i2--;
@@ -26873,7 +26873,7 @@ var require_utf7 = __commonJS((exports) => {
       var canBeDecoded = b64str.length - b64str.length % 8;
       base64Accum = b64str.slice(canBeDecoded);
       b64str = b64str.slice(0, canBeDecoded);
-      res += this.iconv.decode(Buffer2.from(b64str, "base64"), "utf16-be");
+      res += this.iconv.decode(Buffer3.from(b64str, "base64"), "utf16-be");
     }
     this.inBase64 = inBase64;
     this.base64Accum = base64Accum;
@@ -26882,7 +26882,7 @@ var require_utf7 = __commonJS((exports) => {
   Utf7IMAPDecoder.prototype.end = function() {
     var res = "";
     if (this.inBase64 && this.base64Accum.length > 0) {
-      res = this.iconv.decode(Buffer2.from(this.base64Accum, "base64"), "utf16-be");
+      res = this.iconv.decode(Buffer3.from(this.base64Accum, "base64"), "utf16-be");
     }
     this.inBase64 = false;
     this.base64Accum = "";
@@ -26892,7 +26892,7 @@ var require_utf7 = __commonJS((exports) => {
 
 // node_modules/iconv-lite/encodings/sbcs-codec.js
 var require_sbcs_codec = __commonJS((exports) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   exports._sbcs = SBCSCodec;
   function SBCSCodec(codecOptions, iconv) {
     if (!codecOptions) {
@@ -26908,8 +26908,8 @@ var require_sbcs_codec = __commonJS((exports) => {
       }
       codecOptions.chars = asciiString + codecOptions.chars;
     }
-    this.decodeBuf = Buffer2.from(codecOptions.chars, "ucs2");
-    var encodeBuf = Buffer2.alloc(65536, iconv.defaultCharSingleByte.charCodeAt(0));
+    this.decodeBuf = Buffer3.from(codecOptions.chars, "ucs2");
+    var encodeBuf = Buffer3.alloc(65536, iconv.defaultCharSingleByte.charCodeAt(0));
     for (var i = 0;i < codecOptions.chars.length; i++) {
       encodeBuf[codecOptions.chars.charCodeAt(i)] = i;
     }
@@ -26921,7 +26921,7 @@ var require_sbcs_codec = __commonJS((exports) => {
     this.encodeBuf = codec.encodeBuf;
   }
   SBCSEncoder.prototype.write = function(str) {
-    var buf = Buffer2.alloc(str.length);
+    var buf = Buffer3.alloc(str.length);
     for (var i = 0;i < str.length; i++) {
       buf[i] = this.encodeBuf[str.charCodeAt(i)];
     }
@@ -26933,7 +26933,7 @@ var require_sbcs_codec = __commonJS((exports) => {
   }
   SBCSDecoder.prototype.write = function(buf) {
     var decodeBuf = this.decodeBuf;
-    var newBuf = Buffer2.alloc(buf.length * 2);
+    var newBuf = Buffer3.alloc(buf.length * 2);
     var idx1 = 0;
     var idx2 = 0;
     for (var i = 0;i < buf.length; i++) {
@@ -27554,7 +27554,7 @@ var require_sbcs_data_generated = __commonJS((exports, module) => {
 
 // node_modules/iconv-lite/encodings/dbcs-codec.js
 var require_dbcs_codec = __commonJS((exports) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   exports._dbcs = DBCSCodec;
   var UNASSIGNED = -1;
   var GB18030_CODE = -2;
@@ -27793,7 +27793,7 @@ var require_dbcs_codec = __commonJS((exports) => {
     this.gb18030 = codec.gb18030;
   }
   DBCSEncoder.prototype.write = function(str) {
-    var newBuf = Buffer2.alloc(str.length * (this.gb18030 ? 4 : 3));
+    var newBuf = Buffer3.alloc(str.length * (this.gb18030 ? 4 : 3));
     var leadSurrogate = this.leadSurrogate;
     var seqObj = this.seqObj;
     var nextChar = -1;
@@ -27897,7 +27897,7 @@ var require_dbcs_codec = __commonJS((exports) => {
     if (this.leadSurrogate === -1 && this.seqObj === undefined) {
       return;
     }
-    var newBuf = Buffer2.alloc(10);
+    var newBuf = Buffer3.alloc(10);
     var j = 0;
     if (this.seqObj) {
       var dbcsCode = this.seqObj[DEF_CHAR];
@@ -27927,7 +27927,7 @@ var require_dbcs_codec = __commonJS((exports) => {
     this.gb18030 = codec.gb18030;
   }
   DBCSDecoder.prototype.write = function(buf) {
-    var newBuf = Buffer2.alloc(buf.length * 2);
+    var newBuf = Buffer3.alloc(buf.length * 2);
     var nodeIdx = this.nodeIdx;
     var prevBytes = this.prevBytes;
     var prevOffset = this.prevBytes.length;
@@ -29437,7 +29437,7 @@ var require_encodings = __commonJS((exports, module) => {
 
 // node_modules/iconv-lite/lib/streams.js
 var require_streams = __commonJS((exports, module) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   module.exports = function(streamModule) {
     var Transform = streamModule.Transform;
     function IconvLiteEncoderStream(conv, options) {
@@ -29479,7 +29479,7 @@ var require_streams = __commonJS((exports, module) => {
         chunks.push(chunk);
       });
       this.on("end", function() {
-        cb(null, Buffer2.concat(chunks));
+        cb(null, Buffer3.concat(chunks));
       });
       return this;
     };
@@ -29493,7 +29493,7 @@ var require_streams = __commonJS((exports, module) => {
       constructor: { value: IconvLiteDecoderStream }
     });
     IconvLiteDecoderStream.prototype._transform = function(chunk, encoding, done) {
-      if (!Buffer2.isBuffer(chunk) && !(chunk instanceof Uint8Array)) {
+      if (!Buffer3.isBuffer(chunk) && !(chunk instanceof Uint8Array)) {
         return done(new Error("Iconv decoding stream needs buffers as its input."));
       }
       try {
@@ -29535,7 +29535,7 @@ var require_streams = __commonJS((exports, module) => {
 
 // node_modules/iconv-lite/lib/index.js
 var require_lib = __commonJS((exports, module) => {
-  var Buffer2 = require_safer().Buffer;
+  var Buffer3 = require_safer().Buffer;
   var bomHandling = require_bom_handling();
   var mergeModules = require_merge_exports();
   exports.encodings = null;
@@ -29546,7 +29546,7 @@ var require_lib = __commonJS((exports, module) => {
     var encoder = exports.getEncoder(encoding, options);
     var res = encoder.write(str);
     var trail = encoder.end();
-    return trail && trail.length > 0 ? Buffer2.concat([res, trail]) : res;
+    return trail && trail.length > 0 ? Buffer3.concat([res, trail]) : res;
   };
   exports.decode = function decode(buf, encoding, options) {
     if (typeof buf === "string") {
@@ -29554,7 +29554,7 @@ var require_lib = __commonJS((exports, module) => {
         console.error("Iconv-lite warning: decode()-ing strings is deprecated. Refer to https://github.com/ashtuchkin/iconv-lite/wiki/Use-Buffers-when-decoding");
         exports.skipDecodeWarning = true;
       }
-      buf = Buffer2.from("" + (buf || ""), "binary");
+      buf = Buffer3.from("" + (buf || ""), "binary");
     }
     var decoder = exports.getDecoder(encoding, options);
     var res = decoder.write(buf);
@@ -48737,7 +48737,7 @@ var require_utils3 = __commonJS((exports) => {
   var proxyaddr = require_proxy_addr();
   var qs = require_lib3();
   var querystring = __require("node:querystring");
-  var { Buffer: Buffer2 } = __require("node:buffer");
+  var { Buffer: Buffer3 } = __require("node:buffer");
   exports.methods = METHODS.map((method) => method.toLowerCase());
   exports.etag = createETagGenerator({ weak: false });
   exports.wetag = createETagGenerator({ weak: true });
@@ -48843,7 +48843,7 @@ var require_utils3 = __commonJS((exports) => {
   };
   function createETagGenerator(options) {
     return function generateETag(body, encoding) {
-      var buf = !Buffer2.isBuffer(body) ? Buffer2.from(body, encoding) : body;
+      var buf = !Buffer3.isBuffer(body) ? Buffer3.from(body, encoding) : body;
       return etag(buf, options);
     };
   }
@@ -51757,7 +51757,7 @@ var require_response2 = __commonJS((exports, module) => {
   var extname = path2.extname;
   var resolve = path2.resolve;
   var vary = require_vary();
-  var { Buffer: Buffer2 } = __require("node:buffer");
+  var { Buffer: Buffer3 } = __require("node:buffer");
   var res = Object.create(http.ServerResponse.prototype);
   module.exports = res;
   res.status = function status(code) {
@@ -51821,12 +51821,12 @@ var require_response2 = __commonJS((exports, module) => {
     var generateETag = !this.get("ETag") && typeof etagFn === "function";
     var len;
     if (chunk !== undefined) {
-      if (Buffer2.isBuffer(chunk)) {
+      if (Buffer3.isBuffer(chunk)) {
         len = chunk.length;
       } else if (!generateETag && chunk.length < 1000) {
-        len = Buffer2.byteLength(chunk, encoding);
+        len = Buffer3.byteLength(chunk, encoding);
       } else {
-        chunk = Buffer2.from(chunk, encoding);
+        chunk = Buffer3.from(chunk, encoding);
         encoding = undefined;
         len = chunk.length;
       }
@@ -52091,7 +52091,7 @@ var require_response2 = __commonJS((exports, module) => {
       }
     });
     this.status(status);
-    this.set("Content-Length", Buffer2.byteLength(body));
+    this.set("Content-Length", Buffer3.byteLength(body));
     if (this.req.method === "HEAD") {
       this.end();
     } else {
@@ -83338,7 +83338,7 @@ import { chmod, open, readFile as readFile2, rename, unlink, writeFile as writeF
 import { basename, dirname as dirname2, join as join3 } from "node:path";
 var DEFAULT_JSON_FILE_LOCK_OPTIONS = {
   retries: {
-    retries: 10,
+    retries: 20,
     factor: 2,
     minTimeout: 50,
     maxTimeout: 2000,
@@ -88771,6 +88771,11 @@ import { dirname as dirname6, join as join8, sep } from "node:path";
 // src/control/runner/runner-exit-diagnostics.ts
 import { unlink as unlink2 } from "node:fs/promises";
 import { dirname as dirname5, join as join7 } from "node:path";
+var RUNNER_EXIT_SENTINEL_PREFIX = "[clisbot] runner exited with status";
+var RUNNER_EXIT_LINGER_SECONDS = 8;
+function paneShowsRunnerExitSentinel(snapshot) {
+  return snapshot.includes(RUNNER_EXIT_SENTINEL_PREFIX);
+}
 function shellQuote(value) {
   if (/^[a-zA-Z0-9_./:@=-]+$/.test(value)) {
     return value;
@@ -88787,6 +88792,7 @@ function getRunnerExitRecordPath(stateDir, sessionName) {
   return join7(stateDir, "runner-exits", `${sanitizeSessionName2(sessionName)}.json`);
 }
 function buildRunnerLaunchCommand(params) {
+  const exitLingerSeconds = params.exitLingerSeconds ?? RUNNER_EXIT_LINGER_SECONDS;
   const runnerCommand = buildCommandString(params.command, params.args);
   const exitRecordPath = getRunnerExitRecordPath(params.stateDir, params.sessionName);
   const exitWriterScript = [
@@ -88809,6 +88815,7 @@ function buildRunnerLaunchCommand(params) {
     runnerCommand,
     "status=$?",
     `node -e ${shellQuote(exitWriterScript)} ${shellQuote(exitRecordPath)} ${shellQuote(params.sessionName)} "$status" ${shellQuote(runnerCommand)} || true`,
+    `if [ "$status" -ne 0 ]; then echo ${shellQuote(`${RUNNER_EXIT_SENTINEL_PREFIX} `)}"$status"; sleep ${exitLingerSeconds}; fi`,
     'exit "$status"'
   ].join("; ");
 }
@@ -89194,7 +89201,15 @@ class SessionStore {
     if (!await fileExists(this.storePath)) {
       return {};
     }
-    const text = await readTextFile(this.storePath);
+    let text;
+    try {
+      text = await readTextFile(this.storePath);
+    } catch (error) {
+      if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
+        return {};
+      }
+      throw error;
+    }
     if (!text.trim()) {
       return {};
     }
@@ -92140,9 +92155,8 @@ var PASTE_CONFIRM_MAX_ATTEMPTS = 3;
 var PASTE_CAPTURE_REVALIDATE_POLL_INTERVAL_MS = 40;
 var PASTE_CAPTURE_REVALIDATE_MAX_WAIT_MS = 160;
 var SUBMIT_CONFIRM_POLL_INTERVAL_MS = 40;
-var SUBMIT_CONFIRM_MAX_WAIT_MS = 160;
-var SUBMIT_SNAPSHOT_CONFIRM_POLL_INTERVAL_MS = 40;
-var SUBMIT_SNAPSHOT_CONFIRM_MAX_WAIT_MS = 320;
+var SUBMIT_CONFIRM_MAX_WAIT_MS = 600;
+var SUBMIT_ENTER_MAX_ATTEMPTS = 3;
 var POST_STATUS_SETTLE_POLL_INTERVAL_MS = 40;
 var POST_STATUS_SETTLE_QUIET_WINDOW_MS = 80;
 var POST_STATUS_SETTLE_MAX_WAIT_MS = 240;
@@ -92152,9 +92166,11 @@ var TMUX_SERVER_UNAVAILABLE_PATTERN = /(?:No such file or directory|error connec
 
 class TmuxBootstrapSessionLostError extends Error {
   sessionName;
-  constructor(sessionName, detail) {
+  lastSnapshot;
+  constructor(sessionName, detail, lastSnapshot = "") {
     super(`tmux bootstrap lost session "${sessionName}": ${detail}`);
     this.sessionName = sessionName;
+    this.lastSnapshot = lastSnapshot;
     this.name = "TmuxBootstrapSessionLostError";
   }
 }
@@ -92170,7 +92186,11 @@ class TmuxPasteUnconfirmedError extends Error {
 
 class TmuxSubmitUnconfirmedError extends Error {
   constructor() {
-    super("tmux submit was not confirmed after Enter. The pane state did not change, so clisbot did not treat the prompt as truthfully submitted.");
+    super([
+      "tmux submit was not confirmed after Enter: the pane did not change, so clisbot does not treat the prompt as truthfully submitted.",
+      "The runner may be busy, redrawing slowly, or showing a blocking prompt.",
+      "Check the live pane with `clisbot watch --latest --lines 100`; if your text is sitting unsubmitted there, send /nudge, otherwise resend the message."
+    ].join(" "));
     this.name = "TmuxSubmitUnconfirmedError";
   }
 }
@@ -92207,36 +92227,97 @@ async function submitTmuxSessionInput(params) {
   }
   const preSubmitState = pasteDelivery.state;
   const preSubmitSnapshot = normalizePaneText(await params.tmux.capturePane(params.sessionName, captureLines));
-  await params.tmux.sendKey(params.sessionName, "Enter");
-  const submitted = await waitForPaneSubmitConfirmation({
-    tmux: params.tmux,
-    sessionName: params.sessionName,
-    baseline: preSubmitState,
-    baselineSnapshot: preSubmitSnapshot,
-    captureLines
-  });
-  if (submitted.confirmed) {
-    return { submittedSnapshot: preSubmitSnapshot };
-  }
-  logLatencyDebug("tmux-submit-enter-retry", params.timingContext, {
-    sessionName: params.sessionName
-  });
-  await params.tmux.sendKey(params.sessionName, "Enter");
-  const retrySubmitted = await waitForPaneSubmitConfirmation({
-    tmux: params.tmux,
-    sessionName: params.sessionName,
-    baseline: preSubmitState,
-    baselineSnapshot: preSubmitSnapshot,
-    captureLines
-  });
-  if (retrySubmitted.confirmed) {
-    return { submittedSnapshot: preSubmitSnapshot };
+  for (let attempt = 1;attempt <= SUBMIT_ENTER_MAX_ATTEMPTS; attempt += 1) {
+    if (attempt > 1) {
+      logLatencyDebug("tmux-submit-enter-retry", params.timingContext, {
+        sessionName: params.sessionName,
+        attempt
+      });
+    }
+    await params.tmux.sendKey(params.sessionName, "Enter");
+    const outcome = await waitForSubmitSettled({
+      tmux: params.tmux,
+      sessionName: params.sessionName,
+      baseline: preSubmitState,
+      baselineSnapshot: preSubmitSnapshot,
+      text: params.text,
+      captureLines
+    });
+    if (outcome === "submitted") {
+      return { submittedSnapshot: preSubmitSnapshot };
+    }
   }
   logLatencyDebug("tmux-submit-unconfirmed", params.timingContext, {
     sessionName: params.sessionName
   });
   throw new TmuxSubmitUnconfirmedError;
 }
+async function waitForSubmitSettled(params) {
+  const deadline = Date.now() + SUBMIT_CONFIRM_MAX_WAIT_MS;
+  let sawChange = false;
+  while (true) {
+    let changed = sawChange;
+    if (!changed) {
+      const state = await params.tmux.getPaneState(params.sessionName);
+      changed = hasPaneStateChanged(params.baseline, state);
+    }
+    const snapshot = normalizePaneText(await params.tmux.capturePane(params.sessionName, params.captureLines));
+    if (!changed) {
+      changed = snapshot !== params.baselineSnapshot;
+    }
+    if (changed) {
+      sawChange = true;
+      if (!paneShowsPendingComposerText(snapshot, params.text)) {
+        return "submitted";
+      }
+    }
+    const remainingMs = deadline - Date.now();
+    if (remainingMs <= 0) {
+      return sawChange ? "pending-input" : "unchanged";
+    }
+    await sleep(Math.min(SUBMIT_CONFIRM_POLL_INTERVAL_MS, remainingMs));
+  }
+}
+var COMPOSER_HINT_LINE_PATTERN = /^\?\s+for shortcuts|^Type your message or @path\/to\/file|^\d+%\s+context left|^press enter to send/i;
+var COMPOSER_RUNNING_INDICATOR_PATTERN = /esc to interrupt/i;
+var COMPOSER_BORDER_LINE_PATTERN = /^[─━═╌╍╭╮╰╯┌┐└┘+|\-_=\s]+$/;
+var COMPOSER_TAIL_SCAN_LINES = 12;
+function paneShowsPendingComposerText(snapshot, text) {
+  const lastPromptLine = collapseWhitespace(lastNonEmptyLine(text));
+  if (!lastPromptLine) {
+    return false;
+  }
+  const lines = trimBlankLines(splitNormalizedLines(snapshot));
+  for (let index = lines.length - 1;index >= Math.max(0, lines.length - COMPOSER_TAIL_SCAN_LINES); index -= 1) {
+    const line = (lines[index] ?? "").trim();
+    if (!line || COMPOSER_HINT_LINE_PATTERN.test(line) || isPromptMetadataLine(line)) {
+      continue;
+    }
+    if (COMPOSER_RUNNING_INDICATOR_PATTERN.test(line)) {
+      return false;
+    }
+    if (COMPOSER_BORDER_LINE_PATTERN.test(line)) {
+      continue;
+    }
+    const stripped = stripComposerChrome(line);
+    if (!stripped) {
+      return false;
+    }
+    return stripped === lastPromptLine;
+  }
+  return false;
+}
+function stripComposerChrome(line) {
+  return collapseWhitespace(line.replace(/^[│┃]\s*/, "").replace(/\s*[│┃]$/, "").replace(/^[›❯>]+\s*/, ""));
+}
+function lastNonEmptyLine(text) {
+  const lines = text.split(`
+`).map((line) => line.trim()).filter(Boolean);
+  return lines[lines.length - 1] ?? "";
+}
+function collapseWhitespace(value) {
+  return value.replace(/\s+/g, " ").trim();
+}
 async function captureTmuxSessionIdentity(params) {
   await acceptTmuxStartupContinuePromptIfPresent({
     tmux: params.tmux,
@@ -92381,7 +92462,7 @@ async function waitForTmuxSessionBootstrap(params) {
         continue;
       }
       if (isBootstrapSessionGoneError(error)) {
-        throw buildBootstrapSessionLostError(params.sessionName, error);
+        throw buildBootstrapSessionLostError(params.sessionName, error, lastSnapshot);
       }
       throw error;
     }
@@ -92399,6 +92480,18 @@ async function waitForTmuxSessionBootstrap(params) {
         await sleep(SESSION_BOOTSTRAP_POLL_INTERVAL_MS);
         continue;
       }
+      if (params.resumeRejection?.detect(snapshot)) {
+        return {
+          status: "resume-rejected",
+          snapshot
+        };
+      }
+      if (params.exitDetection?.detect(snapshot)) {
+        return {
+          status: "exited",
+          snapshot
+        };
+      }
       for (const blocker of blockerPatterns) {
         if (blocker.regex.test(snapshot)) {
           return {
@@ -92449,56 +92542,6 @@ async function acceptStartupContinuePrompt(params) {
     return;
   }
 }
-async function waitForPaneSubmitConfirmation(params) {
-  const deadline = Date.now() + SUBMIT_CONFIRM_MAX_WAIT_MS;
-  while (true) {
-    const state = await params.tmux.getPaneState(params.sessionName);
-    if (hasPaneStateChanged(params.baseline, state)) {
-      return {
-        confirmed: true,
-        snapshot: normalizePaneText(await params.tmux.capturePane(params.sessionName, params.captureLines))
-      };
-    }
-    const snapshotChange = await waitForPaneSubmitSnapshotConfirmation({
-      tmux: params.tmux,
-      sessionName: params.sessionName,
-      baselineSnapshot: params.baselineSnapshot,
-      captureLines: params.captureLines,
-      maxWaitMs: Math.min(SUBMIT_SNAPSHOT_CONFIRM_MAX_WAIT_MS, Math.max(0, deadline - Date.now()))
-    });
-    if (snapshotChange.confirmed) {
-      return snapshotChange;
-    }
-    const remainingMs = deadline - Date.now();
-    if (remainingMs <= 0) {
-      return {
-        confirmed: false,
-        snapshot: params.baselineSnapshot
-      };
-    }
-    await sleep(Math.min(SUBMIT_CONFIRM_POLL_INTERVAL_MS, remainingMs));
-  }
-}
-async function waitForPaneSubmitSnapshotConfirmation(params) {
-  const deadline = Date.now() + params.maxWaitMs;
-  while (true) {
-    const snapshot = normalizePaneText(await params.tmux.capturePane(params.sessionName, params.captureLines));
-    if (snapshot !== params.baselineSnapshot) {
-      return {
-        confirmed: true,
-        snapshot
-      };
-    }
-    const remainingMs = deadline - Date.now();
-    if (remainingMs <= 0) {
-      return {
-        confirmed: false,
-        snapshot: params.baselineSnapshot
-      };
-    }
-    await sleep(Math.min(SUBMIT_SNAPSHOT_CONFIRM_POLL_INTERVAL_MS, remainingMs));
-  }
-}
 async function deliverTmuxPasteWithConfirmation(params) {
   for (let attempt = 1;attempt <= PASTE_CONFIRM_MAX_ATTEMPTS; attempt += 1) {
     if (attempt > 1) {
@@ -92637,9 +92680,9 @@ function isBootstrapSessionGoneError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return TMUX_MISSING_SESSION_PATTERN.test(message) || TMUX_SERVER_UNAVAILABLE_PATTERN.test(message);
 }
-function buildBootstrapSessionLostError(sessionName, error) {
+function buildBootstrapSessionLostError(sessionName, error, lastSnapshot = "") {
   const message = error instanceof Error ? error.message : String(error);
-  return new TmuxBootstrapSessionLostError(sessionName, message);
+  return new TmuxBootstrapSessionLostError(sessionName, message, lastSnapshot);
 }
 function arePaneStatesEqual(left, right) {
   return left.cursorX === right.cursorX && left.cursorY === right.cursorY && left.historySize === right.historySize;
@@ -92855,6 +92898,132 @@ function escapeRegExp(raw) {
   return raw.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
+// src/runners/resume-rejection.ts
+var RESUME_REJECTED_PATTERNS = [
+  /no saved session found with id/i,
+  /no conversation found with session id/i,
+  /no conversation found to resume/i,
+  /no session found with id/i,
+  /could not find (?:a )?session (?:with )?id/i
+];
+function paneShowsResumeRejected(snapshot) {
+  if (!snapshot) {
+    return false;
+  }
+  return RESUME_REJECTED_PATTERNS.some((pattern) => pattern.test(snapshot));
+}
+
+class RunnerResumeRejectedError extends Error {
+  sessionName;
+  storedSessionId;
+  lastPane;
+  constructor(sessionName, storedSessionId, lastPane = "") {
+    super(`Runner session "${sessionName}" could not resume stored session id ${storedSessionId}: the runner reported that this saved session no longer exists.`);
+    this.sessionName = sessionName;
+    this.storedSessionId = storedSessionId;
+    this.lastPane = lastPane;
+    this.name = "RunnerResumeRejectedError";
+  }
+}
+
+// src/runners/runner-state-failures.ts
+var STATE_CONTENTION_PATTERNS = [
+  /database (?:table )?is locked/i,
+  /SQLITE_BUSY/i,
+  /timed out waiting for state db backfill/i,
+  /unable to open database file/i
+];
+var STATE_CORRUPTION_PATTERNS = [
+  /file is not a database/i,
+  /database disk image is malformed/i,
+  /migration \d+ was previously applied but has been modified/i,
+  /cannot access its local database/i
+];
+function paneShowsRunnerStateContention(snapshot) {
+  if (!snapshot) {
+    return false;
+  }
+  return STATE_CONTENTION_PATTERNS.some((pattern) => pattern.test(snapshot));
+}
+function paneShowsRunnerStateCorruption(snapshot) {
+  if (!snapshot) {
+    return false;
+  }
+  return STATE_CORRUPTION_PATTERNS.some((pattern) => pattern.test(snapshot));
+}
+
+class RunnerStateContentionError extends Error {
+  sessionName;
+  lastPane;
+  constructor(sessionName, lastPane = "") {
+    super([
+      `Runner session "${sessionName}" could not start because the runner's local state database is locked by another running runner process (shared CODEX_HOME contention).`,
+      "Nothing was lost: the stored session id and saved conversation were preserved.",
+      "Resend your prompt to retry once the other run settles.",
+      "If this keeps happening, avoid starting many runner sessions at the same time or give this agent its own CODEX_HOME."
+    ].join(" "));
+    this.sessionName = sessionName;
+    this.lastPane = lastPane;
+    this.name = "RunnerStateContentionError";
+  }
+}
+
+class RunnerStateCorruptionError extends Error {
+  sessionName;
+  lastPane;
+  constructor(sessionName, lastPane = "") {
+    super([
+      `Runner session "${sessionName}" cannot start: the runner reported that its local state database is corrupted or version-mismatched.`,
+      "Retrying will not help. An operator must repair the runner state in CODEX_HOME (for codex this is usually state_5.sqlite / logs_2.sqlite; see the runner's own error output).",
+      "The stored session id was preserved for after the repair."
+    ].join(" "));
+    this.sessionName = sessionName;
+    this.lastPane = lastPane;
+    this.name = "RunnerStateCorruptionError";
+  }
+}
+
+// src/agents/session/run-recovery.ts
+var MID_RUN_RECOVERY_MAX_ATTEMPTS = 2;
+var MID_RUN_RECOVERY_CONTINUE_PROMPT = "continue exactly where you left off";
+function mergeRunSnapshot(snapshotPrefix, snapshot) {
+  return appendInteractionText(snapshotPrefix, snapshot);
+}
+function buildRunRecoveryNote(kind, params) {
+  const storedIdDetail = params?.storedSessionId ? ` (stored session id ${params.storedSessionId})` : "";
+  if (kind === "resume-attempt") {
+    const attempt = params?.attempt ?? 1;
+    const maxAttempts = params?.maxAttempts ?? MID_RUN_RECOVERY_MAX_ATTEMPTS;
+    return `Runner session was lost. Attempting recovery ${attempt}/${maxAttempts} by reopening the same conversation context.`;
+  }
+  if (kind === "resume-success") {
+    return "Recovery succeeded. Asking the runner to continue exactly where it left off.";
+  }
+  if (kind === "fresh-attempt") {
+    return "The previous runner session could not be resumed. Opening a fresh runner session 2/2 without replaying your prompt.";
+  }
+  if (kind === "resume-failed") {
+    return `The previous runner session could not be resumed${storedIdDetail}. The stored session id was preserved so the conversation can still be retried.`;
+  }
+  if (kind === "manual-new-required") {
+    return [
+      `The previous runner session could not be resumed, so the interrupted run stopped${storedIdDetail}.`,
+      "clisbot preserved the stored session id instead of silently opening a new conversation, because the run was already in progress and its context may matter.",
+      "Next steps: resend your prompt - clisbot will retry resuming this conversation and automatically fall back to a fresh one if the runner no longer has it.",
+      "Send `/new` first if you prefer to start a clean conversation."
+    ].join(" ");
+  }
+  return "The previous runner session could not be resumed. clisbot opened a new fresh session, but did not replay your prompt because the prior conversation context is no longer guaranteed. Please resend the full prompt/context to continue.";
+}
+function buildResumeRejectedFreshStartNote(params) {
+  const cause = params.reason === "rejected" ? `the runner reported that saved session ${params.storedSessionId} no longer exists` : `the runner kept exiting while resuming saved session ${params.storedSessionId}`;
+  const inspectHint = params.resumeCommand ? ` To inspect the old session manually, try \`${params.resumeCommand}\` in the workspace terminal.` : "";
+  return [
+    `The previous runner conversation could not be resumed: ${cause}.`,
+    "clisbot opened a fresh conversation and is running your prompt there; earlier conversation context is not carried over."
+  ].join(" ") + inspectHint;
+}
+
 // src/agents/runtime/runner-service.ts
 var TMUX_MISSING_SESSION_PATTERN2 = /(?:can't find session:|no server running on )/i;
 var TMUX_SERVER_UNAVAILABLE_PATTERN2 = /(?:No such file or directory|error connecting to|failed to connect to server)/i;
@@ -92865,7 +93034,6 @@ var SESSION_READY_CAPTURE_RETRY_DELAY_MS = 100;
 var STARTUP_SESSION_ID_CAPTURE_RETRY_COUNT = 2;
 var STARTUP_SESSION_ID_CAPTURE_RETRY_DELAY_MS = 500;
 var SESSION_ID_CAPTURE_FAILURE_COOLDOWN_MS = 15000;
-var PRESERVED_SESSION_ID_RETRY_MESSAGE = "The previous runner session could not be resumed. clisbot preserved the stored session id instead of opening a new conversation automatically. Use `/new` if you want to trigger a new runner conversation, then resend the prompt.";
 function summarizeSnapshot(snapshot) {
   const compact = snapshot.split(`
 `).map((line) => line.trim()).filter(Boolean).join(" ").slice(0, 220);
@@ -92916,15 +93084,18 @@ class RunnerService {
   async mapSessionError(error, sessionName, action, lastSnapshot = "") {
     if (isRecoverableStartupSessionLoss(error)) {
       const exitRecord = await readRunnerExitRecord(this.loadedConfig.stateDir, sessionName);
+      const paneSnapshot = lastSnapshot || (error instanceof TmuxBootstrapSessionLostError ? error.lastSnapshot : "");
       console.error("runner session disappeared", {
         sessionName,
         action,
         exitCode: exitRecord?.exitCode,
         exitedAt: exitRecord?.exitedAt,
         runnerCommand: exitRecord?.command,
-        lastVisiblePane: lastSnapshot ? summarizeSnapshot(lastSnapshot).trim() : undefined
+        lastVisiblePane: paneSnapshot ? summarizeSnapshot(paneSnapshot).trim() : undefined
       });
-      return new Error(`Runner session "${sessionName}" disappeared ${action}.`);
+      const exitDetail = typeof exitRecord?.exitCode === "number" ? ` The runner process exited with code ${exitRecord.exitCode}.` : "";
+      const nextStep = action === "while the prompt was running" ? `The prompt may have partially run; check ${renderCliCommand("watch --latest --lines 100", { inline: true })} before resending.` : "Your prompt was not submitted; resend it to retry.";
+      return new Error(`Runner session "${sessionName}" disappeared ${action}.${exitDetail} ${nextStep} If this keeps happening, verify the runner CLI starts cleanly in the workspace terminal and inspect ${renderCliCommand("logs", { inline: true })}.${summarizeSnapshot(paneSnapshot)}`);
     }
     if (isTransientTmuxTargetError(error)) {
       return new Error(`Runner session "${sessionName}" lost its tmux target ${action}. clisbot stayed alive, but this request could not continue cleanly. Retry once. If it keeps happening, inspect ${renderCliCommand("status", { inline: true })} and ${renderCliCommand("logs", { inline: true })}.${summarizeSnapshot(lastSnapshot)}`);
@@ -93022,7 +93193,7 @@ class RunnerService {
       pollIntervalMs: capture.pollIntervalMs
     });
   }
-  async retryRunnerRestartPreservingSessionId(target, resolved, remainingFreshRetries) {
+  async retryRunnerRestartPreservingSessionId(target, resolved, remainingFreshRetries, startupNotes) {
     if (remainingFreshRetries <= 0) {
       return null;
     }
@@ -93031,44 +93202,113 @@ class RunnerService {
       await sleep(resolved.runner.startupRetryDelayMs);
     }
     return this.ensureSessionReady(target, {
-      remainingFreshRetries: remainingFreshRetries - 1
+      remainingFreshRetries: remainingFreshRetries - 1,
+      startupNotes
+    });
+  }
+  classifyRunnerStartupExit(resolved, snapshot) {
+    if (paneShowsRunnerStateCorruption(snapshot)) {
+      return new RunnerStateCorruptionError(resolved.sessionName, snapshot);
+    }
+    if (paneShowsRunnerStateContention(snapshot)) {
+      return new RunnerStateContentionError(resolved.sessionName, snapshot);
+    }
+    return new TmuxBootstrapSessionLostError(resolved.sessionName, "runner exited during startup", snapshot);
+  }
+  async retryAfterStateContention(target, resolved, remainingFreshRetries, startupNotes) {
+    if (remainingFreshRetries <= 0) {
+      return null;
+    }
+    const attempt = resolved.runner.startupRetryCount - remainingFreshRetries + 1;
+    const backoffMs = resolved.runner.startupRetryDelayMs * attempt + Math.floor(Math.random() * 250);
+    console.log(`clisbot runner state database contention for ${resolved.sessionName}; retrying startup with the preserved session id in ${backoffMs}ms`);
+    await this.killRunnerAndPreserveSessionId(resolved);
+    if (backoffMs > 0) {
+      await sleep(backoffMs);
+    }
+    return this.ensureSessionReady(target, {
+      remainingFreshRetries: remainingFreshRetries - 1,
+      startupNotes
     });
   }
-  async retryAfterStartupFault(target, resolved, error, remainingFreshRetries, allowFreshResumeFallback) {
+  async retryAfterStartupFault(target, resolved, error, remainingFreshRetries, allowFreshResumeFallback, startupNotes) {
+    if (error instanceof RunnerStateContentionError) {
+      return this.retryAfterStateContention(target, resolved, remainingFreshRetries, startupNotes);
+    }
+    if (error instanceof RunnerStateCorruptionError) {
+      return null;
+    }
     if (allowFreshResumeFallback) {
-      const resumedFresh = await this.retryFreshStartAfterStoredResumeFailure(target, resolved, error, remainingFreshRetries);
-      if (resumedFresh) {
-        return resumedFresh;
+      const fallback = await this.fallBackToFreshAfterRejectedResume(target, resolved, error, remainingFreshRetries, startupNotes);
+      if (fallback) {
+        return fallback;
       }
     }
     if (!isRetryableFreshStartFault(error)) {
       return null;
     }
-    return this.retryRunnerRestartPreservingSessionId(target, resolved, remainingFreshRetries);
+    return this.retryRunnerRestartPreservingSessionId(target, resolved, remainingFreshRetries, startupNotes);
   }
-  async retryFreshStartAfterStoredResumeFailure(target, resolved, error, remainingFreshRetries) {
+  async classifyRejectedResumeStartup(resolved, error, remainingFreshRetries) {
+    const storedSessionId = (await this.sessionMapping.get(resolved.sessionKey))?.sessionId?.trim() || "";
+    if (!storedSessionId) {
+      return null;
+    }
+    if (error instanceof RunnerResumeRejectedError) {
+      return { storedSessionId, reason: "rejected" };
+    }
+    if (error instanceof TmuxBootstrapSessionLostError && paneShowsResumeRejected(error.lastSnapshot)) {
+      return { storedSessionId, reason: "rejected" };
+    }
     if (!isRecoverableStartupSessionLoss(error)) {
       return null;
     }
     if (resolved.runner.sessionId.resume.mode !== "command" || resolved.runner.sessionId.create.mode !== "runner") {
       return null;
     }
-    const existing = await this.sessionMapping.get(resolved.sessionKey);
-    if (!existing?.sessionId) {
+    if (remainingFreshRetries > 0) {
       return null;
     }
     const exitRecord = await readRunnerExitRecord(this.loadedConfig.stateDir, resolved.sessionName);
     if (!exitRecord || exitRecord.exitCode === 0) {
       return null;
     }
-    console.log(`clisbot preserved stored sessionId after failed runner resume startup ${resolved.sessionName}`);
-    await this.sessionMapping.touch(resolved, {
+    return { storedSessionId, reason: "exit" };
+  }
+  async fallBackToFreshAfterRejectedResume(target, resolved, error, remainingFreshRetries, startupNotes) {
+    const rejection = await this.classifyRejectedResumeStartup(resolved, error, remainingFreshRetries);
+    if (!rejection) {
+      return null;
+    }
+    console.log(`clisbot resume rejected for ${resolved.sessionName}; opening a fresh runner conversation`, {
+      storedSessionId: rejection.storedSessionId,
+      reason: rejection.reason
+    });
+    await this.tmux.killSession(resolved.sessionName).catch(() => {
+      return;
+    });
+    await this.sessionMapping.clearActive(resolved, {
       runnerCommand: resolved.runner.command
     });
-    throw new Error(PRESERVED_SESSION_ID_RETRY_MESSAGE);
+    startupNotes?.push(buildResumeRejectedFreshStartNote({
+      storedSessionId: rejection.storedSessionId,
+      reason: rejection.reason,
+      resumeCommand: this.renderRunnerResumeCommand(resolved, rejection.storedSessionId)
+    }));
+    return this.ensureSessionReady(target, {
+      remainingFreshRetries: resolved.runner.startupRetryCount,
+      startupNotes
+    });
+  }
+  renderRunnerResumeCommand(resolved, sessionId) {
+    if (resolved.runner.sessionId.resume.mode !== "command") {
+      return;
+    }
+    const launch = this.buildRunnerArgs(resolved, { sessionId, resume: true });
+    return [launch.command, ...launch.args].join(" ");
   }
-  async retryAfterStartupTimeout(target, resolved, remainingFreshRetries) {
-    return this.retryRunnerRestartPreservingSessionId(target, resolved, remainingFreshRetries);
+  async retryAfterStartupTimeout(target, resolved, remainingFreshRetries, startupNotes) {
+    return this.retryRunnerRestartPreservingSessionId(target, resolved, remainingFreshRetries, startupNotes);
   }
   resolveRemainingFreshRetries(resolved, options) {
     if (typeof options.remainingFreshRetries === "number") {
@@ -93162,21 +93402,28 @@ class RunnerService {
     const preparedMapping = await this.sessionMapping.prepareStartup(resolved);
     const serverRunning = await this.tmux.isServerRunning();
     if (serverRunning && await this.tmux.hasSession(resolved.sessionName)) {
-      logLatencyDebug("ensure-session-ready-existing-session", timingContext, {
-        hasStoredSessionId: Boolean(preparedMapping.storedSessionId)
-      });
-      try {
-        await clearRunnerExitRecord(this.loadedConfig.stateDir, resolved.sessionName);
-        await this.acceptStartupContinuePromptIfPresent(resolved);
-        await this.syncActiveSessionMappingForResolvedTarget(resolved);
-      } catch (error) {
-        throw await this.mapSessionError(error, resolved.sessionName, "during startup");
+      const lingeringExitSnapshot = await this.captureSessionSnapshot(resolved).catch(() => "");
+      if (paneShowsRunnerExitSentinel(lingeringExitSnapshot)) {
+        await this.tmux.killSession(resolved.sessionName).catch(() => {
+          return;
+        });
+      } else {
+        logLatencyDebug("ensure-session-ready-existing-session", timingContext, {
+          hasStoredSessionId: Boolean(preparedMapping.storedSessionId)
+        });
+        try {
+          await clearRunnerExitRecord(this.loadedConfig.stateDir, resolved.sessionName);
+          await this.acceptStartupContinuePromptIfPresent(resolved);
+          await this.syncActiveSessionMappingForResolvedTarget(resolved);
+        } catch (error) {
+          throw await this.mapSessionError(error, resolved.sessionName, "during startup");
+        }
+        logLatencyDebug("ensure-session-ready-complete", timingContext, {
+          startupDelayMs: 0,
+          reusedSession: true
+        });
+        return resolved;
       }
-      logLatencyDebug("ensure-session-ready-complete", timingContext, {
-        startupDelayMs: 0,
-        reusedSession: true
-      });
-      return resolved;
     }
     if (!resolved.session.createIfMissing) {
       throw new Error(`tmux session "${resolved.sessionName}" does not exist`);
@@ -93221,24 +93468,38 @@ class RunnerService {
         startupDelayMs: resolved.runner.startupDelayMs,
         trustWorkspace: resolved.runner.trustWorkspace,
         readyPattern: resolved.runner.startupReadyPattern,
-        blockers: resolved.runner.startupBlockers
+        blockers: resolved.runner.startupBlockers,
+        resumeRejection: resumingExistingSession && storedOrExplicitSessionId ? { detect: paneShowsResumeRejected } : undefined,
+        exitDetection: { detect: paneShowsRunnerExitSentinel }
       });
+      if (bootstrapResult.status === "exited") {
+        await this.tmux.killSession(resolved.sessionName).catch(() => {
+          return;
+        });
+        throw this.classifyRunnerStartupExit(resolved, bootstrapResult.snapshot);
+      }
+      if (bootstrapResult.status === "resume-rejected") {
+        await this.tmux.killSession(resolved.sessionName).catch(() => {
+          return;
+        });
+        throw new RunnerResumeRejectedError(resolved.sessionName, storedOrExplicitSessionId, bootstrapResult.snapshot);
+      }
       if (bootstrapResult.status === "blocked") {
         await this.abortUnreadySession(resolved, bootstrapResult.message, bootstrapResult.snapshot);
       }
       if (bootstrapResult.status === "timeout" && resolved.runner.startupReadyPattern) {
-        const retried = await this.retryAfterStartupTimeout(target, resolved, remainingFreshRetries);
+        const retried = await this.retryAfterStartupTimeout(target, resolved, remainingFreshRetries, options.startupNotes);
         if (retried) {
           return retried;
         }
-        await this.abortUnreadySession(resolved, `Runner session "${resolved.sessionName}" did not reach the configured ready state within ${resolved.runner.startupDelayMs}ms.`, bootstrapResult.snapshot);
+        await this.abortUnreadySession(resolved, `Runner session "${resolved.sessionName}" did not reach the configured ready state within ${resolved.runner.startupDelayMs}ms, so your prompt was not submitted. Verify that \`${resolved.runner.command}\` starts cleanly in the workspace terminal, then resend. Inspect ${renderCliCommand("runner inspect --latest --lines 120", { inline: true })} and ${renderCliCommand("logs", { inline: true })} if it keeps happening.`, bootstrapResult.snapshot);
       }
       await this.finalizeSessionStartup(resolved, {
         storedOrExplicitSessionId,
         runnerCommand: runnerLaunch.command
       });
     } catch (error) {
-      const retried = await this.retryAfterStartupFault(target, resolved, error, remainingFreshRetries, options.allowFreshRetry !== false);
+      const retried = await this.retryAfterStartupFault(target, resolved, error, remainingFreshRetries, options.allowFreshRetry !== false, options.startupNotes);
       if (retried) {
         return retried;
       }
@@ -93301,30 +93562,65 @@ class RunnerService {
     return normalizePaneText(await this.tmux.capturePane(resolved.sessionName, resolved.stream.captureLines));
   }
   async ensureRunnerReady(target, options = {}) {
+    const startupNotes = [];
     let resolved = await this.ensureSessionReady(target, {
       allowFreshRetry: options.allowFreshRetryBeforePrompt,
-      timingContext: options.timingContext
+      timingContext: options.timingContext,
+      startupNotes
     });
     try {
       return {
         resolved,
-        initialSnapshot: await this.captureSessionSnapshot(resolved)
+        initialSnapshot: await this.captureSessionSnapshot(resolved),
+        startupNotes
       };
     } catch (error) {
       if (options.allowFreshRetryBeforePrompt === false || !isRecoverableStartupSessionLoss(error)) {
         throw await this.mapSessionError(error, resolved.sessionName, "before prompt submission", resolved.sessionName ? await this.captureSessionSnapshot(resolved).catch(() => "") : "");
       }
-      const retried = await this.retryRunnerRestartPreservingSessionId(target, resolved, resolved.runner.startupRetryCount);
+      const retried = await this.retryRunnerRestartPreservingSessionId(target, resolved, resolved.runner.startupRetryCount, startupNotes);
       if (!retried) {
         throw await this.mapSessionError(error, resolved.sessionName, "before prompt submission", resolved.sessionName ? await this.captureSessionSnapshot(resolved).catch(() => "") : "");
       }
       resolved = retried;
       return {
         resolved,
-        initialSnapshot: await this.captureSessionSnapshot(resolved)
+        initialSnapshot: await this.captureSessionSnapshot(resolved),
+        startupNotes
       };
     }
   }
+  async recaptureSessionIdAfterRun(target) {
+    const resolved = this.resolveTarget(target);
+    if (resolved.runner.sessionId.capture.mode !== "status-command") {
+      return null;
+    }
+    const existing = await this.sessionMapping.get(resolved.sessionKey);
+    if (existing?.sessionId) {
+      return existing.sessionId;
+    }
+    if (!await this.tmux.hasSession(resolved.sessionName)) {
+      return null;
+    }
+    let sessionId = null;
+    try {
+      sessionId = await this.captureSessionIdFromRunner(resolved);
+    } catch (error) {
+      console.warn(`clisbot post-run session id recapture failed for ${resolved.sessionName}`, error);
+      this.deferSessionIdCapture(resolved.sessionKey);
+      return null;
+    }
+    if (!sessionId) {
+      this.deferSessionIdCapture(resolved.sessionKey);
+      return null;
+    }
+    const recorded = await this.recordActiveSessionIdBestEffort(resolved, sessionId);
+    if (!recorded) {
+      return null;
+    }
+    console.log(`clisbot captured durable session id after run completion for ${resolved.sessionName}`);
+    return sessionId;
+  }
   canRecoverMidRun(error) {
     return isRecoverableStartupSessionLoss(error) || isTransientTmuxTargetError(error);
   }
@@ -93459,7 +93755,9 @@ class RunnerService {
     throw new Error(`${command} completed and clisbot captured session id ${sessionId}, but could not persist it. The durable session mapping was left unchanged.${details}`);
   }
   async killRunnerAndPreserveSessionId(resolved) {
-    await this.tmux.killSession(resolved.sessionName);
+    await this.tmux.killSession(resolved.sessionName).catch(() => {
+      return;
+    });
     await this.sessionMapping.touch(resolved, {
       runnerCommand: resolved.runner.command
     });
@@ -93581,33 +93879,6 @@ class RunnerService {
   }
 }
 
-// src/agents/session/run-recovery.ts
-var MID_RUN_RECOVERY_MAX_ATTEMPTS = 2;
-var MID_RUN_RECOVERY_CONTINUE_PROMPT = "continue exactly where you left off";
-function mergeRunSnapshot(snapshotPrefix, snapshot) {
-  return appendInteractionText(snapshotPrefix, snapshot);
-}
-function buildRunRecoveryNote(kind, params) {
-  if (kind === "resume-attempt") {
-    const attempt = params?.attempt ?? 1;
-    const maxAttempts = params?.maxAttempts ?? MID_RUN_RECOVERY_MAX_ATTEMPTS;
-    return `Runner session was lost. Attempting recovery ${attempt}/${maxAttempts} by reopening the same conversation context.`;
-  }
-  if (kind === "resume-success") {
-    return "Recovery succeeded. Asking the runner to continue exactly where it left off.";
-  }
-  if (kind === "fresh-attempt") {
-    return "The previous runner session could not be resumed. Opening a fresh runner session 2/2 without replaying your prompt.";
-  }
-  if (kind === "resume-failed") {
-    return "The previous runner session could not be resumed. The stored session id was preserved; use `/new` to intentionally trigger a new runner conversation.";
-  }
-  if (kind === "manual-new-required") {
-    return "The previous runner session could not be resumed. clisbot preserved the stored session id instead of opening a new conversation automatically. Use `/new` if you want to trigger a new runner conversation, then resend the prompt.";
-  }
-  return "The previous runner session could not be resumed. clisbot opened a new fresh session, but did not replay your prompt because the prior conversation context is no longer guaranteed. Please resend the full prompt/context to continue.";
-}
-
 // src/runners/tmux/run-monitor.ts
 var FIRST_OUTPUT_POLL_INTERVAL_MS = 250;
 var RUNNING_REWRITE_PREVIEW_MAX_LINES = 8;
@@ -93793,8 +94064,10 @@ function isRetryableObserverDeliveryError(error) {
 }
 function buildMissingSessionIdStartupWarning() {
   return [
-    "Runner session started, but clisbot could not capture a durable session id yet.",
-    "This session is running, but it is not resumable until a session id is captured and persisted."
+    "Runner session started, but clisbot could not capture a durable session id yet,",
+    "so this conversation is not resumable if the runner restarts.",
+    "clisbot keeps retrying automatically and will persist the id once the runner reports it; no action is needed.",
+    "If this warning keeps appearing, the runner status output may have changed; check the pane with `clisbot watch --latest`."
   ].join(" ");
 }
 
@@ -93921,7 +94194,7 @@ class SessionService {
     });
     try {
       await this.sessionState.markPromptAdmitted(provisionalResolved);
-      const { resolved, initialSnapshot } = await this.runnerSessions.ensureRunnerReady(target, {
+      const { resolved, initialSnapshot, startupNotes } = await this.runnerSessions.ensureRunnerReady(target, {
         ...options,
         timingContext: observer.timingContext
       });
@@ -93952,6 +94225,17 @@ class SessionService {
         state: "running",
         startedAt
       });
+      for (const startupNote of startupNotes ?? []) {
+        await this.notifyRunObservers(run, this.createRunUpdate({
+          resolved,
+          status: "running",
+          snapshot: "",
+          fullSnapshot: initialSnapshot,
+          initialSnapshot,
+          note: startupNote,
+          forceVisible: true
+        }));
+      }
       if (!run.sessionId) {
         await this.notifyRunObservers(run, this.createRunUpdate({
           resolved,
@@ -94219,6 +94503,14 @@ class SessionService {
     if (!run) {
       return;
     }
+    if (!run.sessionId) {
+      try {
+        run.sessionId = await this.runnerSessions.recaptureSessionIdAfterRun({
+          agentId: run.resolved.agentId,
+          sessionKey: run.resolved.sessionKey
+        }) ?? undefined;
+      } catch {}
+    }
     await this.sessionState.setSessionRuntime(run.resolved, {
       state: "idle"
     });
@@ -94356,8 +94648,10 @@ class SessionService {
         return true;
       }
       if (await this.requiresManualNewAfterFailedResume(currentRun)) {
-        await this.notifyRecoveryStep(currentRun, buildRunRecoveryNote("resume-failed"));
-        await this.failActiveRun(sessionKey, currentRun.runId, new Error(buildRunRecoveryNote("manual-new-required")));
+        await this.notifyRecoveryStep(currentRun, buildRunRecoveryNote("resume-failed", { storedSessionId: currentRun.sessionId }));
+        await this.failActiveRun(sessionKey, currentRun.runId, new Error(buildRunRecoveryNote("manual-new-required", {
+          storedSessionId: currentRun.sessionId
+        })));
         return true;
       }
       await this.notifyRecoveryStep(currentRun, buildRunRecoveryNote("fresh-attempt"));
@@ -97828,6 +98122,129 @@ function isTerminalResultStatus(status) {
   return ["completed", "failed", "filtered", "expired", "stopped"].includes(status);
 }
 
+// src/channels/api/http-listener.ts
+import { Buffer as Buffer2 } from "node:buffer";
+import { createServer } from "node:http";
+var FORCE_CLOSE_TIMEOUT_MS = 1000;
+function requestHeaders(request) {
+  const headers = new Headers;
+  for (const [key, value] of Object.entries(request.headers)) {
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        headers.append(key, item);
+      }
+    } else if (value != null) {
+      headers.set(key, value);
+    }
+  }
+  return headers;
+}
+async function readRequestBody(request) {
+  const chunks = [];
+  for await (const chunk of request) {
+    chunks.push(Buffer2.isBuffer(chunk) ? chunk : Buffer2.from(chunk));
+  }
+  return Buffer2.concat(chunks);
+}
+function requestUrl(request, host) {
+  const protocol = request.headers["x-forwarded-proto"] ?? "http";
+  const requestHost = request.headers.host ?? host;
+  return `${Array.isArray(protocol) ? protocol[0] : protocol}://${requestHost}${request.url ?? "/"}`;
+}
+async function toWebRequest(request, host) {
+  const method = request.method ?? "GET";
+  const bodyAllowed = method !== "GET" && method !== "HEAD";
+  return new Request(requestUrl(request, host), {
+    method,
+    headers: requestHeaders(request),
+    body: bodyAllowed ? await readRequestBody(request) : undefined
+  });
+}
+async function writeWebResponse(response, target) {
+  target.statusCode = response.status;
+  response.headers.forEach((value, key) => {
+    target.setHeader(key, value);
+  });
+  if (!response.body) {
+    target.end();
+    return;
+  }
+  target.end(Buffer2.from(await response.arrayBuffer()));
+}
+function closeServer(server, force) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    let timeout;
+    const finish = (error) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      if (timeout) {
+        clearTimeout(timeout);
+      }
+      if (error) {
+        reject(error);
+      } else {
+        resolve();
+      }
+    };
+    if (!server.listening) {
+      if (force) {
+        server.closeAllConnections?.();
+      }
+      finish();
+      return;
+    }
+    server.close((error) => {
+      if (error?.code === "ERR_SERVER_NOT_RUNNING") {
+        finish();
+        return;
+      }
+      if (error) {
+        finish(error);
+      } else {
+        finish();
+      }
+    });
+    if (force) {
+      server.closeAllConnections?.();
+      server.closeIdleConnections?.();
+      timeout = setTimeout(() => finish(), FORCE_CLOSE_TIMEOUT_MS);
+      timeout.unref?.();
+    }
+  });
+}
+async function startApiHttpListener(params) {
+  const server = createServer(async (request, response) => {
+    try {
+      await writeWebResponse(await params.handle(await toWebRequest(request, params.host), request.socket.remoteAddress), response);
+    } catch (error) {
+      response.statusCode = 500;
+      response.setHeader("content-type", "application/json");
+      response.end(JSON.stringify({
+        error: "api_listener_failed",
+        detail: error instanceof Error ? error.message : String(error)
+      }, null, 2));
+    }
+  });
+  await new Promise((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(params.port, params.host, () => {
+      server.off("error", reject);
+      resolve();
+    });
+  });
+  const address = server.address();
+  return {
+    host: params.host,
+    port: typeof address === "object" && address ? address.port : params.port,
+    stop: async (force = false) => {
+      await closeServer(server, force);
+    }
+  };
+}
+
 // src/channels/api/stop.ts
 async function authorizeStopRequest(params) {
   const rawBody = await params.request.text();
@@ -97993,14 +98410,14 @@ class ApiChannelService {
   }
   async start() {
     const providerConfig = resolveApiProviderConfig(this.dependencies.loadedConfig.raw.bots.api);
-    this.server = Bun.serve({
-      hostname: providerConfig.defaults.listener.host,
+    this.server = await startApiHttpListener({
+      host: providerConfig.defaults.listener.host,
       port: providerConfig.defaults.listener.port,
-      fetch: (request, server) => this.handleRequest(request, server.requestIP(request)?.address ?? undefined)
+      handle: (request, remoteAddress) => this.handleRequest(request, remoteAddress)
     });
   }
   async stop() {
-    this.server?.stop(true);
+    await this.server?.stop(true);
     this.server = undefined;
   }
   async handleRequest(request, remoteAddress) {
@@ -101150,6 +101567,7 @@ import { readFile as readFile3 } from "node:fs/promises";
 
 // src/channels/slack/content.ts
 var SLACK_MAX_BLOCKS = 50;
+var SLACK_BULLET_MARKERS = ["•", "◦", "▪"];
 function normalizeMarkdownLinks(text) {
   return text.replace(/\[([^\]]+)\]\(([^)\s]+)\)/g, (_match, label, href) => {
     const trimmedHref = href.trim();
@@ -101162,6 +101580,20 @@ function normalizeMarkdownLinks(text) {
 function renderInlineMarkdownToSlackMrkdwn(text) {
   return normalizeMarkdownLinks(text).replace(/~~([^~]+)~~/g, "~$1~").replace(/\*\*([^*\n][\s\S]*?[^*\n])\*\*/g, "*$1*");
 }
+function trimOuterBlankLines(text) {
+  return text.replace(/^\n+/, "").replace(/\n+$/, "");
+}
+function getMarkdownListDepth(rawIndent) {
+  const width = rawIndent.replaceAll("\t", "    ").length;
+  return Math.floor(width / 2);
+}
+function renderSlackListIndent(depth) {
+  return "  ".repeat(Math.min(Math.max(depth, 0), 6));
+}
+function renderSlackBulletPrefix(depth) {
+  const marker = SLACK_BULLET_MARKERS[Math.min(depth, SLACK_BULLET_MARKERS.length - 1)] ?? SLACK_BULLET_MARKERS[0];
+  return `${renderSlackListIndent(depth)}${marker}`;
+}
 function stripMarkdownInline(text) {
   return text.replace(/`([^`\n]+)`/g, "$1").replace(/\[([^\]]+)\]\(([^)\s]+)\)/g, "$1").replace(/\*\*([^*\n][\s\S]*?[^*\n])\*\*/g, "$1").replace(/\*([^*\n][\s\S]*?[^*\n])\*/g, "$1").replace(/~~([^~]+)~~/g, "$1").trim();
 }
@@ -101242,10 +101674,10 @@ function parseSlackBlocksInput(text) {
   return validateSlackBlocksArray(parsed);
 }
 function renderMarkdownToSlackMrkdwn(markdown) {
-  const normalized = markdown.replaceAll(`\r
+  const normalized = trimOuterBlankLines(markdown.replaceAll(`\r
 `, `
 `).replaceAll("\r", `
-`).trim();
+`));
   if (!normalized) {
     return "";
   }
@@ -101260,13 +101692,15 @@ function renderMarkdownToSlackMrkdwn(markdown) {
       }
       return content;
     }
-    const bulletMatch = line.match(/^\s*[-*+]\s+(.+)$/);
+    const bulletMatch = line.match(/^(\s*)[-*+]\s+(.+)$/);
     if (bulletMatch) {
-      return `• ${renderInlineMarkdownToSlackMrkdwn(bulletMatch[1] ?? "")}`;
+      const depth = getMarkdownListDepth(bulletMatch[1] ?? "");
+      return `${renderSlackBulletPrefix(depth)} ${renderInlineMarkdownToSlackMrkdwn(bulletMatch[2] ?? "")}`;
     }
-    const orderedMatch = line.match(/^\s*(\d+)\.\s+(.+)$/);
+    const orderedMatch = line.match(/^(\s*)(\d+)\.\s+(.+)$/);
     if (orderedMatch) {
-      return `${orderedMatch[1]}. ${renderInlineMarkdownToSlackMrkdwn(orderedMatch[2] ?? "")}`;
+      const depth = getMarkdownListDepth(orderedMatch[1] ?? "");
+      return `${renderSlackListIndent(depth)}${orderedMatch[2]}. ${renderInlineMarkdownToSlackMrkdwn(orderedMatch[3] ?? "")}`;
     }
     return renderInlineMarkdownToSlackMrkdwn(line);
   }).join(`
@@ -101331,10 +101765,10 @@ function renderMarkdownTableToFallbackSlackBlock(headers, rows) {
   };
 }
 function renderMarkdownToSlackBlocks(markdown) {
-  const normalized = markdown.replaceAll(`\r
+  const normalized = trimOuterBlankLines(markdown.replaceAll(`\r
 `, `
 `).replaceAll("\r", `
-`).trim();
+`));
   if (!normalized) {
     return [];
   }
@@ -101368,7 +101802,7 @@ function renderMarkdownToSlackBlocks(markdown) {
       return;
     }
     const text = paragraph.join(`
-`).trim();
+`).trimEnd();
     if (text) {
       const shouldRenderAsPreamble = !hasSeenHeading && firstHeadingLineIndex > 0 && blocks.length === 0;
       pushBlock({
@@ -101483,14 +101917,16 @@ ${codeLines.join(`
       }
       continue;
     }
-    const bulletMatch = line.match(/^\s*[-*+]\s+(.+)$/);
+    const bulletMatch = line.match(/^(\s*)[-*+]\s+(.+)$/);
     if (bulletMatch) {
-      paragraph.push(`• ${renderInlineMarkdownToSlackMrkdwn(bulletMatch[1] ?? "")}`);
+      const depth = getMarkdownListDepth(bulletMatch[1] ?? "");
+      paragraph.push(`${renderSlackBulletPrefix(depth)} ${renderInlineMarkdownToSlackMrkdwn(bulletMatch[2] ?? "")}`);
       continue;
     }
-    const orderedMatch = line.match(/^\s*(\d+)\.\s+(.+)$/);
+    const orderedMatch = line.match(/^(\s*)(\d+)\.\s+(.+)$/);
     if (orderedMatch) {
-      paragraph.push(`${orderedMatch[1]}. ${renderInlineMarkdownToSlackMrkdwn(orderedMatch[2] ?? "")}`);
+      const depth = getMarkdownListDepth(orderedMatch[1] ?? "");
+      paragraph.push(`${renderSlackListIndent(depth)}${orderedMatch[2]}. ${renderInlineMarkdownToSlackMrkdwn(orderedMatch[3] ?? "")}`);
       continue;
     }
     paragraph.push(renderInlineMarkdownToSlackMrkdwn(line));