@assuredloop/orca-bot-kit 0.22.0 → 0.24.1

package/src/temp.js

@@ -28,7 +28,7 @@ import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import { setTimeout as pause } from 'node:timers/promises';
 
-import { readBook, updateBook } from './book.js';
+import { readBook, takeLineTurn, TYPING_HELD, TYPING_WAIT_MS, updateBook } from './book.js';
 import { addSession, dropSession, NAME, readBot, tempRoles } from './bot.js';
 import { DEFAULT_APPROVAL, harnessOf, isShortPrompt, ownCli, shellWord, startPrompt, workDirOf } from './launch.js';
 import { sessionInTab } from './message.js';
@@ -353,16 +353,23 @@ export async function trustHooks(bots, { tab, name }) {
   if (handle === undefined) {
     throw new Error(`${run} has no tab open in Orca, so there is no review of its to answer. ${nothing}`);
   }
-  const seen = screenRows(handle);
-  if (seen.rows === undefined) {
-    throw new Error(`${run}'s screen could not be read (${seen.unreadable}), so the kit cannot tell whether its hooks review is there. ${nothing}`);
-  }
-  const keys = keysToTrustAll(seen.rows);
-  if (keys === undefined) {
-    throw new Error(`${run}'s screen shows no "${HOOKS_REVIEW}" with its choices, so there is nothing for this to answer. It shows: ${shown(seen.rows)}. ${nothing}`);
+  // The session's turn for a line (#482), for the look and the keys.
+  const turn = takeLineTurn(caller.home, name, TYPING_WAIT_MS);
+  if (turn === undefined) throw new Error(`${run}: ${TYPING_HELD}.`);
+  try {
+    const seen = screenRows(handle);
+    if (seen.rows === undefined) {
+      throw new Error(`${run}'s screen could not be read (${seen.unreadable}), so the kit cannot tell whether its hooks review is there. ${nothing}`);
+    }
+    const keys = keysToTrustAll(seen.rows);
+    if (keys === undefined) {
+      throw new Error(`${run}'s screen shows no "${HOOKS_REVIEW}" with its choices, so there is nothing for this to answer. It shows: ${shown(seen.rows)}. ${nothing}`);
+    }
+    // The return is inside the text: `--enter` would be a second key.
+    orca(['terminal', 'send', '--terminal', handle, '--text', keys]);
+  } finally {
+    turn.release();
   }
-  // The return is inside the text: `--enter` would be a second key.
-  orca(['terminal', 'send', '--terminal', handle, '--text', keys]);
   for (let waited = 0; ; waited += 500) {
     const after = screenRows(handle);
     if (after.rows !== undefined && !after.rows.some((row) => row.includes(HOOKS_REVIEW))) break;

package/src/up.js

@@ -8,7 +8,7 @@ import { existsSync, mkdirSync, realpathSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import { setTimeout as pause } from 'node:timers/promises';
 
-import { forgetClaimed, forgetSession, MAILBOX_WAIT_MS, readBook, sessionIdsIn, tabIdsIn, takeMailboxTurn, updateBook, withUnclaimed } from './book.js';
+import { forgetClaimed, forgetSession, MAILBOX_WAIT_MS, readBook, sessionIdsIn, tabIdsIn, takeLineTurn, takeMailboxTurn, TYPING_HELD, TYPING_WAIT_MS, updateBook, withUnclaimed } from './book.js';
 import { botDir, botNames, displayName, projectName, readBot } from './bot.js';
 import { conversationsIn, hasConversation, heldAsUserTurn, transcriptsIn } from './conversations.js';
 import { installHook } from './hooks.js';
@@ -374,7 +374,7 @@ async function bringUpSession(bots, home, live, session, bot, title) {
   // 0.157.1 (#226). So it is given one line, through the same gate as a mail
   // notice, which the owner allowed. A fresh start's first turn is its prompt.
   const list = harness === 'codex' && launch.resume !== undefined && tui.running === true
-    ? await typeListLine(home, made.tabId)
+    ? await typeListLine(home, session.name, made.tabId)
     : undefined;
 
   return entry(made, {
@@ -408,42 +408,65 @@ const LIST_LOOK_MS = 2000;
 const LIST_ASK_MS = 500;
 
 /**
- * Type LIST_LINE into the tab `tabId` once the gate every typed line goes
- * through lets it: `{ typed: true }`, or `{ typed: false, why }` with the
- * gate's last reason once LIST_WAIT_MS is up. Nothing goes into a question, a
- * form or a menu (#329, #416), nor into a tab the kit cannot tell about.
+ * Type `line`, LIST_LINE unless told otherwise, into the tab `tabId` of
+ * `session` once the gate every typed line goes through lets it:
+ * `{ typed: true }`, or `{ typed: false, why }` with the gate's last reason
+ * once LIST_WAIT_MS is up. Nothing goes into a question, a form or a menu
+ * (#329, #416), nor into a tab the kit cannot tell about. Each look and its
+ * line are taken in the session's turn for a line (#482), unless the caller
+ * says it holds the session's typing turn already (`held`).
  */
-async function typeListLine(home, tabId) {
+export async function typeListLine(home, session, tabId, { line = LIST_LINE, held = false } = {}) {
   const until = Date.now() + LIST_WAIT_MS;
   for (;;) {
-    let found;
-    try {
-      // Each look waits no longer than what is left of the wait.
-      found = tabToTypeInto(home, tabId, Math.max(1, Math.min(LIST_LOOK_MS, until - Date.now())));
-    } catch (error) {
-      return { typed: false, why: `Orca would not say whether it may be typed into: ${error.message}` };
-    }
-    // A yes that comes after the wait is too late: the wait is a cutoff, not a
-    // count of looks (review of PR #421).
-    if (found.handle !== undefined && Date.now() > until) {
-      return { typed: false, why: `the ${LIST_WAIT_MS / 1000} s wait for it ran out before the kit could tell it may be typed into` };
-    }
-    if (found.handle !== undefined) {
+    let turn;
+    if (!held) {
       try {
-        typeIntoTab(found.handle, LIST_LINE);
-        return { typed: true };
+        turn = takeLineTurn(home, session, TYPING_WAIT_MS);
       } catch (error) {
-        return { typed: false, why: `Orca refused the line: ${error.message}` };
+        return { typed: false, why: error.message };
       }
+      if (turn === undefined) return { typed: false, why: TYPING_HELD };
     }
-    if (Date.now() >= until) {
-      const last = found.blocked !== undefined ? `it is waiting on ${found.blocked}` : found.unsure ?? 'no harness is running in it';
-      return { typed: false, why: `the ${LIST_WAIT_MS / 1000} s wait for it ran out: ${last}` };
+    try {
+      const done = lookAndType(home, tabId, line, until);
+      if (done !== undefined) return done;
+    } finally {
+      turn?.release();
     }
     await pause(LIST_ASK_MS);
   }
 }
 
+/** One look of typeListLine's, and its line when the gate lets it: what it returns, or undefined to look again. */
+function lookAndType(home, tabId, line, until) {
+  let found;
+  try {
+    // Each look waits no longer than what is left of the wait.
+    found = tabToTypeInto(home, tabId, Math.max(1, Math.min(LIST_LOOK_MS, until - Date.now())));
+  } catch (error) {
+    return { typed: false, why: `Orca would not say whether it may be typed into: ${error.message}` };
+  }
+  // A yes that comes after the wait is too late: the wait is a cutoff, not a
+  // count of looks (review of PR #421).
+  if (found.handle !== undefined && Date.now() > until) {
+    return { typed: false, why: `the ${LIST_WAIT_MS / 1000} s wait for it ran out before the kit could tell it may be typed into` };
+  }
+  if (found.handle !== undefined) {
+    try {
+      typeIntoTab(found.handle, line);
+      return { typed: true };
+    } catch (error) {
+      return { typed: false, why: `Orca refused the line: ${error.message}` };
+    }
+  }
+  if (Date.now() >= until) {
+    const last = found.blocked !== undefined ? `it is waiting on ${found.blocked}` : found.unsure ?? 'no harness is running in it';
+    return { typed: false, why: `the ${LIST_WAIT_MS / 1000} s wait for it ran out: ${last}` };
+  }
+  return undefined;
+}
+
 /**
  * The line that starts this session: resuming `resume`, or, with none, a fresh
  * start carrying its duty. Returns `{ resume, prompt, promptFile, command, address }`.