@assuredloop/orca-bot-kit 0.30.0 → 0.32.0

package/src/temp.js

@@ -34,9 +34,10 @@ import { setTimeout as pause } from 'node:timers/promises';
 import { readBook, takeLineTurn, TYPING_HELD, TYPING_WAIT_MS, updateBook } from './book.js';
 import { addSession, dropSession, NAME, readBot, tempRoles } from './bot.js';
 import { untrustedKitHooks } from './hook-trust.js';
-import { approvalRank, DEFAULT_APPROVAL, harnessOf, isShortPrompt, ownCli, refuseApprovalArgs, shellWord, startPrompt, workDirOf } from './launch.js';
+import { approvalRank, DEFAULT_APPROVAL, harnessOf, isShortPrompt, ownCli, piApprovalTrouble, refuseApprovalArgs, set, shellWord, startPrompt, workDirOf } from './launch.js';
 import { findSession, sessionInTab } from './message.js';
 import { orca, screenRows, tabs } from './orca.js';
+import { piTrouble } from './pi.js';
 import { retireSession } from './retire.js';
 import { BOT_FATHER, bringUp, promptPath } from './up.js';
 
@@ -75,11 +76,23 @@ export async function makeTemp(bots, { tab, ...given }) {
 
   const maker = bot.sessions.find((session) => session.name === caller.session);
   const { settings, chosen } = settingsFor(bot, maker, role?.option ?? {}, given);
-  if (chosen.harness.value === 'pi') {
-    throw new Error(`${name} would run on Pi, and a temporary session on Pi comes in a later slice of #547. Make it on claude or codex. Nothing was made.`);
-  }
-  refuseWiderApproval(bots, caller, bot, maker, given.approval);
+  const onPi = chosen.harness.value === 'pi';
+  // A blank --approval names no level, so on Pi it is judged as left out (the review of PR #651).
+  const asked = onPi && !set(given.approval) ? undefined : given.approval;
+  if (onPi) {
+    // Pi has one level, whatever the maker's is (the owner, #547).
+    const trouble = piApprovalTrouble(asked, name);
+    if (trouble !== undefined) throw new Error(`${trouble} Nothing was made.`);
+    settings.approval = 'dangerously-skip';
+    if (asked === undefined) chosen.approval = { value: 'dangerously-skip', from: 'harness' };
+  }
+  refuseWiderApproval(bots, caller, bot, maker, asked ?? (onPi ? settings.approval : undefined), onPi && asked === undefined ? name : undefined);
   refuseApprovalArgs(chosen.harness.value, given.extra_args);
+  // Asked before anything is written, so a Pi that cannot start one makes nothing (#578).
+  if (onPi) {
+    const trouble = piTrouble(set(settings.model) ? [settings.model] : []);
+    if (trouble !== undefined) throw new Error(`${trouble} Nothing was made.`);
+  }
   settings.name = name;
   if (given.extra_args !== undefined) settings.extra_args = given.extra_args;
   if (given.prompt !== undefined) settings.prompt = given.prompt;
@@ -189,9 +202,10 @@ function settingsFor(bot, maker, option, given) {
 /**
  * Refuse an approval wider than the widest of the maker's own and the bot's
  * `temp_approval`, which only the user's yes through `permission approval
- * --temps` widens (ADR 0051).
+ * --temps` widens (ADR 0051). `onPi` names a Pi session that was given no
+ * level: Pi's one level is what is judged then (#648).
  */
-function refuseWiderApproval(bots, caller, bot, maker, asked) {
+function refuseWiderApproval(bots, caller, bot, maker, asked, onPi) {
   if (asked === undefined) return;
   // A blank level is the kit's default at launch (ADR 0015), so it is judged as that.
   const effective = (given) => (given === undefined || given === null || String(given).trim() === '' ? DEFAULT_APPROVAL : given);
@@ -199,7 +213,8 @@ function refuseWiderApproval(bots, caller, bot, maker, asked) {
   const own = effective(maker?.approval);
   const widest = approvalRank(bot.temp_approval) > approvalRank(own) ? bot.temp_approval : own;
   if (approvalRank(level) <= approvalRank(widest)) return;
-  throw new Error(`--approval ${level} is wider than ${caller.session}'s own approval, ${own}${widest === own ? '' : `, and than ${caller.bot}'s temp_approval, ${widest}`}, and a session does not widen another's approval. The user allows it for ${caller.bot}'s temporary sessions with  ${shellWord(ownCli())} permission approval --bots ${shellWord(bots)} --bot ${caller.bot} --temps --approval ${level}. Nothing was made.`);
+  const what = onPi === undefined ? `--approval ${level}` : `${onPi} would run on Pi, and every Pi session runs as ${level}, which`;
+  throw new Error(`${what} is wider than ${caller.session}'s own approval, ${own}${widest === own ? '' : `, and than ${caller.bot}'s temp_approval, ${widest}`}, and a session does not widen another's approval. The user allows it for ${caller.bot}'s temporary sessions with  ${shellWord(ownCli())} permission approval --bots ${shellWord(bots)} --bot ${caller.bot} --temps --approval ${level}. Nothing was made.`);
 }
 
 /**
@@ -651,11 +666,54 @@ const wholeScreen = (rows) => rows.filter((row) => row.trim() !== '').map((row)
  */
 export async function answerTemp(bots, { tab, name }) {
   const caller = callerIn(bots, tab, 'answer', "answer a session's first-run screen");
-  ownTemp(caller, name, 'answer for', 'Nothing was typed.');
-  const sent = await answerTeach({ run: `${caller.bot}/${name}`, home: caller.home, session: name }, 'temp');
+  const { bot, session } = ownTemp(caller, name, 'answer for', 'Nothing was typed.');
+  const target = { run: `${caller.bot}/${name}`, home: caller.home, session: name };
+  if (harnessOf(session, bot.harness) === 'pi') sayPiScreen(target, 'temp');
+  const sent = await answerTeach(target, 'temp');
   return { bot: caller.bot, session: name, maker: caller.session, sent };
 }
 
+/**
+ * The foot of an extension's question in Pi 1.3.0: `ctx.ui.select` and
+ * `confirm` draw the trust question's list foot, `ctx.ui.input` its own.
+ */
+const PI_ASK_FOOT = /(?:↑↓ navigate +enter select|enter submit) +escape\/ctrl\+c cancel/;
+
+/** The foot of each step of Pi 1.3.0's first-time setup. */
+const PI_SETUP_FOOT = /enter (?:continue|finish) +escape\/ctrl\+c skip setup/;
+
+/**
+ * Refuse to answer a Pi session's screen, and say what it is (#648). The kit
+ * starts Pi with `--no-approve`, and then no screen of Pi's own waits for a
+ * key where Pi has its settings already (tech notes, section 6). What still
+ * can is named and left to the user: Pi's trust question, its first-time
+ * setup, its warning that waits for a key, and an extension's question.
+ * Nothing is typed, so no turn for a line is taken.
+ */
+function sayPiScreen({ run, home, session }, kind) {
+  const nothing = 'Nothing was typed.';
+  const tabId = readBook(home).sessions[session]?.tab;
+  const handle = tabId === undefined ? undefined : tabs(home).find((one) => one.tabId === tabId)?.handle;
+  if (handle === undefined) {
+    throw new Error(`${run} runs on Pi and has no tab open in Orca, so there is no screen of its to answer. ${nothing}`);
+  }
+  const seen = screenRows(handle);
+  if (seen.rows === undefined) {
+    throw new Error(`${run} runs on Pi, and its screen could not be read (${seen.unreadable}). ${nothing}`);
+  }
+  const has = (test) => seen.rows.some((row) => test(row.trim()));
+  const what = has((row) => row === 'Trust project folder?')
+    ? `Pi's project-trust question, which Pi does not ask when the kit starts it with --no-approve. Trusting a folder is the user's choice`
+    : has((row) => PI_SETUP_FOOT.test(row))
+      ? 'Pi\'s first-time setup, which asks for a theme and whether to share anonymous usage data (analytics) when Pi has no settings.json yet. Both are the user\'s choice'
+      : has((row) => row.endsWith('Press any key to continue...'))
+        ? 'a warning of Pi\'s that waits for a key, such as its notice of an old hooks/ folder in ~/.pi/agent or the project. It is the user\'s to read and answer'
+        : has((row) => PI_ASK_FOOT.test(row))
+          ? 'a question from an extension of Pi\'s, not from Pi or the kit. It is the user\'s to answer'
+          : `no first-run screen of Pi's: the kit starts Pi with --no-approve, and then Pi asks nothing before it works`;
+  throw new Error(`${run} runs on Pi, and its screen shows ${what}. ${kind} answer answers none of Pi's screens. ${nothing} It shows:\n${wholeScreen(seen.rows)}`);
+}
+
 /**
  * Answer `target`'s Teach auto mode screen with Not now, for `temp answer` or
  * `session answer` (`kind`). Returns what answered it.
@@ -714,6 +772,7 @@ export async function trustSessionHooks(bots, { tab, bot, session }) {
  */
 export async function answerSession(bots, { tab, bot, session }) {
   const target = longLivedTarget(bots, { tab, bot, session }, 'answer');
+  if (target.harness === 'pi') sayPiScreen(target, 'session');
   const sent = await answerTeach(target, 'session');
   return { bot: target.bot, session: target.session, sent };
 }

package/src/up.js

@@ -10,7 +10,7 @@ import path from 'node:path';
 import { setTimeout as pause } from 'node:timers/promises';
 
 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 { botDir, botNames, displayName, readBot } from './bot.js';
 import { conversationsIn, hasConversation, heldAsUserTurn, transcriptsIn } from './conversations.js';
 import { dropRemovedHooks, installHook } from './hooks.js';
 import { writePermissions } from './permissions.js';
@@ -233,7 +233,7 @@ async function bringUpBot(bots, home, bot, onlySession) {
   // Orca is asked first and the book is written after: nothing that takes time
   // happens while the book is held, because a session's own hook may be writing
   // its id into that same file at any moment.
-  const { change, ...orca } = orcaProject(home, projectName(bots, name));
+  const { change, ...orca } = orcaProject(home, title);
   await updateBook(home, (book) => { book.orca = orca; });
   // Orca's window does not see a project made or renamed on the command line
   // until it is told (#224).

package/src/run.js

@@ -1,155 +0,0 @@
-// `obk run --timeout <seconds> -- <command…>`: one command run with a hard time
-// limit (#532). macOS has no `timeout`, and the fleet's form for a bounded run,
-// `perl -e 'alarm …; exec @ARGV' -- <command>`, cannot be allowed by a narrow
-// rule, since perl runs whatever its arguments say. A rule for this command
-// names the real command after `--`, and the kit judges that command as a rule
-// of its own (permissions.js). It runs whatever its arguments say too, so it is
-// never in the default set (ADR 0050).
-//
-// The command runs with no shell, in a process group of its own, so the time
-// limit stops what it started as well. Its exit code comes back as it is; one
-// ended by a signal the kit did not send comes back as 128 and the signal's
-// number, as a shell gives it.
-
-import { spawn } from 'node:child_process';
-import { constants } from 'node:os';
-
-/** The exit code of a run the time limit stopped, as GNU timeout gives it. */
-const TIMED_OUT = 124;
-
-/** The exit codes a shell gives a command it cannot find, and one it cannot run. */
-const NOT_FOUND = 127;
-const CANNOT_RUN = 126;
-
-/** How long the group has after SIGTERM before SIGKILL, as `retire` gives a session's processes (#537). */
-const GRACE_MS = 3000;
-
-/** How often the kit looks whether anything of the group still runs. */
-const LOOK_MS = 100;
-
-/** The longest time limit a timer holds, in seconds: about 24 days. */
-const LONGEST = Math.floor((2 ** 31 - 1) / 1000);
-
-/** The signals that end the kit and that it passes on to the command's group, so it is not left running. */
-const PASSED_ON = ['SIGINT', 'SIGTERM', 'SIGHUP'];
-
-const USE = 'obk run takes --timeout <seconds>, then --, then the command: obk run --timeout 300 -- go test ./...';
-
-/**
- * The time limit and the command from `obk run`'s arguments, or a refusal.
- * Only `--timeout` goes before `--`; everything after it is the command's.
- */
-export function parseRun(args) {
-  const end = args.indexOf('--');
-  const options = end === -1 ? args : args.slice(0, end);
-  let value;
-  for (let at = 0; at < options.length; at += 1) {
-    const option = options[at];
-    if (option === '--timeout' && at + 1 < options.length && value === undefined) {
-      value = options[at + 1];
-      at += 1;
-    } else if (option.startsWith('--timeout=') && value === undefined) {
-      value = option.slice('--timeout='.length);
-    } else {
-      throw new Error(`run does not take ${option}. ${USE}. Nothing was run.`);
-    }
-  }
-  if (value === undefined) throw new Error(`run needs --timeout <seconds>: how long the command may run. ${USE}. Nothing was run.`);
-  if (!/^\d+$/.test(value) || Number(value) === 0 || Number(value) > LONGEST) {
-    throw new Error(`run's --timeout is a whole number of seconds from 1 to ${LONGEST}, and got: ${value === '' ? 'nothing' : value}. Nothing was run.`);
-  }
-  const command = end === -1 ? [] : args.slice(end + 1);
-  if (command.length === 0) throw new Error(`run needs the command after --. ${USE}. Nothing was run.`);
-  return { seconds: Number(value), command };
-}
-
-/**
- * Run the command with its time limit, its input and output the caller's, and
- * give back the exit code `obk run` exits with. The run ends when nothing of
- * the command's group runs any more: a process the command started and left
- * running is held to the same limit, and to a signal the kit passes on.
- */
-export function runBounded({ seconds, command }) {
-  return new Promise((resolve) => {
-    // `detached` makes the command the leader of a group of its own, so its
-    // pid, taken here at spawn, is the group's id.
-    const child = spawn(command[0], command.slice(1), { stdio: 'inherit', detached: true });
-    // The leader's exit code, once it has exited.
-    let exitCode;
-    let stopping = false;
-    let result;
-    let killAt;
-    let deadline;
-    let look;
-    const signal = (pid, name) => {
-      try {
-        process.kill(pid, name);
-        return true;
-      } catch {
-        return false;
-      }
-    };
-    // Each process of the group gets a signal once. The leader gets it by its
-    // own pid as well only when it may have left the group: when nothing is
-    // left in the group, or for SIGKILL, which no handler sees. And only
-    // while it has not exited, since its pid is free again after that.
-    const group = (name) => {
-      const sent = signal(-child.pid, name);
-      if (exitCode === undefined && name !== 0 && (!sent || name === 'SIGKILL')) signal(child.pid, name);
-      return sent;
-    };
-
-    const finish = (code) => {
-      clearTimeout(deadline);
-      clearTimeout(look);
-      for (const name of PASSED_ON) process.off(name, passOn);
-      resolve(code);
-    };
-
-    // Once the leader has exited or the group is being stopped: look until
-    // nothing of the group runs, and send SIGKILL when the grace is over.
-    const watch = () => {
-      if (exitCode !== undefined && !group(0)) return finish(result ?? exitCode);
-      if (killAt !== undefined && Date.now() >= killAt) {
-        group('SIGKILL');
-        killAt = undefined;
-      }
-      look = setTimeout(watch, LOOK_MS);
-      return undefined;
-    };
-
-    // Stop the group: `name` first, then SIGKILL to what still runs after the
-    // grace. obk run exits with `code`, or with the leader's own when it is
-    // undefined.
-    const stop = (name, code) => {
-      if (stopping) return;
-      stopping = true;
-      result = code;
-      clearTimeout(deadline);
-      group(name);
-      killAt = Date.now() + GRACE_MS;
-      clearTimeout(look);
-      watch();
-    };
-    const passOn = (name) => stop(name, undefined);
-
-    child.on('error', (error) => {
-      const missing = error.code === 'ENOENT';
-      process.stderr.write(`obk: run could not start ${command[0]}: ${missing ? 'there is no such command' : error.code ?? error.message}.\n`);
-      finish(missing ? NOT_FOUND : CANNOT_RUN);
-    });
-    if (child.pid === undefined) return;
-    for (const name of PASSED_ON) process.on(name, passOn);
-
-    child.on('exit', (code, name) => {
-      exitCode = code ?? 128 + constants.signals[name];
-      clearTimeout(look);
-      watch();
-    });
-
-    deadline = setTimeout(() => {
-      process.stderr.write(`obk: run stopped ${command.join(' ')}: it ran past its time limit of ${seconds} seconds, and its whole process group was stopped.\n`);
-      stop('SIGTERM', TIMED_OUT);
-    }, seconds * 1000);
-  });
-}