@assuredloop/orca-bot-kit 0.33.0 → 0.34.0

package/SETUP.md

@@ -126,7 +126,9 @@ default and the kit will not guess. It is Bot Father's own harness only; each
 bot they make later chooses its own. If only one harness is installed, say so
 and confirm it rather than asking as though the choice were open. If they choose
 `pi`, they sign in to Pi themselves first: the kit never handles Pi's
-credentials, and `obk init` starts nothing while Pi can use no model.
+credentials, and `obk init` starts nothing while Pi can use no model. When you
+ask or confirm, tell them: "On Pi, Bot Father acts without asking first, because
+Pi has no approval step."
 
 ## 4. Make the fleet
 

package/package.json

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

package/src/cli.js

@@ -12,7 +12,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { parseArgs } from 'node:util';
 
-import { addSession, allowedNow, allowRules, botDir, changeBot, changeSession, createBot, disallowRules, leadsOutside, readBot, refuseCodexOutside, SESSION_FIELDS, setRoleCaps, setTempApproval } from './bot.js';
+import { addSession, allowedNow, allowRules, botDir, changeBot, changeSession, createBot, disallowRules, displayName, leadsOutside, readBot, refuseCodexOutside, SESSION_FIELDS, setRoleCaps, setTempApproval } from './bot.js';
 import { COMMANDS } from './commands.js';
 import { addCommand, groomCommand, grooming, upCommand } from './groom.js';
 import { checkHealth, orcaSettingFindings } from './health.js';
@@ -1932,12 +1932,17 @@ function tabLines({ bots, created, completed, rules, skills, permissions = [], t
     const back = one.session === undefined ? '' : ` --session ${one.session}`;
     lines.push(`${'paused'.padEnd(9)}  ${what}  left closed. Bring it back:  ${shellWord(ownCli())} unpause --bots ${shellWord(bots)} --bot ${one.bot}${back}`);
   }
+  // A window that has not loaded a bot's project gives its tabs no notice of
+  // mail (#676).
+  for (const one of projects.filter((project) => project.windowTrouble !== undefined)) {
+    lines.push(`${'window'.padEnd(9)}  ${displayName(one.bot)}  its tabs may get no fleet mail until Orca's window loads its project: ${one.windowTrouble}. Try again:  ${shellWord(ownCli())} up --bots ${shellWord(bots)} --bot ${one.bot}`);
+  }
 
   // Last before the summary, because what a check found is about the setup the
   // run has just left behind rather than about any one thing it did.
   lines.push(...foundLines(found));
   // Hedged, because nothing here can see whether the window was told (#224).
-  if (projects.length > 0) lines.push(RELOAD_LINE);
+  if (projects.some((project) => project.change !== undefined)) lines.push(RELOAD_LINE);
   lines.push(summary);
   return lines;
 }

package/src/message.js

@@ -18,11 +18,12 @@
 
 import { mkdirSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
+import { setTimeout as pause } from 'node:timers/promises';
 
 import { MAILBOX_WAIT_MS, readBook, takeLineTurn, takeMailboxTurn, TYPING_HELD, TYPING_WAIT_MS } from './book.js';
 import { botDir, botNames, readBot } from './bot.js';
 import { harnessOf, isAddressOf, kitFolders, ownCli, reachesMail, SHELL_ENV, shellWord } from './launch.js';
-import { ackMailbox, coordinatorOf, postMessage, pressEscape, readMailbox, tabs, tabToTypeInto, TERMINAL_ENV, TIMED_OUT, useMailbox } from './orca.js';
+import { ackMailbox, coordinatorOf, listedOrphaned, loadInWindow, postMessage, pressEscape, readMailbox, tabs, tabToTypeInto, TERMINAL_ENV, TIMED_OUT, useMailbox } from './orca.js';
 
 /**
  * How much of a message travels as itself. Above this it is written to a file
@@ -161,7 +162,7 @@ export async function sendMessage(bots, { to: target, from: sender, tab, subject
 
   const written = bodyOf(bots, { from, to, subject, text, textFile });
   // Looked at before the post, which is the send's last call to Orca (PRD 6.9).
-  const shown = loaded(to);
+  const shown = await loaded(to);
   // The Escape goes first, so the turn has ended when the letter is in.
   const interrupted = interrupt ? interruptBusy(to) : {};
   const message = postMessage({
@@ -189,20 +190,50 @@ export async function sendMessage(bots, { to: target, from: sender, tab, subject
  * and lists one it has not as orphaned, as after a window restart (#579; tech
  * notes, section 1). So an orphaned tab is said, with its handle, and a
  * listing that cannot be read is said too, rather than taken for a loaded tab.
- * The look is made once: a tab orphaned after the send is not seen here.
+ * An orphaned tab of a project the window has never fetched is loaded by
+ * `loadInWindow`, which changes nothing on screen, so the kit asks for that
+ * and looks again until LOOK_MS after the ask (#676). A tab it does not load,
+ * as after a window restart (#579), is said as before. This is all before the
+ * send: a tab orphaned after it is not seen here.
  */
-function loaded(to) {
+async function loaded(to) {
   if (to.tab === undefined) return {};
-  let listed;
+  let tab;
   try {
-    listed = tabs(to.home, { timeoutMs: LOOK_MS });
+    tab = tabs(to.home, { timeoutMs: LOOK_MS }).find((one) => one.tabId === to.tab);
   } catch (error) {
     return { loadTrouble: error.message };
   }
-  const tab = listed.find((one) => one.tabId === to.tab);
-  return tab?.orphaned === true ? { orphaned: true, handle: tab.handle } : {};
+  if (tab?.orphaned !== true) return {};
+  return (await loadedNow(to.home, tab.handle)) ? {} : { orphaned: true, handle: tab.handle };
 }
 
+/**
+ * Whether the window loads the orphaned tab `handle` at `home` once asked to.
+ * The ask and every look after it keep to one deadline, LOOK_MS from the ask,
+ * and each Orca call gets only the time that is left, so a slow Orca cannot
+ * hold the send up for longer (#676). A look that fails or runs out counts as
+ * a tab still orphaned.
+ */
+async function loadedNow(home, handle) {
+  const until = Date.now() + LOOK_MS;
+  const left = () => until - Date.now();
+  loadInWindow(home, { timeoutMs: LOOK_MS });
+  try {
+    for (let ms = left(); ms > 0; ms = left()) {
+      if (!listedOrphaned(home, handle, { timeoutMs: ms })) return true;
+      const wait = Math.min(RELOOK_MS, left());
+      if (wait > 0) await pause(wait);
+    }
+  } catch {
+    // A look that fails or runs out leaves the tab said as orphaned.
+  }
+  return false;
+}
+
+/** How long the kit waits between two looks at a tab it asked the window to load: it was loaded within 0.4 s, live (#676). */
+const RELOOK_MS = 200;
+
 /**
  * What is waiting for a session, and the reading of it.
  *

package/src/orca.js

@@ -347,6 +347,29 @@ const CLIENT_KILL_MS = 3000;
  */
 export const tellWindow = (projectId) => askRuntime('project.update', { projectId, updates: {} }) !== undefined;
 
+/**
+ * Have Orca's window load the tabs of the Orca project at `home`: undefined
+ * when Orca took the call, or what went wrong.
+ *
+ * The window loads a project's tabs only once it has fetched the project's
+ * worktrees, and nothing fetches them for a project the kit made, so its tabs
+ * stay orphaned and get no notice of mail (#676, tech notes). `worktree set`
+ * with no field writes an empty change and has Orca send the window the event
+ * that fetches them: nothing the user sees changes. What went wrong is said
+ * without Orca's own words, which name worktrees (PRD KIT-22: the kit says
+ * "Orca project"). `options` are `orca`'s.
+ */
+export function loadInWindow(home, options) {
+  try {
+    orca(['worktree', 'set', '--worktree', `path:${home}`], options);
+    return undefined;
+  } catch (error) {
+    return typeof error.code === 'string' && !/worktree/i.test(error.code)
+      ? `Orca refused the call (${error.code})`
+      : 'Orca gave no answer the kit could read';
+  }
+}
+
 /**
  * One call to Orca's runtime for a method its CLI does not offer, and the
  * runtime's answer, or undefined when there is none to be had.
@@ -433,6 +456,14 @@ export const tabs = (home, options) => orca(['terminal', 'list', '--worktree', `
     ? { ...tab, tabId: orca(['terminal', 'show', '--terminal', tab.handle], options).terminal.tabId }
     : tab));
 
+/**
+ * Whether Orca lists the terminal `handle` at `home` as orphaned, from one
+ * listing and no `terminal show`, so a caller with a deadline can give the one
+ * call all the time it has left (#676).
+ */
+export const listedOrphaned = (home, handle, options) => orca(['terminal', 'list', '--worktree', `path:${home}`], options).terminals
+  .some((tab) => tab.handle === handle && tab.orphaned === true);
+
 /**
  * Open a tab in the Orca project at `home`, titled `title`.
  *

package/src/up.js

@@ -16,7 +16,7 @@ import { dropRemovedHooks, installHook } from './hooks.js';
 import { writePermissions } from './permissions.js';
 import { piTrouble } from './pi.js';
 import { addressOf, HARNESSES, harnessOf, isAddressOf, isShortPrompt, kitFolders, launchCommand, mailboxStep, reachesMail, sessionTrouble, startPrompt, workDirOf } from './launch.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 { asFolderProject, coordinatorOf, findProject, harnessInTab, loadInWindow, 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';
@@ -40,7 +40,9 @@ const SECOND_LOOK_MS = 2000;
  * Bring bots up in Orca. Returns `{ tabs, rules }`: one tab entry per tab it
  * looked at — the sessions the book knows, and, for Bot Father, whatever else
  * is open in its project — and one rules entry and one skills entry per bot.
- * `projects` has one entry per Orca project this run made or renamed.
+ * `projects` has one entry per Orca project this run made or renamed, and per
+ * project Orca's window may not have loaded, with what went wrong as
+ * `windowTrouble` (#676).
  *
  * With no name it is every bot in the folder, in name order. `bot` brings up
  * one bot and `session` one of its sessions, for a caller that wants one thing
@@ -238,6 +240,10 @@ async function bringUpBot(bots, home, bot, onlySession) {
   // Orca's window does not see a project made or renamed on the command line
   // until it is told (#224).
   if (change !== undefined) tellWindow(orca.project);
+  // Its tabs get no notice of mail until the window loads them, and the window
+  // does not load a project it has never fetched (#676). Every run asks, so a
+  // project made before this is loaded too; the call changes nothing on screen.
+  const windowTrouble = loadInWindow(home);
 
   const live = new Map(tabs(home).map((tab) => [tab.tabId, tab]));
   const report = [];
@@ -256,7 +262,13 @@ async function bringUpBot(bots, home, bot, onlySession) {
       : spare.map((tab) => entry(tab, { bot: name, name: null, created: false }))));
   }
 
-  return { tabs: report, project: change === undefined ? undefined : { bot: name, project: orca.project, change } };
+  const project = {
+    bot: name,
+    project: orca.project,
+    ...(change === undefined ? {} : { change }),
+    ...(windowTrouble === undefined ? {} : { windowTrouble }),
+  };
+  return { tabs: report, project: change === undefined && windowTrouble === undefined ? undefined : project };
 }
 
 async function bringUpSession(bots, home, live, session, bot, title) {