clisbot 0.1.45-beta.10 → 0.1.45-beta.11

package/dist/main.js

@@ -69100,6 +69100,14 @@ class TmuxSubmitUnconfirmedError extends Error {
   }
 }
 async function submitTmuxSessionInput(params) {
+  if (params.trustPrompt) {
+    await acceptTmuxTrustPromptIfPresent({
+      tmux: params.tmux,
+      sessionName: params.sessionName,
+      captureLines: params.trustPrompt.captureLines,
+      startupDelayMs: params.trustPrompt.startupDelayMs
+    });
+  }
   const prePasteState = await params.tmux.getPaneState(params.sessionName);
   const captureLines = estimatePasteCaptureLines(params.text);
   const prePasteSnapshot = normalizePaneText(await params.tmux.capturePane(params.sessionName, captureLines));
@@ -69153,6 +69161,12 @@ async function submitTmuxSessionInput(params) {
   throw new TmuxSubmitUnconfirmedError;
 }
 async function captureTmuxSessionIdentity(params) {
+  await acceptTmuxTrustPromptIfPresent({
+    tmux: params.tmux,
+    sessionName: params.sessionName,
+    captureLines: params.captureLines,
+    startupDelayMs: params.timeoutMs
+  });
   let statusSubmission = await submitTmuxSessionInput({
     tmux: params.tmux,
     sessionName: params.sessionName,
@@ -69176,7 +69190,7 @@ async function captureTmuxSessionIdentity(params) {
       throw error;
     }
     if (tmuxPaneHasTrustPrompt(snapshot)) {
-      await dismissTrustPrompt({
+      await acceptTrustPrompt({
         tmux: params.tmux,
         sessionName: params.sessionName,
         captureLines: params.captureLines
@@ -69233,7 +69247,7 @@ function extractSessionIdFromCaptureCandidates(candidates, pattern) {
   }
   return null;
 }
-async function dismissTmuxTrustPromptIfPresent(params) {
+async function acceptTmuxTrustPromptIfPresent(params) {
   const deadline = Date.now() + Math.max(TRUST_PROMPT_MAX_WAIT_MS, params.startupDelayMs);
   while (Date.now() <= deadline) {
     let snapshot = "";
@@ -69256,7 +69270,7 @@ async function dismissTmuxTrustPromptIfPresent(params) {
     if (!tmuxPaneHasTrustPrompt(snapshot)) {
       return;
     }
-    await dismissTrustPrompt({
+    await acceptTrustPrompt({
       tmux: params.tmux,
       sessionName: params.sessionName,
       captureLines: params.captureLines
@@ -69288,7 +69302,7 @@ async function waitForTmuxSessionBootstrap(params) {
     if (snapshot) {
       lastSnapshot = snapshot;
       if (params.trustWorkspace && tmuxPaneHasTrustPrompt(snapshot)) {
-        await dismissTrustPrompt({
+        await acceptTrustPrompt({
           tmux: params.tmux,
           sessionName: params.sessionName,
           captureLines: params.captureLines
@@ -69321,7 +69335,7 @@ async function waitForTmuxSessionBootstrap(params) {
     snapshot: lastSnapshot
   };
 }
-async function dismissTrustPrompt(params) {
+async function acceptTrustPrompt(params) {
   await params.tmux.sendKey(params.sessionName, "Enter");
   const deadline = Date.now() + TRUST_PROMPT_MAX_WAIT_MS;
   while (Date.now() <= deadline) {
@@ -69970,7 +69984,7 @@ class RunnerService {
       try {
         const snapshot = await this.captureSessionSnapshot(resolved);
         if (tmuxPaneHasTrustPrompt(snapshot)) {
-          await this.dismissVisibleTrustPrompt(resolved);
+          await this.acceptVisibleWorkspaceTrustPrompt(resolved);
           continue;
         }
         return;
@@ -70041,6 +70055,7 @@ class RunnerService {
       });
       try {
         await clearRunnerExitRecord(this.loadedConfig.stateDir, resolved.sessionName);
+        await this.acceptWorkspaceTrustPromptIfPresent(resolved);
         await this.syncStoredSessionIdForResolvedTarget(resolved);
       } catch (error) {
         throw await this.mapSessionError(error, resolved.sessionName, "during startup");
@@ -70124,7 +70139,7 @@ class RunnerService {
     return resolved;
   }
   async finalizeSessionStartup(resolved, params) {
-    await this.dismissTrustPrompt(resolved);
+    await this.acceptWorkspaceTrustPromptIfPresent(resolved);
     await this.verifySessionReady(resolved);
     if (params.storedOrExplicitSessionId) {
       await this.persistStoredSessionIdBestEffort(resolved, params.storedOrExplicitSessionId, params.runnerCommand);
@@ -70158,14 +70173,14 @@ class RunnerService {
       return;
     }
   }
-  async dismissTrustPrompt(resolved) {
+  async acceptWorkspaceTrustPromptIfPresent(resolved) {
     if (!resolved.runner.trustWorkspace) {
       return;
     }
-    await this.dismissVisibleTrustPrompt(resolved);
+    await this.acceptVisibleWorkspaceTrustPrompt(resolved);
   }
-  async dismissVisibleTrustPrompt(resolved) {
-    await dismissTmuxTrustPromptIfPresent({
+  async acceptVisibleWorkspaceTrustPrompt(resolved) {
+    await acceptTmuxTrustPromptIfPresent({
       tmux: this.tmux,
       sessionName: resolved.sessionName,
       captureLines: resolved.stream.captureLines,
@@ -70246,6 +70261,7 @@ class RunnerService {
   async triggerNewSessionInLiveRunner(resolved) {
     const oldSessionId = (await this.sessionMapping.get(resolved.sessionKey))?.sessionId;
     const command = this.resolveNewSessionCommand(resolved);
+    await this.acceptWorkspaceTrustPromptIfPresent(resolved);
     await this.submitNewSessionCommand(resolved, command);
     const sessionId = await this.captureNewSessionIdentityAfterTrigger(resolved, oldSessionId);
     if (!sessionId) {
@@ -70422,6 +70438,7 @@ class RunnerService {
     if (!await this.tmux.hasSession(resolved.sessionName)) {
       throw new Error(`tmux session "${resolved.sessionName}" does not exist`);
     }
+    await this.acceptWorkspaceTrustPromptIfPresent(resolved);
     await submitTmuxSessionInput({
       tmux: this.tmux,
       sessionName: resolved.sessionName,
@@ -70500,6 +70517,14 @@ async function monitorTmuxRun(params) {
   let firstMeaningfulDeltaLogged = false;
   let noOutputThresholdLogged = false;
   if (params.prompt) {
+    if (params.trustWorkspace) {
+      await acceptTmuxTrustPromptIfPresent({
+        tmux: params.tmux,
+        sessionName: params.sessionName,
+        captureLines: params.captureLines,
+        startupDelayMs: params.startupDelayMs ?? 0
+      });
+    }
     logLatencyDebug("tmux-submit-start", params.timingContext, {
       sessionName: params.sessionName,
       promptSubmitDelayMs: params.promptSubmitDelayMs
@@ -71242,6 +71267,8 @@ class SessionService {
           sessionName: run.resolved.sessionName,
           prompt: params.prompt,
           promptSubmitDelayMs: run.resolved.runner.promptSubmitDelayMs,
+          trustWorkspace: run.resolved.runner.trustWorkspace,
+          startupDelayMs: run.resolved.runner.startupDelayMs,
           captureLines: run.resolved.stream.captureLines,
           updateIntervalMs: run.resolved.stream.updateIntervalMs,
           idleTimeoutMs: run.resolved.stream.idleTimeoutMs,
@@ -86200,6 +86227,8 @@ async function withStartupTimeout(name, start2) {
 }
 
 // src/control/runtime-management-cli.ts
+var RESTART_STOP_STATUS_RECHECK_TIMEOUT_MS = 2000;
+var RESTART_STOP_STATUS_RECHECK_INTERVAL_MS = 100;
 function getOperatorConfigPath() {
   return expandHomePath(process.env.CLISBOT_CONFIG_PATH || DEFAULT_CONFIG_PATH);
 }
@@ -86439,6 +86468,7 @@ async function stop(hard = false) {
 async function restart(dependencies = {
   stopDetachedRuntime,
   getRuntimeStatus,
+  sleep,
   warn: (message) => console.error(message)
 }) {
   const configPath = getOperatorConfigPath();
@@ -86448,7 +86478,7 @@ async function restart(dependencies = {
       hard: false
     });
   } catch (error) {
-    const status = await dependencies.getRuntimeStatus({ configPath });
+    const status = await waitForStoppedRuntimeAfterStopError(configPath, dependencies);
     if (status.running) {
       throw error;
     }
@@ -86456,6 +86486,16 @@ async function restart(dependencies = {
     dependencies.warn(`warning: clisbot stop reported an error, but status now shows the service is stopped; continuing with start. Stop error: ${message}`);
   }
 }
+async function waitForStoppedRuntimeAfterStopError(configPath, dependencies) {
+  const deadline = Date.now() + RESTART_STOP_STATUS_RECHECK_TIMEOUT_MS;
+  while (true) {
+    const status = await dependencies.getRuntimeStatus({ configPath });
+    if (!status.running || Date.now() >= deadline) {
+      return status;
+    }
+    await dependencies.sleep(RESTART_STOP_STATUS_RECHECK_INTERVAL_MS);
+  }
+}
 async function status() {
   await printStatusSummary();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clisbot",
-  "version": "0.1.45-beta.10",
+  "version": "0.1.45-beta.11",
   "private": false,
   "description": "Chat surfaces for durable AI coding agents running in tmux",
   "license": "MIT",