@vodmal/vdx-cli 0.24.0 → 0.26.0

package/src/ai.ts

@@ -6,12 +6,13 @@ import YAML from 'js-yaml';
 import { evalPredicate } from './evaluator.ts';
 import { GIT_HOOK_EVENTS } from './hooks.ts';
 import { autoDetectStack, readStructured, resolveConfigPath, type Ctx } from './facts.ts';
-import { loadManifest } from './manifest.ts';
+import { loadManifestAt } from './manifest.ts';
 import { type Author, effectiveAuthor, isGitRepo, rankAuthors, scanPool, writeAuthor } from './author.ts';
 import type { Predicate } from './rubric.ts';
 import {
   type Conversation,
   describeConversation,
+  describeAge,
   describeLive,
   isMachineLabel,
   LIVE_SESSIONS_SCRIPT,
@@ -20,12 +21,14 @@ import {
   listConversations,
   liveConversationId,
   liveSessionsHere,
+  liveStartedAt,
   machineLine,
   type MachineReport,
   machineOf,
   parseMachineReport,
   runsInProject,
 } from './conversations.ts';
+import { at, errorMessage, isStringList, str } from './narrow.ts';
 
 /**
  * `vdx ai` — start the person's agent in a project, with the flags their
@@ -80,7 +83,7 @@ export interface NameSource {
 export interface SessionProfile {
   multiplexer?: Multiplexer;
   name?: string;
-  /** Tried after `[vdx] name` in the project's mise.toml; the first non-empty string wins. */
+  /** Tried after `[_.vdx] name` (or the older `[vdx]`) in the project's mise.toml; the first non-empty string wins. */
   project_names?: NameSource[];
   /** The machines a project's agent may run on, as ssh destinations; vdx asks the others what runs there. */
   machines?: string[];
@@ -142,13 +145,9 @@ export function resolveEnvironmentPath(
   return fs.existsSync(user) ? user : null;
 }
 
-function isStringList(v: unknown): v is string[] {
-  return Array.isArray(v) && v.every((x) => typeof x === 'string');
-}
-
 /** Parse and validate a profile. Throws with the offending key named. */
 export function parseEnvironment(text: string, source: string): Environment {
-  const data = YAML.load(text) as unknown;
+  const data: unknown = YAML.load(text);
   if (data === null || data === undefined) return {};
   if (typeof data !== 'object' || Array.isArray(data)) {
     throw new Error(`${source}: expected a YAML mapping at the top level`);
@@ -221,10 +220,14 @@ export function parseEnvironment(text: string, source: string): Environment {
     if (session.machines !== undefined) {
       if (!isStringList(session.machines)) fail('session.machines', 'must be a list of machine names');
       session.machines.forEach((m, i) => {
-        if (!isMachineLabel(m)) fail(`session.machines[${i}]`, 'must be an ssh destination: letters, digits, . _ - and no leading -');
+        if (!isMachineLabel(m))
+          fail(`session.machines[${i}]`, 'must be an ssh destination: letters, digits, . _ - and no leading -');
       });
     }
-    if (session.folders_fix !== undefined && (typeof session.folders_fix !== 'string' || session.folders_fix.trim() === '')) {
+    if (
+      session.folders_fix !== undefined &&
+      (typeof session.folders_fix !== 'string' || session.folders_fix.trim() === '')
+    ) {
       fail('session.folders_fix', 'must be a non-empty string');
     }
   }
@@ -250,7 +253,8 @@ export function parseEnvironment(text: string, source: string): Environment {
         if (events.length === 0 || !events.every((e) => typeof e === 'string' && GIT_HOOK_EVENTS.has(e))) {
           fail(`${at}.event`, 'must be a git hook event (pre-commit, pre-push, …) or a list of them');
         }
-        if (typeof h.command !== 'string' || h.command.trim() === '') fail(`${at}.command`, 'must be a non-empty string');
+        if (typeof h.command !== 'string' || h.command.trim() === '')
+          fail(`${at}.command`, 'must be a non-empty string');
         if (h.when_exists !== undefined && (typeof h.when_exists !== 'string' || h.when_exists === '')) {
           fail(`${at}.when_exists`, 'must be a path');
         }
@@ -264,8 +268,8 @@ export function loadEnvironment(file: string): Environment {
   let text: string;
   try {
     text = fs.readFileSync(file, 'utf8');
-  } catch (e: any) {
-    throw new Error(`cannot read profile ${file}: ${e?.code ?? e?.message ?? e}`);
+  } catch (e) {
+    throw new Error(`cannot read profile ${file}: ${str(at(e, 'code')) ?? errorMessage(e)}`, { cause: e });
   }
   return parseEnvironment(text, file);
 }
@@ -365,7 +369,7 @@ export function planLaunch(input: {
 }
 
 export function shellQuote(s: string): string {
-  if (s !== '' && /^[A-Za-z0-9_\/.:@%+=,-]+$/.test(s)) return s;
+  if (s !== '' && /^[A-Za-z0-9_/.:@%+=,-]+$/.test(s)) return s;
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 
@@ -519,7 +523,11 @@ export function projectIdentity(projectRoot: string): string {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'ignore'],
     }).trim();
-    const slug = url.replace(/\/+$/, '').replace(/\.git$/, '').split(/[/:]/).pop();
+    const slug = url
+      .replace(/\/+$/, '')
+      .replace(/\.git$/, '')
+      .split(/[/:]/)
+      .pop();
     if (slug) return slug.toLowerCase();
   } catch {
     /* no git or no origin */
@@ -533,7 +541,7 @@ export interface ProjectName {
 }
 
 /**
- * `{project}`: `[vdx] name` in the project's mise.toml, else the first profile
+ * `{project}`: `[_.vdx] name` (or the older `[vdx]`) in the project's mise.toml, else the first profile
  * source holding a non-empty string, else the repository name. A source that is
  * missing or unreadable is skipped — a name is a label, not a reason to fail.
  */
@@ -544,15 +552,19 @@ export function resolveProjectName(input: {
   home: string;
   profileDir: string;
 }): ProjectName {
-  const own = loadManifest(input.projectRoot)?.name;
-  if (typeof own === 'string' && own.trim()) return { name: own.trim(), source: 'mise.toml [vdx] name' };
+  const found = loadManifestAt(input.projectRoot);
+  const own = found?.manifest.name;
+  if (typeof own === 'string' && own.trim()) return { name: own.trim(), source: `mise.toml [${found!.place}] name` };
   for (const src of input.sources) {
     const file = path.resolve(
       input.profileDir,
       src.file.replace(/^~(?=$|\/)/, input.home).replace(/\{repo\}/g, input.repo),
     );
     // Readers take paths relative to a project root; from "/" an absolute path stays itself.
-    const value = resolveConfigPath(readStructured({ projectRoot: '/', stack: '', cache: new Map() }, file), src.jsonpath);
+    const value = resolveConfigPath(
+      readStructured({ projectRoot: '/', stack: '', cache: new Map() }, file),
+      src.jsonpath,
+    );
     if (typeof value === 'string' && value.trim()) {
       const shown = file.startsWith(input.home + path.sep) ? `~${file.slice(input.home.length)}` : file;
       return { name: value.trim(), source: `${shown} ${src.jsonpath}` };
@@ -675,9 +687,7 @@ export class Tmux {
   }
 
   attach(session: string, insideTmux: boolean): number {
-    const args = insideTmux
-      ? ['switch-client', '-t', `=${session}`]
-      : ['attach-session', '-t', `=${session}`];
+    const args = insideTmux ? ['switch-client', '-t', `=${session}`] : ['attach-session', '-t', `=${session}`];
     return spawnSync('tmux', this.argv(args), { stdio: 'inherit' }).status ?? 1;
   }
 
@@ -729,7 +739,7 @@ export interface AiDeps {
 
 export function runSsh(args: string[], capture: boolean): { status: number; stdout: string } | null {
   const res = spawnSync('ssh', args, { stdio: capture ? ['ignore', 'pipe', 'ignore'] : 'inherit', encoding: 'utf8' });
-  if ((res.error as NodeJS.ErrnoException | undefined)?.code === 'ENOENT') return null;
+  if (at(res.error, 'code') === 'ENOENT') return null;
   return { status: res.status ?? 1, stdout: res.stdout ?? '' };
 }
 
@@ -746,8 +756,8 @@ export function askLine(prompt: string): string | null {
     let n: number;
     try {
       n = fs.readSync(0, buf, 0, buf.length, null);
-    } catch (e: any) {
-      if (e?.code === 'EAGAIN') {
+    } catch (e) {
+      if (at(e, 'code') === 'EAGAIN') {
         sleepSync(50);
         continue;
       }
@@ -804,7 +814,8 @@ export function renderPlan(
     `  resume:   ${plan.resumeArgs.length ? plan.resumeArgs.join(' ') : '—'}`,
     `  matched:  ${plan.matched.length ? plan.matched.join(', ') : '—'}`,
   ];
-  if (plan.focused) lines.push(`  focused:  nothing wakes it; left out: ${plan.skipped.length ? plan.skipped.join(', ') : '—'}`);
+  if (plan.focused)
+    lines.push(`  focused:  nothing wakes it; left out: ${plan.skipped.length ? plan.skipped.join(', ') : '—'}`);
   for (const c of plan.confirm) lines.push(`  confirm:  "${c.screen}" → ${c.keys.join(' ')}`);
   lines.push(
     multiplexer === 'tmux'
@@ -828,7 +839,10 @@ export function renderPlan(
 
 function lastLines(screen: string | null, n: number): string {
   const lines = (screen ?? '').split('\n').filter((l) => l.trim() !== '');
-  return lines.slice(-n).map((l) => `    | ${l}`).join('\n');
+  return lines
+    .slice(-n)
+    .map((l) => `    | ${l}`)
+    .join('\n');
 }
 
 function findAgentInPane(plan: LaunchPlan, paneId: string, deps: AiDeps): ProcInfo | null {
@@ -981,7 +995,12 @@ export function remoteAiArgs(input: {
 }
 
 /** Where neighbour repos live: the profile's `git.author_pool`, else the project's parent directory. */
-export function authorPoolDirs(environment: Environment, projectRoot: string, home: string, profileDir: string): string[] {
+export function authorPoolDirs(
+  environment: Environment,
+  projectRoot: string,
+  home: string,
+  profileDir: string,
+): string[] {
   const listed = environment.git?.author_pool;
   if (!listed?.length) return [path.dirname(projectRoot)];
   return listed.map((d) => path.resolve(profileDir, d.replace(/^~(?=$|\/)/, home)));
@@ -1025,7 +1044,13 @@ export function ensureAuthor(projectRoot: string, poolDirs: string[], deps: AiDe
       return;
     }
     const pick: Author | undefined =
-      a === '' ? top[0] : /^\d+$/.test(a) ? top[Number(a) - 1] : a.includes('@') ? { name: top[0]!.name, email: a } : undefined;
+      a === ''
+        ? top[0]
+        : /^\d+$/.test(a)
+          ? top[Number(a) - 1]
+          : a.includes('@')
+            ? { name: top[0]!.name, email: a }
+            : undefined;
     if (pick) {
       if (writeAuthor(projectRoot, pick)) deps.log(`✓ ${pick.name} <${pick.email}> → .git/config`);
       else deps.log(`✗ could not write .git/config — ${command(pick)}`);
@@ -1040,7 +1065,9 @@ export function runAiRemote(opts: AiOptions, host: string, deps: AiDeps, from: s
   const projectPath = resolveProjectRoot(opts.path) ?? path.resolve(opts.path);
   const tty = deps.interactive && !opts.detach && !opts.dryRun;
   const args = remoteAiArgs({ host, from, projectPath, home: deps.home, version: deps.version ?? '', opts, tty });
-  deps.log(`→ ${host}: vdx ai ${shellQuote(projectPath)}${opts.conversation ? ` --conversation ${opts.conversation}` : ''}`);
+  deps.log(
+    `→ ${host}: vdx ai ${shellQuote(projectPath)}${opts.conversation ? ` --conversation ${opts.conversation}` : ''}`,
+  );
   const res = (deps.ssh ?? runSsh)(args, false);
   if (res === null) {
     deps.log('vdx ai: `ssh` not found on PATH');
@@ -1113,7 +1140,10 @@ export function chooseConversation(plan: LaunchPlan, deps: AiDeps, canAsk: boole
   if (!isClaude(plan.command)) return { args: plan.resumeArgs, lines: [] };
   const host = plan.host;
   const same = sameMachine;
-  const all = plan.resumeArgs.length === 0 ? [] : listConversations({ env: deps.env, home: deps.home, projectRoot: plan.projectRoot });
+  const all =
+    plan.resumeArgs.length === 0
+      ? []
+      : listConversations({ env: deps.env, home: deps.home, projectRoot: plan.projectRoot });
   const root = shellQuote(plan.projectRoot);
   // Said from where the person sits: under `vdx ai@<host>` that is not this machine.
   const atSeat = same(plan.seat, host);
@@ -1124,7 +1154,9 @@ export function chooseConversation(plan: LaunchPlan, deps: AiDeps, canAsk: boole
   for (const m of [...plan.machines, ...all.map((c) => c.machine)]) {
     if (m && !same(m, host) && ![...reach.keys()].some((k) => same(k, m))) reach.set(m, askMachine(m, deps));
   }
-  const silent = [...reach].filter(([, r]) => r === null).map(([m]) => `note: ${m} does not answer over ssh — what runs there is not known`);
+  const silent = [...reach]
+    .filter(([, r]) => r === null)
+    .map(([m]) => `note: ${m} does not answer over ssh — what runs there is not known`);
   const elsewhere = [...reach].flatMap(([m, r]) =>
     (r?.sessions ?? []).filter((l) => runsInProject(l, r!.home, plan.projectRoot, deps.home)).map((l) => ({ m, l })),
   );
@@ -1139,7 +1171,9 @@ export function chooseConversation(plan: LaunchPlan, deps: AiDeps, canAsk: boole
     !l.tmux ? '' : same(m, plan.seat) ? ` — attach: vdx ai ${rootOn(m)}` : ` — there: vdx ai@${m} ${root}`;
   const fresh = (lines: string[]): ConversationChoice => {
     if (elsewhere.length === 0) return { args: [], lines };
-    const agents = elsewhere.map(({ m, l }) => `an agent of this project is ${describeLive(on(m), l)}${reachAgent(m, l)}`);
+    const agents = elsewhere.map(
+      ({ m, l }) => `an agent of this project is ${describeLive(on(m), l)}${reachAgent(m, l)}`,
+    );
     return { args: [], elsewhere: [...new Set(elsewhere.map(({ m }) => m))], lines: [...lines, ...agents] };
   };
   if (plan.resumeArgs.length === 0) return fresh(silent);
@@ -1167,15 +1201,26 @@ export function chooseConversation(plan: LaunchPlan, deps: AiDeps, canAsk: boole
     if (here) {
       return {
         args: [],
-        askHere: { id: c.id, why: `It runs ${on(host)} right now (${here.session.tmux ?? `pid ${here.session.pid}`}); two sessions would write to it` },
+        askHere: {
+          id: c.id,
+          why: `It runs ${on(host)} right now (${here.session.tmux ?? `pid ${here.session.pid}`}); two sessions would write to it`,
+        },
         lines: [`chosen: ${show(c)}`],
       };
     }
     if (isOurs(c)) return { args: resumeId(c.id), lines: [`continuing ${show(c)}`] };
-    if (m) return { args: [], remote: { host: m, id: c.id, reachable: reach.get(m) != null }, lines: [`continuing on ${m}: ${show(c)}`] };
+    if (m)
+      return {
+        args: [],
+        remote: { host: m, id: c.id, reachable: reach.get(m) != null },
+        lines: [`continuing on ${m}: ${show(c)}`],
+      };
     return {
       args: [],
-      askHere: { id: c.id, why: `Its machine is unknown (never typed in ${on(host)}); if it runs there, both machines will write to it` },
+      askHere: {
+        id: c.id,
+        why: `Its machine is unknown (never typed in ${on(host)}); if it runs there, both machines will write to it`,
+      },
       lines: [`chosen: ${show(c)}`],
     };
   };
@@ -1188,7 +1233,12 @@ export function chooseConversation(plan: LaunchPlan, deps: AiDeps, canAsk: boole
   if (canAsk && deps.interactive) {
     deps.log('conversations of this project:');
     found.forEach((c, i) => {
-      const marks = [i === 0 && 'newest', c === firstIdle && (atSeat ? 'this machine' : `idle on ${host}`), !machine(c) && 'machine unknown', ...running(c)];
+      const marks = [
+        i === 0 && 'newest',
+        c === firstIdle && (atSeat ? 'this machine' : `idle on ${host}`),
+        !machine(c) && 'machine unknown',
+        ...running(c),
+      ];
       const m = marks.filter(Boolean);
       deps.log(`  ${i + 1}) ${show(c)}${m.length ? `   ← ${m.join(', ')}` : ''}`);
     });
@@ -1215,7 +1265,8 @@ export function chooseConversation(plan: LaunchPlan, deps: AiDeps, canAsk: boole
         `${c.updated > (firstIdle?.updated ?? new Date(0)) ? 'a newer' : 'another'} conversation ${c.id.slice(0, 8)}` +
         (now.length ? `, ${now.join(', ')}` : '');
       if (runsHere(c)) return `note: ${which} — not taken: it would have two sessions`;
-      if (m && same(m, plan.seat)) return `note: ${m} has ${which} — continue it where you are: vdx ai ${rootOn(m)} --conversation ${c.id}`;
+      if (m && same(m, plan.seat))
+        return `note: ${m} has ${which} — continue it where you are: vdx ai ${rootOn(m)} --conversation ${c.id}`;
       return m
         ? `note: ${m} has ${which} — continue it there: vdx ai@${m} ${root} --conversation ${c.id}`
         : `note: ${which} is of an unknown machine (never typed in ${on(host)}) — on its machine: vdx ai@<machine> ${root} --conversation ${c.id}`;
@@ -1228,6 +1279,51 @@ export function chooseConversation(plan: LaunchPlan, deps: AiDeps, canAsk: boole
   return fresh([`no idle conversation ${atSeat ? 'of this machine' : `on ${host}`} — starting a new one`, ...notes]);
 }
 
+/**
+ * Several agents of the project run here and the start is about one of them: a person
+ * picks — Enter takes the newest; without a terminal, or under --dry-run, it is the newest.
+ * null — the person left it.
+ */
+function pickAgent(
+  running: AgentPane[],
+  focusedOf: (pid: number) => boolean,
+  deps: AiDeps,
+  canAsk: boolean,
+): AgentPane | null {
+  if (running.length === 1) return running[0]!;
+  const startedAt = (a: AgentPane) => liveStartedAt(deps.env, deps.home, a.proc.pid);
+  const sorted = [...running].sort((a, b) => (startedAt(b) ?? 0) - (startedAt(a) ?? 0));
+  const show = (a: AgentPane) => {
+    const id = liveConversationId(deps.env, deps.home, a.proc.pid);
+    const at = startedAt(a);
+    const marks = [
+      id && `conversation ${id.slice(0, 8)}`,
+      focusedOf(a.proc.pid) && 'focused',
+      at !== null && `started ${describeAge(new Date(at))}`,
+    ].filter(Boolean);
+    return `${a.pane.session} ${a.pane.paneId}${marks.length ? ` — ${marks.join(', ')}` : ''}`;
+  };
+  // Start times come from Claude Code's session files; without them, tmux's order.
+  const newest = startedAt(sorted[0]!) !== null ? 'the newest' : 'the first';
+  if (!canAsk || !deps.interactive) {
+    deps.log(`note: ${sorted.length} agents of this project run here — taking ${newest}, ${show(sorted[0]!)}`);
+    return sorted[0]!;
+  }
+  deps.log('agents of this project running here:');
+  sorted.forEach((a, i) =>
+    deps.log(`  ${i + 1}) ${show(a)}${i === 0 && newest === 'the newest' ? '   ← newest' : ''}`),
+  );
+  for (let tries = 0; tries < 2; tries++) {
+    const answer = deps.ask('Which one? [1]: ');
+    if (answer === null) return null;
+    const a = answer.trim();
+    const agent = a === '' ? sorted[0] : /^\d+$/.test(a) ? sorted[Number(a) - 1] : undefined;
+    if (agent) return agent;
+    deps.log(`  1–${sorted.length}`);
+  }
+  return null;
+}
+
 interface Prepared {
   projectRoot: string;
   environment: Environment;
@@ -1253,8 +1349,8 @@ function prepare(pathArg: string, deps: AiDeps, focused = false): Prepared | num
   if (profilePath) {
     try {
       environment = loadEnvironment(profilePath);
-    } catch (e: any) {
-      log(`vdx ai: ${e?.message ?? e}`);
+    } catch (e) {
+      log(`vdx ai: ${errorMessage(e)}`);
       return EXIT_USAGE;
     }
   }
@@ -1292,8 +1388,8 @@ function prepare(pathArg: string, deps: AiDeps, focused = false): Prepared | num
   let plan: LaunchPlan;
   try {
     plan = replan(focused);
-  } catch (e: any) {
-    log(`vdx ai: ${profilePath ?? 'profile'}: ${e?.message ?? e}`);
+  } catch (e) {
+    log(`vdx ai: ${profilePath ?? 'profile'}: ${errorMessage(e)}`);
     return EXIT_USAGE;
   }
   return { projectRoot, environment, profilePath, profileDir, plan, replan };
@@ -1326,16 +1422,30 @@ export const GUARDED_FOLDERS = ['Downloads', 'Desktop', 'Documents'];
  */
 export function unreadableFolders(tmux: Tmux | null, home: string): string[] {
   const dirs = GUARDED_FOLDERS.map((f) => path.join(home, f));
-  // `ls`, not `[ -d ]`: a denied folder still passes -d.
-  const script = dirs.map((d) => `{ [ ! -d ${shellQuote(d)} ] || ls ${shellQuote(d)} >/dev/null 2>&1 || echo ${shellQuote(d)}; }`).join('; ');
-  const out = tmux?.tryRun(['run-shell', script]);
-  if (out !== undefined && out !== null) return out.split('\n').filter(Boolean);
+  if (tmux) {
+    // `ls`, not `[ -d ]`: a denied folder still passes -d. The answer comes back in a
+    // file: tmux before 3.5 prints run-shell's output into a pane, not to the caller.
+    const file = path.join(os.tmpdir(), `vdx-folders-${process.pid}-${Date.now()}`);
+    const checks = dirs.map(
+      (d) => `{ [ ! -d ${shellQuote(d)} ] || ls ${shellQuote(d)} >/dev/null 2>&1 || echo ${shellQuote(d)}; }`,
+    );
+    try {
+      if (tmux.tryRun(['run-shell', `{ ${checks.join('; ')}; } > ${shellQuote(file)}`]) !== null) {
+        return fs.readFileSync(file, 'utf8').split('\n').filter(Boolean);
+      }
+    } catch {
+      // no answer from the server: this process's own check
+    } finally {
+      fs.rmSync(file, { force: true });
+    }
+  }
   return dirs.filter((d) => {
     try {
       fs.readdirSync(d);
       return false;
-    } catch (e: any) {
-      return e?.code === 'EPERM' || e?.code === 'EACCES';
+    } catch (e) {
+      const code = at(e, 'code');
+      return code === 'EPERM' || code === 'EACCES';
     }
   });
 }
@@ -1445,8 +1555,9 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
     log(`vdx ai: --conversation names a Claude Code conversation; the agent here is ${plan.command}`);
     return EXIT_USAGE;
   }
-  // A start continues the last conversation unless asked for a new one.
-  if (opts.fresh) plan = { ...plan, resumeArgs: [] };
+  // A start continues the last conversation unless asked for a new one; a focused session is a new one.
+  const wantsNew = (opts.fresh || opts.focused === true) && !opts.conversation;
+  if (wantsNew) plan = { ...plan, resumeArgs: [] };
 
   let multiplexer = plan.multiplexer;
   if (multiplexer === 'tmux' && !tmux.available()) {
@@ -1455,13 +1566,27 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
   }
 
   const running =
-    multiplexer === 'tmux'
-      ? findAgentPanes(tmux.panes(), deps.processes(), projectRoot, plan.command)
-      : [];
-  const current = running[0];
+    multiplexer === 'tmux' ? findAgentPanes(tmux.panes(), deps.processes(), projectRoot, plan.command) : [];
+  const focusedOf = deps.agentFocused ?? processFocused;
+  const conversationOf = (a: AgentPane) => liveConversationId(deps.env, deps.home, a.proc.pid);
+  // Which running agent the start is about. A new conversation, or one no agent here is in, starts
+  // next to them; --restart replaces one. An agent whose conversation vdx cannot read may be in the
+  // one asked for: no second agent in it blindly.
+  const inConversation = opts.conversation ? running.find((a) => conversationOf(a) === opts.conversation) : undefined;
+  const unreadable = opts.conversation && !inConversation ? running.find((a) => conversationOf(a) === null) : undefined;
+  const alongside =
+    running.length > 0 && !opts.restart && !inConversation && !unreadable && (wantsNew || !!opts.conversation);
+  let current = inConversation ?? unreadable;
+  if (!current && !alongside && running.length > 0) {
+    const picked = pickAgent(running, focusedOf, deps, !opts.dryRun);
+    if (picked === null) {
+      log('nothing done');
+      return EXIT_LAUNCH_FAILED;
+    }
+    current = picked;
+  }
   // A running agent keeps its mode: plain `vdx ai` takes a focused one as it is,
   // and the rules it leaves out are not missing from it.
-  const focusedOf = deps.agentFocused ?? processFocused;
   const runningFocused = current ? focusedOf(current.proc.pid) : false;
   if (current && !opts.restart && runningFocused && !plan.focused) {
     plan = { ...prepared.replan(true), resumeArgs: plan.resumeArgs };
@@ -1471,8 +1596,9 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
   let choice: ConversationChoice | null = null;
   if (!current || opts.restart) {
     if (opts.conversation) choice = { args: resumeId(opts.conversation), lines: [] };
-    // A restart into a new conversation replaces the agent here: no second agent, nothing to ask.
-    else if (current && plan.resumeArgs.length === 0) choice = { args: [], lines: [] };
+    // A restart into a new conversation replaces the agent here, and a new one next to an agent here
+    // is what was asked for: the other machines are not asked.
+    else if ((current || alongside) && plan.resumeArgs.length === 0) choice = { args: [], lines: [] };
     else if (current && isClaude(plan.command)) {
       const live = liveConversationId(deps.env, deps.home, current.proc.pid);
       choice = live
@@ -1484,8 +1610,13 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
 
   const poolDirs = authorPoolDirs(environment, projectRoot, deps.home, profileDir);
   // Said before a start or an attach, never in the way: the agent runs, without those files.
-  const denied = (deps.platform ?? process.platform) === 'darwin' ? unreadableFolders(multiplexer === 'tmux' ? tmux : null, deps.home) : [];
-  const folders = denied.length ? foldersWarning(denied, multiplexer === 'tmux', environment.session?.folders_fix, deps.home) : [];
+  const denied =
+    (deps.platform ?? process.platform) === 'darwin'
+      ? unreadableFolders(multiplexer === 'tmux' ? tmux : null, deps.home)
+      : [];
+  const folders = denied.length
+    ? foldersWarning(denied, multiplexer === 'tmux', environment.session?.folders_fix, deps.home)
+    : [];
   if (opts.dryRun) {
     deps.out(renderPlan(plan, multiplexer, running, focusedOf));
     for (const l of choice?.lines ?? []) deps.out(`  conversation: ${l}\n`);
@@ -1497,7 +1628,9 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
   for (const l of folders) log(l);
   if (choice?.abort) return EXIT_LAUNCH_FAILED;
   if (choice?.elsewhere && !current) {
-    const answer = deps.interactive ? deps.ask(`Start a new conversation ${here}${atSeat ? ',' : ''} anyway? [y/N]: `) : null;
+    const answer = deps.interactive
+      ? deps.ask(`Start a new conversation ${here}${atSeat ? ',' : ''} anyway? [y/N]: `)
+      : null;
     if (!/^y(es)?$/i.test(answer?.trim() ?? '')) {
       log('nothing started');
       return EXIT_LAUNCH_FAILED;
@@ -1538,7 +1671,7 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
     const env = plan.focused ? { ...process.env, [FOCUSED_ENV_VAR]: '1' } : undefined;
     const startedAt = Date.now();
     let res = spawnSync(plan.command, [...plan.args, ...plan.resumeArgs], { cwd: projectRoot, stdio: 'inherit', env });
-    if ((res.error as NodeJS.ErrnoException | undefined)?.code === 'ENOENT') {
+    if (at(res.error, 'code') === 'ENOENT') {
       log(`vdx ai: \`${plan.command}\` not found on PATH`);
       return 127;
     }
@@ -1550,34 +1683,35 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
     return res.status ?? 1;
   }
 
-  if (running.length > 1) {
+  if (alongside) {
+    const others = running.map((r) => `${r.pane.session} ${r.pane.paneId}`).join(', ');
     log(
-      `note: ${running.length} panes run ${plan.command} in this project: ` +
-        `${running.map((r) => `${r.pane.session} ${r.pane.paneId}`).join(', ')} — using the first`,
+      `note: ${others} keep${running.length === 1 ? 's' : ''} running ${plan.command} — starting another one next to it, ` +
+        `in ${opts.conversation ? `conversation ${opts.conversation.slice(0, 8)}` : 'a new conversation'}`,
     );
   }
 
   if (current && !opts.restart) {
-    if (opts.fresh) log(`note: ${current.pane.session} already runs ${plan.command} — --new replaces it only with --restart`);
-    if (opts.conversation) {
-      const live = liveConversationId(deps.env, deps.home, current.proc.pid);
-      if (live !== opts.conversation) {
-        log(
-          `note: ${current.pane.session} is in ${live ? `conversation ${live.slice(0, 8)}` : 'another conversation'} — ` +
-            `to switch it: vdx ai --restart ${shellQuote(projectRoot)} --conversation ${opts.conversation}`,
-        );
-      }
+    if (current === unreadable) {
+      log(
+        `note: ${current.pane.session} runs ${plan.command} in a conversation vdx cannot read — attaching to it; ` +
+          `to switch it: vdx ai --restart ${shellQuote(projectRoot)} --conversation ${opts.conversation}`,
+      );
     }
     const unfocused = plan.focused && !runningFocused;
     const missing = unfocused ? [] : missingArgs(current.proc.args, plan.args);
     if (!unfocused && missing.length === 0) {
-      log(`✓ ${current.pane.session}: already running with the profile${runningFocused ? ', focused' : ''} — ${current.proc.args}`);
+      log(
+        `✓ ${current.pane.session}: already running with the profile${runningFocused ? ', focused' : ''} — ${current.proc.args}`,
+      );
       return finish(true, current.pane.session, current.pane.paneId, opts, deps);
     }
     // Drift. In a terminal the person picks: the agent as it runs, or a restart
     // with the profile; without one nothing is touched, and the fix is named.
     const drift = `${current.pane.session}: ${plan.command} is running${unfocused ? ', not focused' : ` without ${missing.join(' ')}`}`;
-    const fix = `vdx ai --restart${plan.focused ? ' --focused' : ''}${opts.fresh ? ' --new' : ''} ${shellQuote(projectRoot)}`;
+    const fix =
+      `vdx ai --restart${plan.focused ? ' --focused' : ''}${opts.fresh ? ' --new' : ''} ${shellQuote(projectRoot)}` +
+      (opts.conversation ? ` --conversation ${opts.conversation}` : '');
     const effect = plan.resumeArgs.length
       ? 'stops the running agent, then resumes its conversation'
       : opts.fresh
@@ -1589,7 +1723,9 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
       return EXIT_DRIFT;
     }
     log(`⚠ ${drift}`);
-    log(`  Enter  ${opts.detach ? 'leave it running' : 'attach to it'} as is${unfocused ? '' : ' — the flags wait for a restart'}`);
+    log(
+      `  Enter  ${opts.detach ? 'leave it running' : 'attach to it'} as is${unfocused ? '' : ' — the flags wait for a restart'}`,
+    );
     log(`  r      restart it ${unfocused ? 'focused' : 'with the profile'}: ${effect}`);
     log(`  q      leave it; later: ${fix}`);
     const answer = deps.ask(`${opts.detach ? 'Leave it as is' : 'Attach as is'}? [Enter/r/q]: `);
@@ -1601,13 +1737,22 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
       log('nothing done');
       return EXIT_DRIFT;
     }
+    // As --restart: the conversation the agent is in, not the folder's newest — another agent's, maybe.
+    const live = isClaude(plan.command) && plan.resumeArgs.length > 0 ? conversationOf(current) : null;
+    if (live) plan = { ...plan, resumeArgs: resumeId(live) };
   }
 
   if (current) {
     const line = agentLine(plan, [...plan.args, ...plan.resumeArgs]);
     log(`↻ ${current.pane.session} ${current.pane.paneId}: restarting — ${line}`);
     tmux.respawn(current.pane.paneId, projectRoot, tmuxShellCommand(line, deps.shell));
-    return finish(settleResumed(plan, current.pane.paneId, deps), current.pane.session, current.pane.paneId, opts, deps);
+    return finish(
+      settleResumed(plan, current.pane.paneId, deps),
+      current.pane.session,
+      current.pane.paneId,
+      opts,
+      deps,
+    );
   }
 
   if (opts.restart) log(`note: no running ${plan.command} in this project — starting one`);