botmux 3.4.1 → 3.4.3

package/dist/utils/input-gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"input-gate.js","sourceRoot":"","sources":["../../src/utils/input-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,cAAc,CAAC,KAS9B;IACC,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IACzD,kEAAkE;IAClE,OAAO,KAAK,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAS/C;IACC,IAAI,CAAC,KAAK,CAAC,iCAAiC;QAAE,OAAO,IAAI,CAAC;IAC1D,IAAI,CAAC,KAAK,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IACxC,OAAO,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,aAAa,CAAC;AAChD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAIrC;IACC,OAAO,KAAK,CAAC,sBAAsB,IAAI,KAAK,CAAC,+BAA+B,IAAI,KAAK,CAAC,0BAA0B,CAAC;AACnH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,uBAAuB,CAAC,iBAA0B;IAChE,OAAO,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;AACpD,CAAC"}
+{"version":3,"file":"input-gate.js","sourceRoot":"","sources":["../../src/utils/input-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,cAAc,CAAC,KAS9B;IACC,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IACzD,kEAAkE;IAClE,OAAO,KAAK,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC;AAC/D,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,2CAA2C,CAAC,KAM3D;IACC,OAAO,KAAK,CAAC,cAAc;WACtB,KAAK,CAAC,eAAe;WACrB,KAAK,CAAC,mBAAmB;WACzB,CAAC,KAAK,CAAC,aAAa;WACpB,CAAC,KAAK,CAAC,cAAc,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAS/C;IACC,IAAI,CAAC,KAAK,CAAC,iCAAiC;QAAE,OAAO,IAAI,CAAC;IAC1D,IAAI,CAAC,KAAK,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IACxC,OAAO,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,aAAa,CAAC;AAChD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAIrC;IACC,OAAO,KAAK,CAAC,sBAAsB,IAAI,KAAK,CAAC,+BAA+B,IAAI,KAAK,CAAC,0BAA0B,CAAC;AACnH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,uBAAuB,CAAC,iBAA0B;IAChE,OAAO,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;AACpD,CAAC"}

package/dist/utils/pending-input-queue.d.ts

@@ -1,6 +1,10 @@
 import type { CodexAppTurnInput, VcMeetingImTurnOrigin } from '../types.js';
 export interface PendingCliInput {
     content: string;
+    /** The real user turn represented by `content` when delivery uses a short
+     * adapter command. Transcript bridges fingerprint this value, while the PTY
+     * receives `content`. */
+    logicalContent?: string;
     turnId?: string;
     dispatchAttempt?: number;
     vcMeetingImTurnOrigin?: VcMeetingImTurnOrigin;
@@ -31,6 +35,21 @@ export declare function shouldDeferInitialPromptForArgLimit(opts: {
     prompt?: string;
     maxInitialPromptArgBytes?: number;
 }): boolean;
+/** Resolve the physical first-prompt transport after worker defer policy is
+ * known. A transformed argv prompt can provide a short deferred command while
+ * retaining the original text for bridge attribution. Other adapters keep the
+ * legacy behavior: argv when not deferred, original text in the queue when
+ * deferred. */
+export declare function resolveInitialPromptDelivery(opts: {
+    originalPrompt?: string;
+    preparedArg?: string;
+    preparedDeferredContent?: string;
+    defer: boolean;
+}): {
+    argvPrompt?: string;
+    queuedContent?: string;
+    logicalContent?: string;
+};
 /** Once either side of a queue boundary is durable, stop this batch and wait
  *  for the next reliable idle edge before writing the following turn. */
 export declare function shouldStopPendingBatch(written: PendingCliInput, next: PendingCliInput | undefined): boolean;

package/dist/utils/pending-input-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pending-input-queue.d.ts","sourceRoot":"","sources":["../../src/utils/pending-input-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,eAAe,EAAE,EAC1B,IAAI,EAAE,eAAe,GACpB,OAAO,CAcT;AAED;;sEAEsE;AACtE,wBAAgB,2BAA2B,CACzC,wBAAwB,EAAE,OAAO,EACjC,mBAAmB,EAAE,OAAO,EAC5B,IAAI,EAAE,eAAe,GAAG,SAAS,GAChC,OAAO,CAKT;AAED;;;;sEAIsE;AACtE,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,0BAA0B,EAAE,OAAO,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAIV;AAED;;;;wDAIwD;AACxD,wBAAgB,mCAAmC,CAAC,IAAI,EAAE;IACxD,0BAA0B,EAAE,OAAO,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,GAAG,OAAO,CAMV;AAED;yEACyE;AACzE,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,eAAe,GAAG,SAAS,GAChC,OAAO,CAKT;AAED;6EAC6E;AAC7E,wBAAgB,oBAAoB,CAAC,mBAAmB,EAAE,OAAO,GAAG,OAAO,CAE1E;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,EACtD,QAAQ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GACrD,OAAO,CAIT"}
+{"version":3,"file":"pending-input-queue.d.ts","sourceRoot":"","sources":["../../src/utils/pending-input-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB;;6BAEyB;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,eAAe,EAAE,EAC1B,IAAI,EAAE,eAAe,GACpB,OAAO,CAeT;AAED;;sEAEsE;AACtE,wBAAgB,2BAA2B,CACzC,wBAAwB,EAAE,OAAO,EACjC,mBAAmB,EAAE,OAAO,EAC5B,IAAI,EAAE,eAAe,GAAG,SAAS,GAChC,OAAO,CAKT;AAED;;;;sEAIsE;AACtE,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,0BAA0B,EAAE,OAAO,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAIV;AAED;;;;wDAIwD;AACxD,wBAAgB,mCAAmC,CAAC,IAAI,EAAE;IACxD,0BAA0B,EAAE,OAAO,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC,GAAG,OAAO,CAMV;AAED;;;;eAIe;AACf,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,KAAK,EAAE,OAAO,CAAC;CAChB,GAAG;IACF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAYA;AAED;yEACyE;AACzE,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,eAAe,GAAG,SAAS,GAChC,OAAO,CAKT;AAED;6EAC6E;AAC7E,wBAAgB,oBAAoB,CAAC,mBAAmB,EAAE,OAAO,GAAG,OAAO,CAE1E;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,EACtD,QAAQ,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GACrD,OAAO,CAIT"}

package/dist/utils/pending-input-queue.js

@@ -9,7 +9,8 @@ export function mergeQueuedCliInput(pending, next) {
     // would drop or mis-attach the sidecar.
     if (tail.dispatchAttempt !== undefined || next.dispatchAttempt !== undefined
         || tail.vcMeetingImTurnOrigin || next.vcMeetingImTurnOrigin
-        || tail.codexAppInput || next.codexAppInput)
+        || tail.codexAppInput || next.codexAppInput
+        || tail.logicalContent || next.logicalContent)
         return false;
     tail.content = `${tail.content}\n\n${next.content}`;
     tail.turnId = next.turnId ?? tail.turnId;
@@ -49,6 +50,25 @@ export function shouldDeferInitialPromptForArgLimit(opts) {
         return false;
     return Buffer.byteLength(opts.prompt, 'utf8') > limit;
 }
+/** Resolve the physical first-prompt transport after worker defer policy is
+ * known. A transformed argv prompt can provide a short deferred command while
+ * retaining the original text for bridge attribution. Other adapters keep the
+ * legacy behavior: argv when not deferred, original text in the queue when
+ * deferred. */
+export function resolveInitialPromptDelivery(opts) {
+    if (!opts.originalPrompt)
+        return {};
+    if (!opts.defer) {
+        return { argvPrompt: opts.preparedArg ?? opts.originalPrompt };
+    }
+    const queuedContent = opts.preparedDeferredContent ?? opts.originalPrompt;
+    return {
+        queuedContent,
+        ...(queuedContent !== opts.originalPrompt
+            ? { logicalContent: opts.originalPrompt }
+            : {}),
+    };
+}
 /** Once either side of a queue boundary is durable, stop this batch and wait
  *  for the next reliable idle edge before writing the following turn. */
 export function shouldStopPendingBatch(written, next) {

package/dist/utils/pending-input-queue.js.map

@@ -1 +1 @@
-{"version":3,"file":"pending-input-queue.js","sourceRoot":"","sources":["../../src/utils/pending-input-queue.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,mBAAmB,CACjC,OAA0B,EAC1B,IAAqB;IAErB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,0EAA0E;IAC1E,yEAAyE;IACzE,2EAA2E;IAC3E,4EAA4E;IAC5E,wCAAwC;IACxC,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS;WACvE,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,qBAAqB;WACxD,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa;QAAE,OAAO,KAAK,CAAC;IAC5D,IAAI,CAAC,OAAO,GAAG,GAAG,IAAI,CAAC,OAAO,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACpD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;IACzC,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;sEAEsE;AACtE,MAAM,UAAU,2BAA2B,CACzC,wBAAiC,EACjC,mBAA4B,EAC5B,IAAiC;IAEjC,OAAO,wBAAwB;WAC1B,CAAC,mBAAmB;WACpB,IAAI,EAAE,eAAe,KAAK,SAAS;WACnC,CAAC,IAAI,EAAE,qBAAqB,CAAC;AACpC,CAAC;AAED;;;;sEAIsE;AACtE,MAAM,UAAU,iCAAiC,CAAC,IAIjD;IACC,OAAO,IAAI,CAAC,0BAA0B;WACjC,CAAC,IAAI,CAAC,SAAS;WACf,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC;AAC1C,CAAC;AAED;;;;wDAIwD;AACxD,MAAM,UAAU,mCAAmC,CAAC,IAInD;IACC,IAAI,CAAC,IAAI,CAAC,0BAA0B;QAAE,OAAO,KAAK,CAAC;IACnD,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACpF,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;AACxD,CAAC;AAED;yEACyE;AACzE,MAAM,UAAU,sBAAsB,CACpC,OAAwB,EACxB,IAAiC;IAEjC,OAAO,OAAO,CAAC,eAAe,KAAK,SAAS;WACvC,IAAI,EAAE,eAAe,KAAK,SAAS;WACnC,CAAC,CAAC,OAAO,CAAC,qBAAqB;WAC/B,CAAC,CAAC,IAAI,EAAE,qBAAqB,CAAC;AACrC,CAAC;AAED;6EAC6E;AAC7E,MAAM,UAAU,oBAAoB,CAAC,mBAA4B;IAC/D,OAAO,CAAC,mBAAmB,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,OAAsD,EACtD,QAAsD;IAEtD,OAAO,QAAQ,CAAC,eAAe,KAAK,SAAS;WACxC,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;WAClC,OAAO,CAAC,eAAe,KAAK,QAAQ,CAAC,eAAe,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"pending-input-queue.js","sourceRoot":"","sources":["../../src/utils/pending-input-queue.ts"],"names":[],"mappings":"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"}

package/dist/utils/ready-gate.d.ts

@@ -1,6 +1,6 @@
 /**
  * Ready-gate state machine — holds the FIRST prompt for Claude-family CLIs until
- * a SessionStart hook fires a "真就绪" (true-ready) signal.
+ * a SessionStart hook proves the outer startup selector has been passed.
  *
  * Why this exists: a custom launcher (e.g. `cjadk claude`) shows an interactive
  * model/session selector at startup whose cursor is `❯` (U+276F). That glyph
@@ -10,11 +10,11 @@
  * trailing Enter mis-selects a menu item). The selector clears before Claude's
  * real input box renders, so the message is silently lost.
  *
- * Claude Code's `SessionStart` hook fires within ~3ms of the real input box
- * rendering, and crucially does NOT fire while the launcher is still on its
- * selector — so it's an unambiguous "the CLI is genuinely ready" signal. This
- * gate suspends the first flush until that signal (or a fallback timeout) so the
- * selector can never eat the first message.
+ * Claude Code's `SessionStart` hook crucially does NOT fire while the launcher
+ * is still on its selector. Claude can run multiple matching hooks in parallel,
+ * though, and renders the real prompt only after all finish. This gate therefore
+ * establishes the anti-selector boundary; the worker separately waits for fresh
+ * post-signal prompt evidence before it flushes Claude input.
  *
  * Lifecycle (recreated per CLI spawn in the worker):
  *   - `arm()`        — call at spawn when the adapter injects the SessionStart

package/dist/utils/ready-gate.js

@@ -1,6 +1,6 @@
 /**
  * Ready-gate state machine — holds the FIRST prompt for Claude-family CLIs until
- * a SessionStart hook fires a "真就绪" (true-ready) signal.
+ * a SessionStart hook proves the outer startup selector has been passed.
  *
  * Why this exists: a custom launcher (e.g. `cjadk claude`) shows an interactive
  * model/session selector at startup whose cursor is `❯` (U+276F). That glyph
@@ -10,11 +10,11 @@
  * trailing Enter mis-selects a menu item). The selector clears before Claude's
  * real input box renders, so the message is silently lost.
  *
- * Claude Code's `SessionStart` hook fires within ~3ms of the real input box
- * rendering, and crucially does NOT fire while the launcher is still on its
- * selector — so it's an unambiguous "the CLI is genuinely ready" signal. This
- * gate suspends the first flush until that signal (or a fallback timeout) so the
- * selector can never eat the first message.
+ * Claude Code's `SessionStart` hook crucially does NOT fire while the launcher
+ * is still on its selector. Claude can run multiple matching hooks in parallel,
+ * though, and renders the real prompt only after all finish. This gate therefore
+ * establishes the anti-selector boundary; the worker separately waits for fresh
+ * post-signal prompt evidence before it flushes Claude input.
  *
  * Lifecycle (recreated per CLI spawn in the worker):
  *   - `arm()`        — call at spawn when the adapter injects the SessionStart

package/dist/worker.js

@@ -13,7 +13,7 @@
  *   7. On 'restart', kills CLI and re-spawns with --resume
  */
 import { randomBytes } from 'node:crypto';
-import { mkdirSync, writeFileSync, unlinkSync, existsSync, statSync, lstatSync, readdirSync, readlinkSync, readFileSync, realpathSync, copyFileSync, watch as fsWatch, createWriteStream, openSync, closeSync, fstatSync, constants as fsConstants } from 'node:fs';
+import { mkdirSync, writeFileSync, unlinkSync, rmdirSync, existsSync, statSync, lstatSync, readdirSync, readlinkSync, readFileSync, realpathSync, copyFileSync, watch as fsWatch, createWriteStream, openSync, closeSync, fstatSync, constants as fsConstants } from 'node:fs';
 import { atomicWriteFileSync } from './utils/atomic-write.js';
 import { join, basename, dirname } from 'node:path';
 import { homedir, tmpdir } from 'node:os';
@@ -24,12 +24,12 @@ import { readProcessStartIdentity } from './core/session-marker.js';
 import { drainTranscript, joinAssistantText, trailingAssistantText, findJsonlContainingFingerprint, findJsonlsContainingExactContent, findLatestJsonl, extractLastAssistantTurn, extractTurnStartText, splitTranscriptEventsByCutoff } from './services/claude-transcript.js';
 import { BridgeTurnQueue, makeFingerprint, normaliseForFingerprint } from './services/bridge-turn-queue.js';
 import { shouldSuppressBridgeEmit } from './services/bridge-fallback-gate.js';
-import { decideHardTimeoutAction, decideSettleMarkReady, shouldReleaseFirstPromptTimeout, shouldWriteNow } from './utils/input-gate.js';
+import { decideHardTimeoutAction, decideSettleMarkReady, shouldReleaseFirstPromptTimeout, shouldWaitForPostSessionStartPromptEvidence, shouldWriteNow, } from './utils/input-gate.js';
 import { canStartInjectionFlush, shouldDeferUserFlush, shouldFlushInjectionsFirst } from './core/inject-queue-policy.js';
 import { stripAnsiForLog, tailChars } from './utils/crash-log.js';
 import { CodexUpdateDialogGuard } from './utils/codex-update-dialog.js';
 import { installStdioEpipeGuard, isIgnorableStreamError } from './utils/stdio-epipe-guard.js';
-import { mergeQueuedCliInput, pendingInputMayFlush, pendingInputAllowsTypeAhead, shouldDeferArgsBakedDurablePrompt, shouldDeferInitialPromptForArgLimit, shouldStopPendingBatch, terminalReleasesDurableTurn, } from './utils/pending-input-queue.js';
+import { mergeQueuedCliInput, pendingInputMayFlush, pendingInputAllowsTypeAhead, resolveInitialPromptDelivery, shouldDeferArgsBakedDurablePrompt, shouldDeferInitialPromptForArgLimit, shouldStopPendingBatch, terminalReleasesDurableTurn, } from './utils/pending-input-queue.js';
 import { ReadyGate, shouldArmReadyGate } from './utils/ready-gate.js';
 import { shouldRunStartupCommandsOnSpawn, shouldDeferInitialPromptForStartup } from './core/startup-commands.js';
 import { sanitizePerBotEnv } from './core/per-bot-env.js';
@@ -144,6 +144,36 @@ let remoteWsUrl;
 let remoteThreadId;
 let rpcDialogDismissTimer = null;
 let rpcEnginePidMarker = null;
+const piInitialPromptCleanupPaths = [];
+const piInitialPromptCleanupDirs = [];
+let piInitialPromptReadonlyRoots = [];
+let piInitialPromptAdditionalArgs = [];
+let piInitialPromptEnv = {};
+function cleanupPiInitialPromptFiles() {
+    while (piInitialPromptCleanupPaths.length > 0) {
+        const p = piInitialPromptCleanupPaths.pop();
+        if (!p)
+            continue;
+        try {
+            unlinkSync(p);
+        }
+        catch { /* best effort */ }
+    }
+    while (piInitialPromptCleanupDirs.length > 0) {
+        const dir = piInitialPromptCleanupDirs.pop();
+        if (!dir)
+            continue;
+        // Non-recursive on purpose: remove only an empty session-owned directory,
+        // never a shared root or a path that unexpectedly gained other content.
+        try {
+            rmdirSync(dir);
+        }
+        catch { /* best effort */ }
+    }
+    piInitialPromptReadonlyRoots = [];
+    piInitialPromptAdditionalArgs = [];
+    piInitialPromptEnv = {};
+}
 function stopCodexRpcEngine() {
     const engine = codexRpcEngine;
     codexRpcEngine = undefined;
@@ -672,6 +702,9 @@ let reattachIdleProbeTimer = null;
  *  adapter's hermesBridgeAttach reads the correct mode. */
 let lastSpawnEffectiveResume = false;
 let lastSpawnEffectiveCliSessionId;
+let lastSpawnDeferInitialPrompt = false;
+let lastSpawnQueuedInitialPrompt;
+let lastSpawnQueuedInitialPromptLogicalContent;
 let idleDetector = null;
 let isTmuxMode = false;
 /** True once a crash diagnostic tmux shell (bmx-diag-<sid>) is live. */
@@ -794,17 +827,16 @@ let bareShellLaunchBlocked = false;
  *  shell. Reset per spawn in spawnCli. */
 let bareShellChecked = false;
 /** Ready-gate (Claude-family): holds the first prompt until the SessionStart
- *  hook fires a true-ready signal, so a cjadk-style startup selector's ❯ (which
- *  falsely matches readyPattern) can't eat the first message. Recreated + armed
- *  per spawn in spawnCli; disarmed on signal or fallback timeout. */
+ *  hook proves a cjadk-style startup selector is behind us. Claude then needs
+ *  fresh post-hook prompt evidence because sibling hooks may still be running.
+ *  Recreated + armed per spawn; disarmed on signal or fallback timeout. */
 let readyGate = new ReadyGate();
 /** Fallback timer: if the SessionStart signal never arrives (hook injection
  *  failed / old CLI / launcher didn't pass --settings / adopt) release the gate
  *  and fall back to readyPattern + quiescence. */
 let readySignalTimer = null;
 /** How long the ready-gate waits for the SessionStart signal before falling
- *  back. The real signal lands within ~ms of the input box rendering, so this is
- *  pure insurance against a missing/failed hook — generous but bounded. */
+ *  back. This is insurance against a missing/failed hook — generous but bounded. */
 const READY_SIGNAL_TIMEOUT_MS = 45_000;
 /** Soft fallback for CLIs that never emit an idle/ready signal during startup.
  *  Legacy adapters release queued first input here. Adapters that opt into
@@ -817,13 +849,13 @@ const FIRST_PROMPT_HARD_TIMEOUT_MS = 90_000;
 /** Epoch ms of the most recent PTY output — used to settle for quiescence
  *  before the first flush (see settleThenFlush). */
 let lastPtyOutputAtMs = 0;
-/** After the SessionStart signal fires, the input box has appeared but Ink's
- *  startup render isn't fully drained yet — typing immediately trips Claude's
+/** After the SessionStart signal fires, Ink's startup rendering or sibling
+ *  hooks may still be active — typing immediately can trip Claude's
  *  paste-burst heuristic and the `\` soft-newline markers (claude-code
  *  writeInput) get kept literally. This is pronounced under wrapperCli launchers
  *  (e.g. `aiden x claude`) whose Claude renders more at startup. So we wait for
- *  the PTY to fall quiet for SETTLE_MS before the first flush — the signal still
- *  gates readiness (anti-selector), the settle just lets the render drain. */
+ *  PTY quiescence, while Claude additionally requires fresh prompt evidence
+ *  after the SessionStart boundary. */
 const READY_FLUSH_SETTLE_MS = 1_000;
 /** Upper bound on the settle so a chatty startup (spinners, periodic redraw)
  *  can't stall the first prompt indefinitely. */
@@ -846,11 +878,18 @@ let promptReadyDetectedDuringSettle = false;
  *  spawn that renders ❯ but never fires BOTMUX_READY_COMMAND waits the full
  *  hard timeout (and previously never delivered at all). */
 let readyPatternSeenDuringHold = false;
+/** Claude's SessionStart hooks run in parallel. Its botmux hook proves the
+ * startup selector is behind us, but sibling project hooks may still be
+ * running. Hold type-ahead until a fresh PTY prompt is observed after the
+ * SessionStart signal. */
+let awaitingPostSessionStartPromptEvidence = false;
+/** Scoped marker set only by IdleDetector's screen-driven callback. */
+let postSessionStartPromptEvidenceInFlight = false;
 /** Wait until the PTY has been quiet for READY_FLUSH_SETTLE_MS (Ink render
  *  drained), capped at READY_FLUSH_SETTLE_CAP_MS, then flush the held prompt.
- *  A real SessionStart/BOTMUX_READY_COMMAND signal is itself authoritative
- *  prompt readiness; the timeout fallback only opens the gate and lets the
- *  regular readyPattern/idle path prove readiness later. */
+ *  An authoritative direct ready command (Hermes) can mark prompt readiness;
+ *  Claude's SessionStart only opens the anti-selector boundary and its regular
+ *  readyPattern/idle path must prove readiness afterward. */
 function settleThenFlush(startedAtMs, promptReadyAfterSettle) {
     readyFlushSettleTimer = null;
     const now = Date.now();
@@ -4527,6 +4566,15 @@ function releaseRawInputRestartGate() {
     rawInputRestartGate = false;
     log('Replacement CLI prompt ready — releasing deferred passthrough commands');
 }
+function markPromptReadyFromPty() {
+    postSessionStartPromptEvidenceInFlight = true;
+    try {
+        markPromptReady();
+    }
+    finally {
+        postSessionStartPromptEvidenceInFlight = false;
+    }
+}
 function markPromptReady() {
     if (isPromptReady)
         return; // guard against duplicate calls
@@ -4546,6 +4594,14 @@ function markPromptReady() {
         log('Idle detected but holding for SessionStart ready signal (startup selector guard)');
         return;
     }
+    if (awaitingPostSessionStartPromptEvidence) {
+        if (!postSessionStartPromptEvidenceInFlight) {
+            log('Ignoring non-PTY ready source while waiting for post-SessionStart prompt evidence');
+            return;
+        }
+        awaitingPostSessionStartPromptEvidence = false;
+        log('Fresh prompt evidence observed after SessionStart hooks');
+    }
     if (isSettlingFirstFlush) {
         promptReadyDetectedDuringSettle = true;
         log('Idle detected during ready-gate settle; deferring prompt-ready until settle completes');
@@ -4577,6 +4633,7 @@ function markPromptReady() {
     maybeEmitWorkflowTranscriptOutput();
     if (awaitingFirstPrompt) {
         awaitingFirstPrompt = false;
+        awaitingPostSessionStartPromptEvidence = false;
         renderer?.markNewTurn(); // exclude history replay from streaming card
     }
     send({ type: 'prompt_ready' });
@@ -4916,6 +4973,10 @@ async function flushPending() {
         log(`Holding ${pendingMessages.length} pending message(s) until ready-gate settle completes`);
         return;
     }
+    if (awaitingPostSessionStartPromptEvidence) {
+        log(`Holding ${pendingMessages.length} pending message(s) until post-SessionStart prompt evidence`);
+        return;
+    }
     // Type-ahead adapters flush even while the CLI is busy; others wait for
     // idle. Claude bridge fallback used to also disable type-ahead because
     // BridgeTurnQueue.ingest didn't recognise the `attachment(queued_command)`
@@ -5040,6 +5101,7 @@ async function flushPending() {
             if (!codexRpcEngine)
                 inflightInputs.onWrite(item);
             const msg = item.content;
+            const logicalMsg = item.logicalContent ?? msg;
             currentBotmuxTurnId = item.turnId;
             currentBotmuxDispatchAttempt = item.dispatchAttempt;
             currentVcMeetingImTurnOrigin = item.vcMeetingImTurnOrigin;
@@ -5059,14 +5121,14 @@ async function flushPending() {
                     bridgeIngest();
                 }
                 catch { /* best-effort */ }
-                bridgeTurnId = bridgeMarkPendingTurn(msg, item.turnId, item.dispatchAttempt);
+                bridgeTurnId = bridgeMarkPendingTurn(logicalMsg, item.turnId, item.dispatchAttempt);
             }
             else if (codexBridgeActive) {
                 // Codex mark works even before the rollout path is known: the
                 // queue is path-agnostic, and the late-attach below will start
                 // ingest from offset 0 so the user_message that lands shortly
                 // after still fingerprint-matches this turn.
-                codexBridgeMarkPendingTurn(msg, item.turnId, item.dispatchAttempt);
+                codexBridgeMarkPendingTurn(logicalMsg, item.turnId, item.dispatchAttempt);
             }
             if (durableWrite
                 && cliAdapter.reliableTurnTerminal === true
@@ -5120,7 +5182,7 @@ async function flushPending() {
                 // do. Otherwise surface it as a submit failure so the message isn't
                 // silently lost.
                 if (backend)
-                    scheduleSubmitFailureNotify(msg, undefined, '会话 JSONL', bridgeTurnId, undefined, turnSeq, item);
+                    scheduleSubmitFailureNotify(logicalMsg, undefined, '会话 JSONL', bridgeTurnId, undefined, turnSeq, item);
                 break;
             }
             // Persist any sessionId the adapter observed via authoritative sources
@@ -5139,7 +5201,7 @@ async function flushPending() {
             // nulled backend) the user already got a "CLI exited" notice; don't also
             // nag that the submit wasn't confirmed.
             if (result && result.submitted === false && backend) {
-                scheduleSubmitFailureNotify(msg, result.recheck, '会话 JSONL', bridgeTurnId, result.failureReason, turnSeq, item);
+                scheduleSubmitFailureNotify(logicalMsg, result.recheck, '会话 JSONL', bridgeTurnId, result.failureReason, turnSeq, item);
             }
             // All structured bridges now drain every pending message in one flush:
             // Claude's BridgeTurnQueue handles `attachment(queued_command)` events
@@ -6312,6 +6374,30 @@ async function spawnCli(cfg, opts = {}) {
     // baking it into args would drop the message that triggered the resume.
     // Finally, defer adapter-declared over-limit prompts to avoid backend command
     // string limits (tmux "command too long") while preserving short argv prompts.
+    let preparedInitialPrompt;
+    let promptArgPreparationChanged = false;
+    let preparedDeferredInput;
+    if (cfg.prompt) {
+        const prepared = cliAdapter.prepareInitialPromptArg?.({
+            initialPrompt: cfg.prompt,
+            sessionId: effectiveAdapterSessionId,
+            sessionDataDir: process.env.SESSION_DATA_DIR,
+        });
+        if (prepared?.readonlyRoots?.length) {
+            piInitialPromptReadonlyRoots = [
+                ...new Set([...piInitialPromptReadonlyRoots, ...prepared.readonlyRoots]),
+            ];
+        }
+        if (prepared?.cleanupPaths?.length) {
+            piInitialPromptCleanupPaths.push(...prepared.cleanupPaths);
+        }
+        if (prepared?.cleanupDirs?.length) {
+            piInitialPromptCleanupDirs.push(...prepared.cleanupDirs);
+        }
+        preparedDeferredInput = prepared?.deferredInput;
+        preparedInitialPrompt = prepared?.initialPrompt ?? cfg.prompt;
+        promptArgPreparationChanged = preparedInitialPrompt !== cfg.prompt;
+    }
     const deferInitialPrompt = shouldDeferInitialPromptForStartup({
         hasStartupCommands: !!cfg.startupCommands?.length,
         adoptMode: cfg.adoptMode === true,
@@ -6321,11 +6407,25 @@ async function spawnCli(cfg, opts = {}) {
         adoptMode: cfg.adoptMode === true,
         dispatchAttempt: cfg.dispatchAttempt,
     }) || (effectiveResume && cliAdapter.initialPromptArgsIgnoredOnResume === true)
-        || shouldDeferInitialPromptForArgLimit({
+        || (!promptArgPreparationChanged && shouldDeferInitialPromptForArgLimit({
             passesInitialPromptViaArgs: cliAdapter.passesInitialPromptViaArgs === true,
             prompt: cfg.prompt,
             maxInitialPromptArgBytes: cliAdapter.maxInitialPromptArgBytes,
-        });
+        }));
+    const initialPromptDelivery = resolveInitialPromptDelivery({
+        originalPrompt: cfg.prompt,
+        preparedArg: preparedInitialPrompt,
+        preparedDeferredContent: preparedDeferredInput?.content,
+        defer: deferInitialPrompt,
+    });
+    preparedInitialPrompt = initialPromptDelivery.argvPrompt;
+    lastSpawnQueuedInitialPrompt = initialPromptDelivery.queuedContent;
+    lastSpawnQueuedInitialPromptLogicalContent = initialPromptDelivery.logicalContent;
+    if (deferInitialPrompt && preparedDeferredInput) {
+        piInitialPromptAdditionalArgs = [...(preparedDeferredInput.additionalArgs ?? [])];
+        piInitialPromptEnv = { ...(preparedDeferredInput.env ?? {}) };
+    }
+    lastSpawnDeferInitialPrompt = deferInitialPrompt;
     kiroSessionIdCaptureArmed = cfg.cliId === 'kiro-cli' && !effectiveCliSessionId && !willReattachPersistent;
     kiroSessionIdCaptureBuffer = '';
     // Per-bot local read isolation: assemble the Seatbelt profile context (the gate
@@ -6404,7 +6504,7 @@ async function spawnCli(cfg, opts = {}) {
         resume: effectiveResume,
         workingDir: cfg.workingDir,
         resumeSessionId: effectiveCliSessionId,
-        initialPrompt: deferInitialPrompt ? undefined : (cfg.prompt || undefined),
+        initialPrompt: preparedInitialPrompt,
         botName: cfg.botName,
         botOpenId: cfg.botOpenId,
         larkAppId: cfg.larkAppId,
@@ -6419,6 +6519,12 @@ async function spawnCli(cfg, opts = {}) {
         remoteWsUrl,
         remoteThreadId,
     });
+    // Pi's deferred long-first-prompt command is implemented by a session-scoped
+    // extension. Keep its launch args across owned process restarts while the
+    // queued/in-flight command may still need replay.
+    if (piInitialPromptAdditionalArgs.length > 0) {
+        args.unshift(...piInitialPromptAdditionalArgs);
+    }
     // Extra args from env (CLI_DISABLE_DEFAULT_ARGS is removed — adapters own their defaults)
     const extra = (process.env.CLI_EXTRA_ARGS ?? '').trim();
     if (extra)
@@ -6548,6 +6654,9 @@ async function spawnCli(cfg, opts = {}) {
     // them past the server's global env.
     if (cliAdapter.spawnEnv)
         Object.assign(childEnv, cliAdapter.spawnEnv);
+    if (Object.keys(piInitialPromptEnv).length > 0) {
+        Object.assign(childEnv, piInitialPromptEnv);
+    }
     // v2 read isolation: point the CLI at its PER-BOT config dir (set AFTER spawnEnv
     // so it overrides any adapter default). claude → CLAUDE_CONFIG_DIR, codex →
     // CODEX_HOME. Both are in BOTMUX_INJECTED_ENV_KEYS so the tmux backend forwards
@@ -6634,6 +6743,9 @@ async function spawnCli(cfg, opts = {}) {
                     cliId: cliAdapter.id,
                     resolvedBin: canonical(cliAdapter.resolvedBin),
                 }),
+                // buildV2DenyPaths masks the shared pi-initial-prompts root. Re-open
+                // only this session's private child directory for Pi's @file/extension.
+                ...piInitialPromptReadonlyRoots.map(canonical),
             ];
             finalDenyPaths = carve.finalDenyPaths.map(canonical);
             traverseDirs = carve.traverseDirs.map(canonical);
@@ -6880,6 +6992,7 @@ async function spawnCli(cfg, opts = {}) {
                     extraExecPaths: cliAdapter.sandboxExtraExecPaths?.(),
                     readonlyRoots: [
                         ...(cfg.skillReadonlyRoots ?? []),
+                        ...piInitialPromptReadonlyRoots,
                         ...(readIsoLinuxMasks?.ownReadOnlyPaths ?? []),
                     ],
                     mcpGatewaySocketPath: sessionMcpGatewayHost?.socketPath,
@@ -7369,6 +7482,7 @@ async function spawnCli(cfg, opts = {}) {
     isSettlingFirstFlush = false;
     promptReadyDetectedDuringSettle = false;
     readyPatternSeenDuringHold = false;
+    awaitingPostSessionStartPromptEvidence = false;
     // Reset quiescence baseline so the settle measures silence from THIS spawn.
     lastPtyOutputAtMs = Date.now();
     const readyHookAvailable = effectiveReadyHookInstall
@@ -7411,7 +7525,7 @@ async function spawnCli(cfg, opts = {}) {
     // quiescence, repeatedly triggering markPromptReady() and duplicate cards.
     if (effectiveBackendType !== 'riff') {
         idleDetector = new IdleDetector(cliAdapter);
-        idleDetector.onIdle(async () => {
+        idleDetector.onIdle(async (evidenceSource) => {
             log('Prompt detected (idle)');
             // Bridge drain MUST run before markPromptReady() — the latter calls
             // flushPending() which can immediately fire the next queued message
@@ -7433,7 +7547,12 @@ async function spawnCli(cfg, opts = {}) {
                     log(`Codex bridge emit error: ${err.message}`);
                 }
             }
-            markPromptReady();
+            if (evidenceSource === 'screen') {
+                markPromptReadyFromPty();
+            }
+            else {
+                markPromptReady();
+            }
         });
     }
     backend.onData(onPtyData);
@@ -7582,6 +7701,7 @@ async function spawnCli(cfg, opts = {}) {
             return;
         }
         awaitingFirstPrompt = false;
+        awaitingPostSessionStartPromptEvidence = false;
         renderer?.markNewTurn();
         log(forced
             ? `WARN First prompt hard timeout — ${cliName()} readyPattern did not arrive; forcing queued message flush`
@@ -7626,6 +7746,8 @@ function killCli(opts = {}) {
     currentCliCredentialIsolated = false;
     stopSessionMcpGatewayHost();
     stopCodexRpcEngine();
+    if (!opts.preservePending)
+        cleanupPiInitialPromptFiles();
     destroyCrashDiagnosticTerminal('killCli');
     idleDetector?.dispose();
     idleDetector = null;
@@ -7643,6 +7765,7 @@ function killCli(opts = {}) {
     isSettlingFirstFlush = false;
     promptReadyDetectedDuringSettle = false;
     readyPatternSeenDuringHold = false;
+    awaitingPostSessionStartPromptEvidence = false;
     stopScreenAnalyzer();
     stopScreenUpdates();
     backend?.kill();
@@ -9097,20 +9220,7 @@ process.on('message', async (raw) => {
                 // Tier-1/Tier-2 fresh demotion, which clears the flag). Adopt spawns
                 // return from spawnCli before that write — exclude them explicitly so
                 // the stale module-level value can't leak in.
-                const deferInitialPrompt = shouldDeferInitialPromptForStartup({
-                    hasStartupCommands: !!msg.startupCommands?.length,
-                    adoptMode: msg.adoptMode === true,
-                    passesInitialPromptViaArgs: cliAdapter?.passesInitialPromptViaArgs === true,
-                }) || shouldDeferArgsBakedDurablePrompt({
-                    passesInitialPromptViaArgs: cliAdapter?.passesInitialPromptViaArgs === true,
-                    adoptMode: msg.adoptMode === true,
-                    dispatchAttempt: msg.dispatchAttempt,
-                }) || (msg.adoptMode !== true && lastSpawnEffectiveResume && cliAdapter?.initialPromptArgsIgnoredOnResume === true)
-                    || shouldDeferInitialPromptForArgLimit({
-                        passesInitialPromptViaArgs: cliAdapter?.passesInitialPromptViaArgs === true,
-                        prompt: msg.prompt,
-                        maxInitialPromptArgBytes: cliAdapter?.maxInitialPromptArgBytes,
-                    });
+                const deferInitialPrompt = lastSpawnDeferInitialPrompt;
                 if (msg.prompt && cliAdapter?.passesInitialPromptViaArgs && !deferInitialPrompt && codexBridgeFallbackActive()) {
                     // Args-baked first prompts (notably Pi) never pass through the normal
                     // 'message' IPC path, so the structured bridge would otherwise see the
@@ -9135,7 +9245,10 @@ process.on('message', async (raw) => {
                     deferInitialPrompt,
                 })) {
                     pendingMessages.push({
-                        content: msg.prompt,
+                        content: lastSpawnQueuedInitialPrompt ?? msg.prompt,
+                        ...(lastSpawnQueuedInitialPromptLogicalContent
+                            ? { logicalContent: lastSpawnQueuedInitialPromptLogicalContent }
+                            : {}),
                         turnId: msg.turnId,
                         dispatchAttempt: msg.dispatchAttempt,
                         vcMeetingImTurnOrigin: msg.vcMeetingImTurnOrigin,
@@ -9454,24 +9567,43 @@ process.on('message', async (raw) => {
             break;
         }
         case 'session_ready': {
-            // Claude-family SessionStart hook fired (via `botmux session-ready` →
-            // daemon). The CLI's input box is genuinely rendered — release the
-            // ready-gate and deliver any held first prompt. Idempotent: a later
-            // duplicate (clear/compact source) is a no-op.
+            // Claude-family SessionStart hooks run in parallel. This signal proves
+            // the startup selector is behind us, but a slower project hook can still
+            // be running and Claude does not render its real prompt until ALL hooks
+            // finish. Clear selector-era evidence and require a fresh PTY prompt after
+            // the signal. Hermes keeps its authoritative ready-command behavior.
             log(`SessionStart ready signal received (source=${msg.source ?? '?'})`);
+            const waitForPostHookPrompt = shouldWaitForPostSessionStartPromptEvidence({
+                isClaudeFamily: !!cliAdapter?.claudeDataDir,
+                hasReadyPattern: !!cliAdapter?.readyPattern,
+                awaitingFirstPrompt,
+                isPromptReady,
+                alreadyWaiting: awaitingPostSessionStartPromptEvidence,
+            });
+            if (waitForPostHookPrompt) {
+                awaitingPostSessionStartPromptEvidence = true;
+                promptReadyDetectedDuringSettle = false;
+                readyPatternSeenDuringHold = false;
+                idleDetector?.resetReadyEvidence();
+                lastPtyOutputAtMs = Date.now();
+                log('SessionStart boundary recorded — waiting for fresh post-hook prompt evidence');
+            }
             // 先记下 gate 是否已被 45s fallback 释放：ReadyGate.receive() 是一次性
             // 语义，fallback 抢先后 releaseReadyGate 会整块跳过迟到的真信号。
             const lateAfterFallback = readyGate.isArmed && readyGate.isReceived;
-            releaseReadyGate('SessionStart hook', { promptReadyAfterSettle: true });
+            releaseReadyGate('SessionStart hook', { promptReadyAfterSettle: !waitForPostHookPrompt });
             // 冷启动超过 READY_SIGNAL_TIMEOUT_MS 的 CLI（Hermes 常态是 2-3 分钟）恰好
             // 总落在 fallback 之后：fallback 只开闸不投递（非 type-ahead 的
             // flushPending 是 no-op），真信号依然是权威就绪，这里直接兑现。仅限首轮
             // （awaitingFirstPrompt）——首条 prompt 交付后 clear/compact 来源的
             // SessionStart 保持原有 no-op 语义，绝不在会话中途误标就绪。
-            if (lateAfterFallback && awaitingFirstPrompt && !isPromptReady) {
+            if (lateAfterFallback && awaitingFirstPrompt && !isPromptReady && !waitForPostHookPrompt) {
                 log('Late ready signal after timeout fallback — marking prompt ready now');
                 markPromptReady();
             }
+            if (msg.requestId) {
+                send({ type: 'session_ready_ack', requestId: msg.requestId });
+            }
             break;
         }
         case 'set_display_mode': {
@@ -9578,6 +9710,7 @@ process.on('message', async (raw) => {
 });
 // ─── Cleanup ─────────────────────────────────────────────────────────────────
 function cleanup() {
+    cleanupPiInitialPromptFiles();
     stopSessionMcpGatewayHost();
     if (tmuxRestartTimer) {
         clearTimeout(tmuxRestartTimer);