@assuredloop/orca-bot-kit 0.25.3 → 0.25.4

package/SETUP.md

@@ -201,7 +201,7 @@ waiting for:
 | Claude Code's folder trust list | `\x1b[B\r` | down, then return: its selection starts on **No, exit** | Claude Code 2.1.283 |
 | Codex's directory trust, `1. Trust and continue` (older: `1. Yes, continue`) | `\r` | return: its selection starts on **Trust and continue** | Codex 0.160.0 |
 | Codex's `Hooks need review` | `\x1b[B\r` | down, then return, to **Trust all and continue**; if the selection already starts there, return alone | Codex 0.160.0 |
-| Codex's `/new`: `Where should the new conversation run?` | `\r` | return: its selection starts on **Current checkout** (bot home) | Codex 0.160.0 |
+| Codex's `/new`: `Where should the new conversation run?` | `\r` | return: its selection starts on **Current checkout** (bot home); on 0.162.0 it is called **1. Use current Git worktree** (Keep using the current working directory). Never **Create new Git worktree** | Codex 0.160.0; Codex 0.162.0 (#516) |
 | Codex's update offer, `1. Update now` | `\r` | return: its selection starts on **Update now**, which accepts it | Codex 0.156.1; seen on 0.157.1 (offering 0.158.0) with the selection on **Update now**, not pressed; 0.158.0 offered 0.160.0, taken on 2026-10-02 by Bot Father's restarts |
 | `[oh-my-zsh] Would you like to update?` | `n` | they update their own shell | oh-my-zsh bf77e35 |
 | Claude Code's `Teach auto mode about your environment?` | `\x1b` | Esc, which cancels it (**Not now**). On 2.1.283 it is a form, not a list: `How you use Claude here`, `Also scan shell history`, `Also scan your other repos`, `Continue`, and `Enter to continue · Esc to cancel`. **Never send a return**: Enter is **Continue**, which starts a scan of the project, recent Claude sessions and, by default, the machine's shell history | Not yet proven: Esc cancels in Claude Code 2.1.283's code, not yet seen live (#370); the form was seen live twice on 2.1.283, in #261's live test and #239's live run 1 (#416); 2.1.278 showed a numbered list, answered with 2. Not now |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assuredloop/orca-bot-kit",
-  "version": "0.25.3",
+  "version": "0.25.4",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/clear.js

@@ -38,9 +38,13 @@ const POINTER = { claude: '❯', codex: '›' };
  */
 const RECORD_LINE = 'obk: this conversation was started by obk session clear, and this line is only so the kit can record it. Reply "ok"; nothing else is asked.';
 
-/** What Codex asks after `/new`, and the one answer the kit gives it: the bot home it runs in. */
+/**
+ * What Codex asks after `/new`, and the one answer the kit gives it: the bot
+ * home it runs in. Codex 0.162.0 calls it by another name, and its whole row
+ * has to be as captured, but for the padding before its description (#516).
+ */
 const WHERE_TO_RUN = 'Where should the new conversation run?';
-const CURRENT_CHECKOUT = /^ *› +1\. Current checkout\b/;
+const CURRENT_CHECKOUT = /^ *› +1\. Current checkout\b|^ *› 1\. Use current Git worktree\s+Keep using the current working directory *$/;
 
 /** Codex's empty input line: its pointer alone, or with its placeholder. */
 const CODEX_EMPTY = ['›', '› Ask Codex to do anything'];
@@ -51,7 +55,8 @@ const CODEX_EMPTY = ['›', '› Ask Codex to do anything'];
  * selected row stands for what Return will run: with the menu open, Return
  * runs the selected command, and the menu is narrowed to what was typed
  * (codex-rs/tui/src/bottom_pane/chat_composer.rs, rust-v0.160.0). The
- * architect's ruling on #391, after live run 4.
+ * architect's ruling on #391, after live run 4. Only where Orca gives no
+ * draft: a draft is the line's text, and has to be the command (#516).
  */
 const CODEX_BARE_LINE = '0.160.0';
 
@@ -221,14 +226,13 @@ async function enter(it, verb, before = () => {}) {
  * when it was typed.
  */
 export async function typeCommand(it, command, { before = () => {}, check = menuWrong, cannot = () => '', deadline = Infinity } = {}) {
-  // On Codex, what is typed cannot be read back once its menu is open, so
-  // nothing may be in its input line before: no draft for the command to join.
-  // On Claude Code, Orca gives a draft in the line beside the screen (#510).
+  // Nothing may be in the input line before: no draft for the command to join.
+  // Orca gives a draft in the line beside the screen, and the screen's line
+  // then reads the pointer alone (#510, #516). Where it gives none, Codex's
+  // line on the screen has to be empty.
   const emptyLine = ({ rows, draft }) => {
-    if (it.harness !== 'codex') {
-      if (draft !== undefined) throw new Error(`${it.name}: nothing was typed, because its input line holds a draft: it reads "${draft}".${shownEnd(rows)}`);
-      return;
-    }
+    if (draft !== undefined) throw new Error(`${it.name}: nothing was typed, because its input line holds a draft: it reads "${draft}".${shownEnd(rows)}`);
+    if (it.harness !== 'codex') return;
     const line = rows.findLast((row) => /^ *›/.test(row))?.trim();
     if (!CODEX_EMPTY.includes(line)) {
       throw new Error(`${it.name}: nothing was typed, because its input line is not empty: it reads "${line ?? 'nothing'}".${shownEnd(rows)}`);
@@ -415,10 +419,11 @@ function menuWrong(rows, harness, command, version, draft) {
   if (at < 0) return { why: 'its screen shows no input line' };
   // Claude Code 2.1.288 puts a non-breaking space after its pointer (live run 4).
   const line = rows[at].replaceAll('\u00a0', ' ').trim();
-  if (harness === 'codex') return codexMenuWrong(rows, at, line, command, version);
-  // Orca 1.4.223 gives the line's text as the draft, and Claude Code 2.1.296's
-  // line on the screen then reads its pointer alone (#510, probe 4).
+  // Orca 1.4.223 gives the line's text as the draft, and the line on the
+  // screen then reads the pointer alone: Claude Code 2.1.296's (#510, probe 4)
+  // and Codex 0.162.0's (#516).
   const text = draft === undefined ? line : `${POINTER[harness]} ${draft}`;
+  if (harness === 'codex') return codexMenuWrong(rows, at, text, command, version);
   if (text !== `${POINTER[harness]} ${command}`) return { why: `its input line reads "${text}"` };
   return claudeMenuWrong(rows, at, command);
 }
@@ -445,11 +450,12 @@ function claudeMenuWrong(rows, at, command) {
 
 /**
  * Codex draws its slash menu above the input line: a row per command, the
- * selected one starting with its pointer, then a blank row, then the input
- * line (its own snapshot tests, chat_composer slash_popup_*.snap,
- * rust-v0.160.0; live run 4). The menu has to hold one command row, the
- * selected one, naming the command. The input line reads the command, or, on
- * the Codex whose line Orca shows bare, its pointer alone.
+ * selected one starting with its pointer, then a blank row on 0.160.0 and none
+ * on 0.162.0, then the input line (its own snapshot tests, chat_composer
+ * slash_popup_*.snap, rust-v0.160.0; live run 4; #516's probe). The menu has
+ * to hold one command row, the selected one, naming the command. The input
+ * line, Orca's draft where it gives one, reads the command, or, with no draft
+ * on the Codex whose line Orca shows bare, its pointer alone.
  */
 function codexMenuWrong(rows, at, line, command, version) {
   const bare = line === '›' && version === CODEX_BARE_LINE;
@@ -494,7 +500,7 @@ async function answerWhereToRun(it, handle, command) {
       const pointer = rows.findLast((row) => /^ *›/.test(row));
       if (pointer === undefined || !CURRENT_CHECKOUT.test(pointer)) {
         send(handle, '\x1b');
-        throw new Error(`${it.name}: after ${command}, Codex asked "${WHERE_TO_RUN}" with its selection on "${pointer?.trim() ?? 'nothing'}" rather than "1. Current checkout", so it was backed out of with Esc and nothing else was typed. Look at its tab.`);
+        throw new Error(`${it.name}: after ${command}, Codex asked "${WHERE_TO_RUN}" with its selection on "${pointer?.trim() ?? 'nothing'}" rather than "1. Current checkout" (on Codex 0.162.0, "1. Use current Git worktree"), so it was backed out of with Esc and nothing else was typed. Look at its tab.`);
       }
       send(handle, '\r');
       return;

package/src/cli.js

@@ -1203,6 +1203,7 @@ const commands = {
     const said = {
       made: `${who} has its mailbox ${answer.mailbox}, made in this tab.`,
       bound: `${who}'s mailbox ${answer.mailbox} is bound to this tab.`,
+      replaced: `${who}'s mailbox ${answer.replaced} is not one this Orca has, as when the book was written on another machine, so it has a new one, ${answer.mailbox}, made in this tab and written into the book.`,
       none: `${who} gets no mailbox: it is a Codex session with its sandbox switch off, which could not read one.`,
     };
     return { answer, lines: [said[answer.change]] };

package/src/health.js

@@ -26,7 +26,7 @@ import { botDir, botNames, botsDir, readBot, tempRoles, unknownKeys } from './bo
 import { transcriptsIn } from './conversations.js';
 import { hookTrouble } from './hooks.js';
 import { bypassFlags, harnessOf, HARNESSES, isAddressOf, ownCli, sessionTrouble, SHELL_ENV, shellWord } from './launch.js';
-import { frontOfTab, orcaDefaultArgs, projects, tabs, wordsOfProcess } from './orca.js';
+import { frontOfTab, orcaDefaultArgs, projects, runMissing, tabs, wordsOfProcess } from './orca.js';
 import { permissionsTrouble } from './permissions.js';
 import { TAB_ENV } from './record.js';
 import { agentsTrouble, rulesStamp } from './rules.js';
@@ -387,6 +387,21 @@ function inOrca(bots, home, bot, setups, sessions) {
       found.push(finding('session', entry.tab, `${bot.name}'s session ${name} is in the book with tab ${entry.tab}, and Orca has no tab of that id: the tab was closed, or the machine was restarted. The conversation is in the book, and obk up opens a tab and brings it back.`, bot.name));
     }
 
+    // A Run Orca does not have, as when the book was written on another
+    // machine: mail sent to it is refused. The session's next start makes it
+    // a new one (#508).
+    if (typeof entry?.mailbox === 'string' && runMissing(entry.mailbox)) {
+      // The bot's unpause leaves a session paused on its own as it is, so a
+      // session under both marks needs both commands.
+      const unpause = `${shellWord(ownCli())} unpause --bots ${shellWord(bots)} --bot ${bot.name}`;
+      const steps = [
+        ...(bot.paused === true ? [unpause] : []),
+        ...(bot.sessions.some((session) => session.name === name && session.paused === true) ? [`${unpause} --session ${name}`] : []),
+      ];
+      const fix = steps.length > 0 ? steps.join(', then ') : `${shellWord(ownCli())} restart --bots ${shellWord(bots)} --bot ${bot.name} --session ${name}`;
+      found.push(finding('session', bookFile(home), `${bot.name}'s session ${name} has the mailbox ${entry.mailbox} in the book, and Orca has no Run of that id: it was made by another Orca, as on another machine, so mail sent to it is refused. The session's next start makes it a new one: ${fix}`, bot.name));
+    }
+
     const unclaimed = (Array.isArray(entry?.unclaimed) ? entry.unclaimed : []).filter((id) => !helpers.has(id));
     if (unclaimed.length > 0) {
       found.push(finding('leftover', bookFile(home), `The book notes conversations under ${bot.name}'s session ${name} that no session of this bot claims: ${unclaimed.join(', ')}. They ran in this bot's folder, and the kit will not say whose they were. To give one back, write it into ${bookFile(home)} under ${name} as  session: <id>  and run obk up again.`, bot.name));

package/src/name.js

@@ -125,12 +125,13 @@ function nameOf(thread) {
  * pointer and the command exactly, and no row of its slash menu stands above
  * it. With words after the command Codex has closed its menu (chat_composer.rs
  * `sync_command_popup`, rust-v0.160.0), so a menu still open means the line is
- * not what it seems.
+ * not what it seems. Where Orca gives a draft, the draft is the line's text:
+ * Codex 0.162.0's line on the screen then reads its pointer alone (#516).
  */
-function renameWrong(rows, _harness, command) {
+function renameWrong(rows, _harness, command, _version, draft) {
   const at = rows.findLastIndex((row) => /^ *›/.test(row));
   if (at < 0) return { why: 'its screen shows no input line' };
-  const line = rows[at].replaceAll(' ', ' ').trim();
+  const line = draft === undefined ? rows[at].replaceAll(' ', ' ').trim() : `› ${draft}`;
   if (line !== `› ${command}`) return { why: `its input line reads "${line}"` };
   const above = rows.slice(0, at).findLast((row) => row.trim() !== '');
   if (above !== undefined && /^ *(?:› +)?\/\S/.test(above)) return { why: `a menu of commands stands above its input line: "${above.trim()}"` };

package/src/orca.js

@@ -1017,6 +1017,22 @@ export const useMailbox = (id, handle, options) =>
 export const coordinatorOf = (id, options) =>
   orca(['orchestration', 'run-show', '--id', id], options).run.coordinator_handle ?? undefined;
 
+/**
+ * Whether this Orca has no Run of that id at all, as when the book was written
+ * on another machine (#508). Only `run-show` refused `run_not_found` says so:
+ * `run-use` gives a legacy Run the same code and words, and a Run shown, a
+ * time-out or any other refusal is not a Run known to be missing (tech notes,
+ * section 1).
+ */
+export function runMissing(id, options) {
+  try {
+    orca(['orchestration', 'run-show', '--id', id], options);
+    return false;
+  } catch (error) {
+    return error.code === 'run_not_found';
+  }
+}
+
 /** Queue one message. `to` and `from` are mailboxes, written `run:<id>`. */
 export function postMessage({ to, from, subject, body, type = 'status', thread }) {
   const args = ['orchestration', 'send', '--to', to, '--subject', subject, '--body', body, '--type', type];

package/src/up.js

@@ -14,7 +14,7 @@ import { conversationsIn, hasConversation, heldAsUserTurn, transcriptsIn } from
 import { installHook } from './hooks.js';
 import { writePermissions } from './permissions.js';
 import { addressOf, harnessOf, isAddressOf, isShortPrompt, launchCommand, mailboxStep, reachesMail, sessionTrouble, startPrompt, workDirOf } from './launch.js';
-import { asFolderProject, coordinatorOf, findProject, harnessInTab, makeMailbox, makeProject, openTab, QUESTION_ON_SCREEN, retitleTab, screenRows, shellInTab, tabs, tabToTypeInto, TERMINAL_ENV, TIMED_OUT, tellWindow, typeIntoTab, useMailbox } from './orca.js';
+import { asFolderProject, coordinatorOf, findProject, harnessInTab, makeMailbox, makeProject, openTab, QUESTION_ON_SCREEN, retitleTab, runMissing, screenRows, shellInTab, tabs, tabToTypeInto, TERMINAL_ENV, TIMED_OUT, tellWindow, typeIntoTab, useMailbox } from './orca.js';
 import { TAB_ENV } from './record.js';
 import { buildAgents, rulesStamp } from './rules.js';
 import { linkSkills } from './skills.js';
@@ -648,7 +648,8 @@ async function writeAddress(home, session, address) {
  * a restart (tech notes, section 1). Orca offers no way to delete one, so this
  * makes one for a session whose book names none, and otherwise binds the one
  * the book names to this tab: after a restart, or a closed tab brought back,
- * it would stay with the tab that is gone (review of PR #248, finding 1).
+ * it would stay with the tab that is gone (review of PR #248, finding 1). A
+ * Run the book names and this Orca does not have at all is replaced (#508).
  *
  * Only inside an Orca tab. Asked from anywhere else, Orca picks a terminal
  * itself, and seen live that was not the asker's (tech notes, section 1), so
@@ -705,20 +706,34 @@ async function mailboxInTurn(home, botName, sessionName, who) {
       if (error.code === TIMED_OUT) {
         throw new Error(`${error.message}\n${who}'s mailbox ${held} may now be bound to this tab, or may still be bound where it was: Orca did not say which.`);
       }
-      throw new Error(`${error.message}\n${who}'s mailbox ${held} is unchanged: it is still bound to ${boundTo(held)}.`);
+      // A Run this Orca has never had, as when the book was written on another
+      // machine, can never be bound, so every start would fail the same way.
+      // It is replaced as a session with none would be given one (#508).
+      if (!runMissing(held, STEP_WAIT)) {
+        throw new Error(`${error.message}\n${who}'s mailbox ${held} is unchanged: it is still bound to ${boundTo(held)}.`);
+      }
+      return newMailbox(home, botName, sessionName, who, here, held);
     }
     return { bot: botName, session: sessionName, mailbox: held, change: 'bound' };
   }
+  return newMailbox(home, botName, sessionName, who, here);
+}
 
+/**
+ * Make a mailbox in this tab and write it into the book, for a session whose
+ * book names none, or names `stale`, a Run this Orca does not have.
+ */
+async function newMailbox(home, botName, sessionName, who, here, stale) {
   // Made outside the book's lock, which is held for one read and one write
   // (book.js).
   let made;
   try {
     made = makeMailbox(who, STEP_WAIT);
   } catch (error) {
+    const written = stale === undefined ? 'none is written down' : `the book still names ${stale}, which this Orca does not have`;
     const left = error.code === TIMED_OUT
-      ? `None is written down for ${who}; a Run Orca made after the kit stopped waiting is left unused.`
-      : `No mailbox was made for ${who}, and none is written down.`;
+      ? `For ${who}, ${written}; a Run Orca made after the kit stopped waiting is left unused.`
+      : `No mailbox was made for ${who}, and ${written}.`;
     throw new Error(`${error.message}\n${left} It gets one the next time the kit starts it.`);
   }
 
@@ -734,10 +749,11 @@ async function mailboxInTurn(home, botName, sessionName, who) {
         movedTo = now.tab ?? 'none';
         return undefined;
       }
-      // Under the lock, and only if the book still has none: two runs at once
-      // would each have made one, and a session with two mailboxes is a session
-      // half its mail never reaches. The loser's Run is left unused.
-      if (typeof now.mailbox !== 'string') now.mailbox = made;
+      // Under the lock, and only if the book still has none, or still the
+      // stale one: two runs at once would each have made one, and a session
+      // with two mailboxes is a session half its mail never reaches. The
+      // loser's Run is left unused.
+      if (typeof now.mailbox !== 'string' || now.mailbox === stale) now.mailbox = made;
       kept = now.mailbox;
       current.sessions[sessionName] = now;
       return undefined;
@@ -750,8 +766,13 @@ async function mailboxInTurn(home, botName, sessionName, who) {
   }
   // One terminal holds one Run, so making the loser took this tab off the one
   // the book kept. It goes back.
-  if (kept !== made) useMailbox(kept, undefined, STEP_WAIT);
-  return { bot: botName, session: sessionName, mailbox: kept, change: kept === made ? 'made' : 'bound' };
+  if (kept !== made) {
+    useMailbox(kept, undefined, STEP_WAIT);
+    return { bot: botName, session: sessionName, mailbox: kept, change: 'bound' };
+  }
+  return stale === undefined
+    ? { bot: botName, session: sessionName, mailbox: made, change: 'made' }
+    : { bot: botName, session: sessionName, mailbox: made, change: 'replaced', replaced: stale };
 }
 
 /**