@assuredloop/orca-bot-kit 0.27.0 → 0.29.0

package/src/up.js

@@ -4,16 +4,18 @@
 // conversation and Orca's resume record with it. Run it twice and the second
 // run does nothing.
 
+import { randomUUID } from 'node:crypto';
 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, takeLineTurn, takeMailboxTurn, TYPING_HELD, TYPING_WAIT_MS, updateBook, withUnclaimed } from './book.js';
+import { forgetClaimed, forgetSession, MAILBOX_WAIT_MS, readBook, rememberSession, 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';
+import { dropRemovedHooks, installHook } from './hooks.js';
 import { writePermissions } from './permissions.js';
-import { addressOf, harnessOf, isAddressOf, isShortPrompt, kitFolders, launchCommand, mailboxStep, reachesMail, sessionTrouble, startPrompt, workDirOf } from './launch.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 { TAB_ENV } from './record.js';
 import { buildAgents, rulesStamp } from './rules.js';
@@ -110,6 +112,7 @@ export function prepareBots(bots, names, onlySession) {
     return { home, bot: readBot(home, name) };
   });
   for (const { bot, home } of chosen) refuseWhatCannotStart(bot, home, onlySession);
+  refuseWhenPiIsNotReady(chosen, onlySession);
 
   // Every bot's AGENTS.md is built before Orca is asked for anything, because a
   // session reads that file as it starts: a build landing after the tab was
@@ -145,8 +148,10 @@ export function prepareBots(bots, names, onlySession) {
   // so one written later would miss the session it was written for (ADR 0022),
   // and a bot folder the kit cannot write it into stops the run with nothing
   // opened anywhere. Only the harnesses a bot actually runs on; a bot with no
-  // sessions gets none.
+  // sessions gets none. The hooks of commands the kit no longer has go from
+  // every hooks file the bot has, of a harness it has left too (#613).
   for (const { bot, home } of running) {
+    dropRemovedHooks(home);
     for (const harness of new Set(awake(sessionsOf(bot, onlySession)).map((session) => harnessOf(session, bot.harness)))) {
       installHook(home, harness, { bots, bot: bot.name });
     }
@@ -170,7 +175,7 @@ export function prepareBots(bots, names, onlySession) {
 export function botsNamed(bots, onlyBot) {
   const names = botNames(bots);
   if (names.length === 0) {
-    throw new Error(`there are no bots in ${bots} yet: make one with obk bot create --bots <path> --name <name> --harness claude|codex.`);
+    throw new Error(`there are no bots in ${bots} yet: make one with obk bot create --bots <path> --name <name> --harness claude|codex|pi.`);
   }
   if (onlyBot !== undefined && !names.includes(onlyBot)) {
     throw new Error(`there is no bot called ${onlyBot} in ${bots}. The bots there are: ${names.join(', ')}.`);
@@ -185,6 +190,23 @@ function refuseWhatCannotStart(bot, home, onlySession) {
   }
 }
 
+/**
+ * Refuse the run before Orca is asked for anything when it would start a Pi
+ * session and Pi cannot start one: Pi does not run, can use no model, or
+ * cannot use the one a session names (#578). The user signs in to Pi on their
+ * own. A run with no Pi session does not ask Pi anything.
+ */
+function refuseWhenPiIsNotReady(chosen, onlySession) {
+  const onPi = chosen.flatMap(({ bot }) => awake(sessionsOf(bot, onlySession))
+    .filter((session) => harnessOf(session, bot.harness) === 'pi')
+    .map((session) => ({ bot, session })));
+  if (onPi.length === 0) return;
+  const trouble = piTrouble(onPi.map(({ session }) => session.model).filter((model) => typeof model === 'string' && model.trim() !== ''));
+  if (trouble !== undefined) {
+    throw new Error(`${trouble} It would start ${onPi.map(({ bot, session }) => `${bot.name} ${session.name}`).join(', ')}.`);
+  }
+}
+
 /**
  * The sessions that are not paused. A paused session is left out of a run
  * altogether, so what it is set to asks nothing of the ones that will start;
@@ -273,7 +295,10 @@ async function bringUpSession(bots, home, live, session, bot, title) {
   // Asked before the book is held, because it reads a folder of the harness's
   // own files: nothing slow happens under the lock.
   let which = whichConversation(book, home, bot, session, was, harness);
-  const launchOf = (chosen) => launchFor(bots, bot, session, harness, home, workDir, chosen.resume, was?.address);
+  // A Pi session is told which conversation to be, and a new one is named here:
+  // the book is where that name is kept (ADR 0012, tech notes, section 6).
+  const fresh = harness === 'pi' ? randomUUID() : undefined;
+  const launchOf = (chosen) => launchFor(bots, bot, session, harness, home, workDir, chosen.resume, was?.address, fresh);
   let launch = launchOf(which);
 
   // A work dir is a plain folder, made for the session before it is told about
@@ -317,10 +342,16 @@ async function bringUpSession(bots, home, live, session, bot, title) {
       // gets, and trust-hooks asks what this one got (#506).
       let entry = { ...current.sessions[session.name], tab: made.tabId, launched, launched_with: session.extra_args ?? [], rules };
       if (rules === undefined) delete entry.rules;
+      // Only Claude Code answers to an address. One left from a Claude run
+      // before a move to another harness would draw mail to nobody (#565).
+      if (harness !== 'claude') delete entry.address;
       held = entry.session;
       // Before the line is typed, so the hook finds no id here and takes the one
       // it reports for a start rather than a clear, which would tell the duty twice.
-      if (which.noConversation !== undefined && held === which.noConversation) entry = forgetSession(entry, 'no conversation');
+      if (which.noConversation !== undefined && held === which.noConversation) entry = setAside(entry, which);
+      // The id a new Pi conversation is started under, written before the line
+      // that starts it, as a hook writes Claude Code's and Codex's.
+      if (fresh !== undefined && launch.resume === undefined) entry = rememberSession(entry, fresh);
       current.sessions[session.name] = withUnclaimed(entry, which.unclaimed ?? []);
       forgetClaimed(current);
     });
@@ -331,13 +362,15 @@ async function bringUpSession(bots, home, live, session, bot, title) {
   // The old tab's hook can name another conversation while the tab is being
   // opened. A fresh start chosen before that is chosen again from the id the
   // book holds now: resumed if the harness has it, and otherwise set aside the
-  // same way (review of PR #310).
-  if (which.noConversation !== undefined && typeof held === 'string' && held !== which.noConversation) {
-    which = hasConversation(harness, home, held) ? { resume: held } : { noConversation: held };
+  // same way (review of PR #310). A Pi session has no hook, and the id this run
+  // named for it is the one the book now holds.
+  if (fresh === undefined && which.noConversation !== undefined && typeof held === 'string' && held !== which.noConversation) {
+    which = hasConversation(harness, home, held) ? { resume: held } : notHere(harness, home, held);
     if (which.noConversation !== undefined) {
+      const chosen = which;
       await updateBook(home, (current) => {
         const entry = current.sessions[session.name];
-        if (entry?.session === held) current.sessions[session.name] = forgetSession(entry, 'no conversation');
+        if (entry?.session === held) current.sessions[session.name] = setAside(entry, chosen);
       });
     }
     launch = launchOf(which);
@@ -402,7 +435,9 @@ async function bringUpSession(bots, home, live, session, bot, title) {
     promptReceived,
     promptFile: launch.promptFile,
     resumed: launch.resume !== undefined,
-    noConversation: which.noConversation,
+    noConversation: which.ranOn === undefined ? which.noConversation : undefined,
+    harnessChanged: which.ranOn === undefined ? undefined : which.noConversation,
+    ranOn: which.ranOn,
     unclaimed: which.unclaimed,
     listLine: list?.typed,
     listLineTrouble: list?.why,
@@ -532,7 +567,7 @@ function lookAndType(home, tabId, line, until) {
  * The line that starts this session: resuming `resume`, or, with none, a fresh
  * start carrying its duty. Returns `{ resume, prompt, promptFile, command, address }`.
  */
-function launchFor(bots, bot, session, harness, home, workDir, resume, held) {
+function launchFor(bots, bot, session, harness, home, workDir, resume, held, fresh) {
   const prompt = resume === undefined ? startPrompt(session, { home, workDir }) : undefined;
   // Anything longer than a line goes to the harness out of a file, rather than
   // through the tab's shell a character at a time.
@@ -554,6 +589,9 @@ function launchFor(bots, bot, session, harness, home, workDir, resume, held) {
     resume,
     address,
     kit: kitFolders(bots, bot.name),
+    // A new Pi conversation's id, and the name its tab and session list show,
+    // `<bot>.<session>` as a Codex thread is named (#480).
+    ...(harness === 'pi' ? { sessionId: resume === undefined ? fresh : undefined, name: `${bot.name}.${session.name}` } : {}),
   });
   // The session's mailbox first, from inside its own tab (#317), and the
   // harness whatever became of it.
@@ -831,7 +869,7 @@ function whichConversation(book, home, bot, session, was, harness) {
     // it: a session paused before its first turn is one. There is nothing to
     // resume, so it starts again with its duty, and the book keeps the id in the
     // history with the reason (#295).
-    return { noConversation: was.session };
+    return notHere(harness, home, was.session);
   }
   // No tab: nothing has ever run for this session, so there is nothing to find.
   if (typeof was?.tab !== 'string') return {};
@@ -851,6 +889,22 @@ function whichConversation(book, home, bot, session, was, harness) {
   return { unclaimed: known.map((one) => one.id) };
 }
 
+/**
+ * An id the book holds that this harness has no conversation behind, so the
+ * session starts fresh: `{ noConversation: id }`, and `ranOn`, the harness that
+ * does have it, when the session has moved to another harness since it ran
+ * (#565). That conversation is not lost, only not this harness's to resume.
+ */
+function notHere(harness, home, id) {
+  const ranOn = HARNESSES.find((other) => other !== harness && hasConversation(other, home, id));
+  return ranOn === undefined ? { noConversation: id } : { noConversation: id, ranOn };
+}
+
+/** The entry with the id `which` set aside moved into its history, with why. */
+const setAside = (entry, which) => (which.ranOn === undefined
+  ? forgetSession(entry, 'no conversation')
+  : forgetSession(entry, 'harness changed', { harness: which.ranOn }));
+
 /**
  * A bot's Orca project, made if it is not there yet, with `change` saying
  * whether this run `made` it, `renamed` it or left it as it was (undefined).
@@ -886,7 +940,7 @@ export const promptPath = (bots, bot, session) =>
 export const oldPromptPath = (bots, bot, session) =>
   path.join(`${bots}.prompts`, `${encodeURIComponent(bot)}.${encodeURIComponent(session)}.txt`);
 
-function entry(tab, { bot, name, created, running = false, blockedReason, promptReceived, promptFile, resumed, noConversation, unclaimed, noMailbox = false, listLine, listLineTrouble, notLaunched }) {
+function entry(tab, { bot, name, created, running = false, blockedReason, promptReceived, promptFile, resumed, noConversation, harnessChanged, ranOn, unclaimed, noMailbox = false, listLine, listLineTrouble, notLaunched }) {
   const made = { bot, name, title: tab.title, tabId: tab.tabId, terminal: tab.handle, created, harnessStarted: running };
   // A tab whose shell was not ready for the launch line, and why: nothing was
   // typed into it (#498).
@@ -900,6 +954,9 @@ function entry(tab, { bot, name, created, running = false, blockedReason, prompt
   if (listLineTrouble !== undefined) made.listLineTrouble = listLineTrouble;
   // The id the book held that had no conversation behind it, now in the history.
   if (noConversation !== undefined) made.noConversation = noConversation;
+  // The id the book held that ran on another harness, the one this session
+  // has since moved from, now in the history (#565).
+  if (harnessChanged !== undefined) Object.assign(made, { harnessChanged, ranOn });
   // Orca's own words for what is on screen waiting to be answered, when it
   // gave any: the caller acts on it, the kit only passes it on.
   if (blockedReason !== undefined) made.blockedReason = blockedReason;