@assuredloop/orca-bot-kit 0.35.0 → 0.36.0

package/README.md

@@ -403,6 +403,18 @@ bot's sessions, set `"auto-mode-setup": "on"` under `skillOverrides` in the bot'
 `.claude/settings.local.json`, which wins over the kit's entry. The kit never
 writes that file.
 
+Under an Orca Claude account, the kit's line for a Claude session also carries
+`--settings` with one key, `autoMemoryDirectory`. It names the physical folder
+behind the account's linked `projects` folder, so a session saves its memory
+with no permission dialog. The memory is the same memory, and the kit writes no
+file for this. A bot, its repository or an account that names its own
+`autoMemoryDirectory` keeps it. A conversation that began before this keeps its old path until the
+session restarts under this version and then begins a new conversation with
+`/clear`. A restart alone or a `/clear` alone does not change the path. After
+Orca brings a tab back by itself, a `/clear` before a
+restart brings the dialog back; `obk health` names such a session
+([ADR 0054](docs/adr/0054-the-kits-launch-line-names-the-physical-memory-folder.md)).
+
 So: kill a tab, or reboot, and `obk up` brings the session back with the
 conversation it was having, rather than starting a new one. Clear a session —
 `/clear` on Claude Code, `/new` on Codex — and the kit writes down the new id,

package/package.json

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

package/src/conversations.js

@@ -20,7 +20,7 @@ import { eachLine, firstLine } from './lines.js';
 const claudeDir = (home) => path.join(homedir(), '.claude', 'projects', slug(home));
 
 /** The folder's name is the working directory with everything else turned into a dash. */
-const slug = (home) => home.replaceAll(/[^A-Za-z0-9]/g, '-');
+export const slug = (home) => home.replaceAll(/[^A-Za-z0-9]/g, '-');
 
 /**
  * Pi's sessions: one folder per working directory, named from its real path

package/src/launch.js

@@ -294,11 +294,12 @@ const NO_DAEMON = '--no-daemon';
 
 // A string is shell text, so it is read as the shell will split it: `'--no-daemon'`
 // is the flag, and `'/tmp/a --no-daemon b'` is one path that merely says it.
-const setsNoDaemon = (session) => {
-  const extra = session.extra_args;
-  const words = Array.isArray(extra) ? extra.map(String) : set(extra) ? shellWords(String(extra)) : [];
-  return words.includes(NO_DAEMON);
-};
+const extraArgWords = (extra) => (Array.isArray(extra) ? extra.map(String) : set(extra) ? shellWords(String(extra)) : []);
+
+const setsNoDaemon = (session) => extraArgWords(session.extra_args).includes(NO_DAEMON);
+
+/** Whether the session's own extra arguments hold Claude Code's `--settings`. */
+const setsSettings = (session) => extraArgWords(session.extra_args).some((word) => word === '--settings' || word.startsWith('--settings='));
 
 /**
  * The words a shell makes of `text`: split on blanks outside quotes, quotes
@@ -412,7 +413,7 @@ const where = (session) => (set(session.name) ? `session ${session.name}` : 'thi
  * send would land on that list and answer it. A prompt given as an argument is
  * held by the harness until it is ready for it (tech notes, section 1).
  */
-export function launchCommand(session, { harness, home, workDir, prompt, promptFile: fromFile, resume, address, kit, sessionId, name }) {
+export function launchCommand(session, { harness, home, workDir, prompt, promptFile: fromFile, resume, address, kit, sessionId, name, memoryFolder }) {
   const trouble = sessionTrouble(session, harness, home);
   if (trouble !== undefined) throw new Error(trouble);
   // Pi is told which conversation it is, a new one too: the kit names it, and
@@ -440,6 +441,10 @@ export function launchCommand(session, { harness, home, workDir, prompt, promptF
     // The context window rides on the model name: `sonnet[1m]`.
     if (set(session.model)) words.push('--model', set(session.context) ? `${session.model}[${session.context}]` : session.model);
     if (set(session.effort)) words.push('--effort', String(session.effort));
+    // This one key and no other: `--settings` can carry rules, folders and
+    // hooks, which is why a user's extra argument may not use it (ADR 0054,
+    // ADR 0049). A hand-written one in bot.yaml is the user's, and wins.
+    if (memoryFolder !== undefined && !setsSettings(session)) words.push('--settings', JSON.stringify({ autoMemoryDirectory: memoryFolder }));
   } else if (harness === 'pi') {
     // Pi trusts none of the folder's own files (`.pi/`, `.agents/skills`), so it
     // shows no trust screen and runs nothing the kit has not looked at (#578).

package/src/memory.js

@@ -0,0 +1,113 @@
+// The physical memory folder of a Claude session, when the path Claude Code
+// would use leads through a link (#722, ADR 0054).
+//
+// Orca starts a Claude tab with CLAUDE_CONFIG_DIR at a profile of its own,
+// where `projects` is a link to `~/.claude/projects`. Claude Code names its
+// memory folder through that link, and a write there stops on a dialog that
+// only a person can answer (tech notes, section 2). Named by its real path, the
+// same folder has no dialog. Whenever the answer is not sure, there is no
+// answer, and the session runs as it did: a dialog costs a wait, and a wrong
+// folder costs the session its memory.
+
+import { spawnSync } from 'node:child_process';
+import { existsSync, lstatSync, readFileSync, realpathSync, statSync } from 'node:fs';
+import path from 'node:path';
+
+import { slug } from './conversations.js';
+import { selectedClaudeProfile } from './orca.js';
+
+/** The longest slug Claude Code uses as it is. Past this it adds a hash of its own. */
+const LONGEST_SLUG = 200;
+
+/**
+ * The folder to name for a session of the bot at `home`, or undefined when the
+ * kit should name none: no profile is routed, its `projects` is no link, the
+ * bot or the profile names a folder of its own, the project root is not sure,
+ * or the slug is too long.
+ */
+export function physicalMemoryFolder(home) {
+  const profile = selectedClaudeProfile();
+  if (profile === undefined) return undefined;
+  const projects = linkedFolder(path.join(profile, 'projects'));
+  if (projects === undefined) return undefined;
+  const root = projectRoot(home);
+  if (root === undefined) return undefined;
+  // Claude Code reads a project's local settings from the top of its repository as well as from the bot's folder.
+  const named = [
+    path.join(home, '.claude', 'settings.json'),
+    path.join(home, '.claude', 'settings.local.json'),
+    path.join(root, '.claude', 'settings.local.json'),
+    path.join(profile, 'settings.json'),
+  ];
+  if (named.some(namesMemoryFolder)) return undefined;
+  // Claude Code holds its project root in NFC, whatever form the disk has.
+  const name = slug(root.normalize('NFC'));
+  return name.length > LONGEST_SLUG ? undefined : path.join(projects, name, 'memory');
+}
+
+/** The real path of the folder the link `entry` leads to, or undefined when it is not such a link. */
+function linkedFolder(entry) {
+  try {
+    if (!lstatSync(entry).isSymbolicLink()) return undefined;
+    return statSync(entry).isDirectory() ? realpathSync(entry) : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Whether the settings file `file` may name a memory folder of its own: it has
+ * the key, or it is there and cannot be read, so the kit cannot tell.
+ */
+function namesMemoryFolder(file) {
+  let text;
+  try {
+    text = readFileSync(file, 'utf8');
+  } catch (error) {
+    return error.code !== 'ENOENT' && error.code !== 'ENOTDIR';
+  }
+  try {
+    const settings = JSON.parse(text);
+    return settings !== null && typeof settings === 'object' && Object.hasOwn(settings, 'autoMemoryDirectory');
+  } catch {
+    return true;
+  }
+}
+
+/**
+ * The folder Claude Code keys memory by: the top of the git repository that
+ * holds `home`, the main repository's for a linked worktree, since every
+ * worktree of a repository shares one memory (tech notes, section 2). With no
+ * repository, it is `home` itself. Undefined when the kit is not sure: a `.git`
+ * is on the way and git cannot say what it is, a linked worktree's shared git
+ * folder is not named `.git`, or the `.git` at the top is a link.
+ */
+function projectRoot(home) {
+  const shared = revParse(home, '--git-common-dir');
+  if (shared === undefined) return gitOnTheWay(home) ? undefined : realpathSync(home);
+  const own = revParse(home, '--git-dir');
+  if (own === undefined) return undefined;
+  const main = realpathSync(path.resolve(home, shared));
+  const linked = realpathSync(path.resolve(home, own)) !== main;
+  // Only a linked worktree tells its main repository by the shared git folder:
+  // `--separate-git-dir` puts a repository's own git folder away from its top.
+  const top = !linked ? revParse(home, '--show-toplevel') : path.basename(main) === '.git' ? path.dirname(main) : undefined;
+  if (top === undefined) return undefined;
+  return lstatSync(path.join(top, '.git'), { throwIfNoEntry: false })?.isSymbolicLink() ? undefined : top;
+}
+
+/** Whether `folder` or a folder above it holds a `.git` entry. */
+function gitOnTheWay(folder) {
+  for (let at = realpathSync(folder); ; at = path.dirname(at)) {
+    if (existsSync(path.join(at, '.git'))) return true;
+    if (path.dirname(at) === at) return false;
+  }
+}
+
+/** One answer of `git rev-parse` in `folder`, or undefined when git gives none. */
+function revParse(folder, question) {
+  const asked = spawnSync('git', ['-C', folder, 'rev-parse', question], { encoding: 'utf8' });
+  // Only git's record terminator comes off: trailing whitespace may be part of the folder's name.
+  const answer = (asked.stdout ?? '').replace(/\n$/, '');
+  return asked.status === 0 && answer !== '' ? answer : undefined;
+}

package/src/orca.js

@@ -146,10 +146,25 @@ export function findProject(home) {
  * names its CLI: a build's folder is written only inside its own CLI, so the
  * kit cannot tell it from the app (#551).
  */
-export const profilesDir = () => path.join(
-  process.env.OBK_ORCA_DATA || path.join(homedir(), 'Library', 'Application Support', 'orca'),
-  'profiles',
-);
+export const profilesDir = () => path.join(orcaData(), 'profiles');
+
+const orcaData = () => process.env.OBK_ORCA_DATA || path.join(homedir(), 'Library', 'Application Support', 'orca');
+
+/**
+ * The home of the Claude profile Orca routes a new Claude tab to, or undefined
+ * when it routes none. Orca writes the path to `selected-host`, with nothing
+ * in it when no profile is routed, and removes the file when it has no accounts
+ * (read in the bundle of Orca 1.4.245, tech notes, section 2).
+ */
+export function selectedClaudeProfile() {
+  let home;
+  try {
+    home = readFileSync(path.join(orcaData(), 'claude-profiles', 'selected-host'), 'utf8').replace(/\r?\n$/, '');
+  } catch {
+    return undefined;
+  }
+  return path.isAbsolute(home) ? home : undefined;
+}
 
 /**
  * Orca's own default launch arguments, per profile it keeps:

package/src/up.js

@@ -14,6 +14,7 @@ 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';
+import { physicalMemoryFolder } from './memory.js';
 import { piTrouble } from './pi.js';
 import { addressOf, HARNESSES, harnessOf, isAddressOf, isShortPrompt, kitFolders, launchCommand, mailboxStep, ownCli, reachesMail, sessionTrouble, shellWord, startPrompt, workDirOf } from './launch.js';
 import { asFolderProject, coordinatorOf, dropLeftGit, 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';
@@ -610,6 +611,7 @@ function launchFor(bots, bot, session, harness, home, workDir, resume, held, fre
     resume,
     address,
     kit: kitFolders(bots, bot.name),
+    ...(harness === 'claude' ? { memoryFolder: physicalMemoryFolder(home) } : {}),
     // 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}` } : {}),