@rho-workspace/rho 0.5.2 → 0.5.4

package/dist/conversation-presentation.js

@@ -1,3 +1,8 @@
+import { installText, readInstall } from './installs.js';
+// Only an explicit Agent limit report qualifies; an unknown outcome never does.
+export function agentTurnLimit(turn) {
+    return turn.state === 'failed' && (turn.result?.kind === 'error_max_turns' || turn.result?.reason === 'max_turn_requests' || /^(?:Internal error: )?Reached maximum number of turns \(\d+\)\.?$/i.test(turn.problem ?? ''));
+}
 const verbs = { read: 'Read', edit: 'Edited', write: 'Wrote', delete: 'Deleted', move: 'Moved', search: 'Searched', execute: 'Ran', fetch: 'Fetched', project: 'Called', agents: 'Used', plan: 'Updated', other: 'Used' };
 const byTool = {
     read: 'read', view: 'read', view_image: 'read', notebookread: 'read', bashoutput: 'read',
@@ -177,6 +182,10 @@ export function toolActivity(step, location, root, key) {
         targetKind = detail || location ? 'path' : 'text';
     }
     else if (action === 'execute') {
+        // A command that installs packages reads as what it installed; its command stays in the details.
+        const installed = detail ? readInstall(detail, step.output?.text) : null;
+        if (installed)
+            return { key: key ?? step.id ?? tool + '-' + step.at, step, action, verb: outcome === 'returned' ? 'Installed' : outcome === 'requested' ? 'Installing' : 'Tried to install', target: installText(installed), targetKind: 'packages', installed, title, location, outcome };
         target = detail ? displayCommand(detail) : (title && title.toLowerCase() !== tool.toLowerCase() ? title : null);
         targetKind = detail ? 'command' : 'text';
     }
@@ -195,17 +204,22 @@ export function toolActivity(step, location, root, key) {
     return { key: key ?? step.id ?? tool + '-' + step.at, step, action, verb, target, targetKind, title, location, outcome };
 }
 // Files are counted once however often the Agent touched them: nine edits of one script
-// are "Edited 1 file". Other actions count each time they happened.
+// are "Edited 1 file". Other actions count each time they happened. Installs are named by
+// their packages, "Installed pandas, statsmodels", and are not counted as commands.
 const onFiles = new Set(['read', 'edit', 'write', 'delete', 'move']);
 export function activitySummary(activities) {
     const seen = new Map();
     activities.forEach((activity, i) => {
-        const file = onFiles.has(activity.action) ? activity.location ?? activity.step.detail ?? activity.target : null;
-        const named = seen.get(activity.action) ?? new Set();
-        named.add(file ?? '#' + i);
-        seen.set(activity.action, named);
+        const group = activity.installed ? activity.verb : activity.action;
+        const file = activity.installed ? activity.installed.packages.map(p => p.name).join('\n') || 'packages from ' + activity.installed.from
+            : onFiles.has(activity.action) ? activity.location ?? activity.step.detail ?? activity.target : null;
+        const named = seen.get(group) ?? new Set();
+        for (const name of activity.installed ? file.split('\n') : [file ?? '#' + i])
+            named.add(name);
+        seen.set(group, named);
     });
-    const parts = [...seen].map(([action, named]) => summaries[action][named.size === 1 ? 0 : 1].replace('{n}', String(named.size)));
+    const listed = (names) => names.length > 3 ? names.slice(0, 3).join(', ') + ` and ${names.length - 3} more` : names.join(', ');
+    const parts = [...seen].map(([group, named]) => group in summaries ? summaries[group][named.size === 1 ? 0 : 1].replace('{n}', String(named.size)) : group + ' ' + listed([...named]));
     const count = (outcome) => activities.filter(a => a.outcome === outcome).length;
     const failed = count('failed'), refused = count('rejected'), unknown = count('unknown');
     if (failed)

package/dist/conversations.d.ts

@@ -17,8 +17,8 @@ export declare const conversationLimits: {
     idleMs: number;
     connectTimeoutMs: number;
     maxPermissions: number;
-    maxAgentTurns: number;
-    turnWallMs: number;
+    maxAgentTurns: number | undefined;
+    turnWallMs: number | undefined;
     maxOutputBytes: number;
     maxLineBytes: number;
     stopGraceMs: number;
@@ -41,7 +41,11 @@ interface Permission extends AgentPermission {
 }
 export interface ConversationConfig {
     settingsFile?: string;
-    backend?: 'claude-acp' | 'codex-acp' | 'claude-cli';
+    backend?: 'claude-acp' | 'codex-acp' | 'claude-cli' | 'acp';
+    acpCommand?: {
+        file: string;
+        args: string[];
+    };
     codex?: string;
     codexAcp?: Omit<CodexAcpOptions, 'cwd' | 'mcpServers' | 'limits' | 'sessionId' | 'codex' | 'observation' | 'observe'>;
     claudeAcp?: Omit<ClaudeAcpOptions, 'cwd' | 'mcpServers' | 'limits' | 'sessionId' | 'claude' | 'observation' | 'observe'>;
@@ -101,6 +105,7 @@ interface Turn {
         at: string;
         earlier: string;
     };
+    continuationOf?: string;
 }
 interface Decision {
     changeId: string;
@@ -124,7 +129,7 @@ interface FileChange {
     modifiedAt: string | null;
     bytes: number | null;
 }
-type Backend = 'claude-acp' | 'codex-acp';
+type Backend = 'claude-acp' | 'codex-acp' | 'acp';
 type Choices = Record<string, string | boolean>;
 interface Offered {
     at: string;
@@ -221,6 +226,7 @@ export declare class Conversations {
         trashed?: boolean;
     }): Promise<{
         state: string;
+        waitingPermission: boolean;
         conversationId: string;
         title: string;
         client: string;
@@ -230,6 +236,7 @@ export declare class Conversations {
         version: number;
         turns: number;
         lastAt: string;
+        turnLimit?: boolean;
         backend?: string;
         agentTitle?: string | null;
         adapter?: {
@@ -282,6 +289,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -291,6 +299,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -317,6 +326,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -326,6 +336,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -360,6 +371,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -369,6 +381,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -397,10 +410,11 @@ export declare class Conversations {
     private sessionObservation;
     work(project: Project, limit?: number): Promise<{
         sessions: {
-            backend: "claude-acp" | "codex-acp" | "claude-cli";
+            backend: "acp" | "claude-acp" | "codex-acp" | "claude-cli";
             sessionId: string | null;
             observation: SessionObservation | null;
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -410,6 +424,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             agentTitle?: string | null;
             adapter?: {
                 name: string;
@@ -439,6 +454,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -448,6 +464,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -475,9 +492,11 @@ export declare class Conversations {
         changeId: string;
         text: string;
         contexts?: string[];
+        continuationOf?: string;
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -487,6 +506,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -516,6 +536,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -525,6 +546,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -556,7 +578,7 @@ export declare class Conversations {
         version: number;
         updatedAt: string | null;
         backend: Backend | null;
-        serviceBackend: "claude-acp" | "codex-acp" | "claude-cli";
+        serviceBackend: "acp" | "claude-acp" | "codex-acp" | "claude-cli";
         choices: Partial<Record<Backend, Choices>>;
         offered: Partial<Record<Backend, Offered>>;
         checking: Backend[];
@@ -575,7 +597,7 @@ export declare class Conversations {
         version: number;
         updatedAt: string | null;
         backend: Backend | null;
-        serviceBackend: "claude-acp" | "codex-acp" | "claude-cli";
+        serviceBackend: "acp" | "claude-acp" | "codex-acp" | "claude-cli";
         choices: Partial<Record<Backend, Choices>>;
         offered: Partial<Record<Backend, Offered>>;
         checking: Backend[];
@@ -589,7 +611,7 @@ export declare class Conversations {
         version: number;
         updatedAt: string | null;
         backend: Backend | null;
-        serviceBackend: "claude-acp" | "codex-acp" | "claude-cli";
+        serviceBackend: "acp" | "claude-acp" | "codex-acp" | "claude-cli";
         choices: Partial<Record<Backend, Choices>>;
         offered: Partial<Record<Backend, Offered>>;
         checking: Backend[];
@@ -605,6 +627,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -614,6 +637,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -645,6 +669,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -654,6 +679,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {
@@ -684,6 +710,7 @@ export declare class Conversations {
     }): Promise<{
         conversation: {
             state: string;
+            waitingPermission: boolean;
             conversationId: string;
             title: string;
             client: string;
@@ -693,6 +720,7 @@ export declare class Conversations {
             version: number;
             turns: number;
             lastAt: string;
+            turnLimit?: boolean;
             backend?: string;
             agentTitle?: string | null;
             adapter?: {

package/dist/conversations.js

@@ -1,7 +1,7 @@
 import { projectPath, commandFiles, buildWorkGraph } from './work-graph.js';
 import { notesInstructions, projectNotesPath } from './project-notes.js';
 import { addSpend, describeLimits, describable, fileFacts, figureContext, raster } from './file-describer.js';
-import { toolActivity } from './conversation-presentation.js';
+import { agentTurnLimit, displayCommand, toolActivity } from './conversation-presentation.js';
 import { privateEvidencePath } from './evidence-capture.js';
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
@@ -10,6 +10,10 @@ import { fileURLToPath } from 'node:url';
 import { atomicJson, canonical, digest, Fault, now, readJson, requireThat } from '@rho-workspace/plugin-contracts';
 // Rho holds user messages and their original identities. The selected Agent plugin
 // owns the connection, native session and protocol. Reads never start a driver.
+// A new Claude Code session opens in Manual mode unless the person's Claude settings name another.
+// Rho prefers Auto ("Claude handles permission decisions"); a mode chosen in Rho or in those
+// settings stays, and a model without Auto falls back to Accept edits with the adapter's warning.
+const claudePreferred = { mode: { value: 'auto', replaces: ['default'] } };
 export const conversationLimits = {
     // Conversations kept per project, not counting the trash; starting or restoring another is
     // refused. The trash keeps as many again; past that, moving one there is refused.
@@ -38,10 +42,12 @@ export const conversationLimits = {
     maxConnections: 4, idleMs: 300000, connectTimeoutMs: 60000,
     // Permission requests kept per message; later requests are declined.
     maxPermissions: 32,
-    // Claude Code's own step limit (--max-turns) for one message.
-    maxAgentTurns: 64,
-    // One message's wall time; past it cancellation is requested, then confirmed or unknown.
-    turnWallMs: 1800000,
+    // Claude Code's own step limit (--max-turns) for one message. None unless configured: a long
+    // analysis stopped at 64 steps midway (P3, 2026-11-02), and the person stops a message at will.
+    maxAgentTurns: undefined,
+    // One message's wall time; past it cancellation is requested, then confirmed or unknown. None
+    // unless configured, for the same reason.
+    turnWallMs: undefined,
     // What Claude Code may write for one message, and in one record; past either it is stopped.
     maxOutputBytes: 33554432, maxLineBytes: 4194304,
     // Between asking a process to stop and forcing it.
@@ -121,7 +127,7 @@ function compare(before, after, limit) {
     changed.sort((a, b) => (a.modifiedAt ?? '\uffff').localeCompare(b.modifiedAt ?? '\uffff') || a.path.localeCompare(b.path));
     return { changed: changed.slice(0, limit), omitted: Math.max(0, changed.length - limit), partial };
 }
-const backends = ['claude-acp', 'codex-acp'];
+const backends = ['claude-acp', 'codex-acp', 'acp'];
 const blankSettings = () => ({ format: 1, version: 0, updatedAt: null, backend: null, choices: {}, offered: {} });
 const acpDriver = (driver) => !!driver && 'configure' in driver;
 const identity = /^c-[a-f0-9]{16}$/;
@@ -190,7 +196,7 @@ export class Conversations {
         this.limits = { ...conversationLimits, ...limits };
         for (const key of ['maxCaptureFiles', 'maxCaptureBytes', 'maxSnapshotBytes', 'maxCaptureConcurrent'])
             requireThat(Number.isSafeInteger(this.limits[key]) && this.limits[key] > 0 && this.limits[key] <= conversationLimits[key], 'invalid', 'Capture budgets must be positive integers no greater than the supported defaults.', { limit: key, maximum: conversationLimits[key] });
-        requireThat(!config.backend || ['claude-acp', 'codex-acp', 'claude-cli'].includes(config.backend), 'invalid', 'Choose claude-acp, codex-acp or claude-cli.');
+        requireThat(!config.backend || ['claude-acp', 'codex-acp', 'claude-cli', 'acp'].includes(config.backend), 'invalid', 'Choose claude-acp, codex-acp, claude-cli or acp.');
     }
     serial(key, run) {
         const task = (this.queues.get(key) ?? Promise.resolve()).catch(() => { }).then(run);
@@ -226,7 +232,7 @@ export class Conversations {
         const last = c.turns.at(-1), usage = c.observation?.usage;
         const costs = c.turns.map(t => t.result?.costUsd).filter((v) => typeof v === 'number');
         return { conversationId: c.id, changeId: c.changeId, requestDigest: c.requestDigest, title: c.title, client: c.client, principal: c.principal, createdAt: c.createdAt, updatedAt: c.updatedAt, version: c.version, turns: c.turns.length, state: last?.state ?? 'idle', lastAt: last?.endedAt ?? last?.sentAt ?? c.createdAt,
-            listed: 1, backend: c.backend ?? 'claude-cli', agentTitle: c.observation?.info?.title ?? null, adapter: c.adapter ?? null, model: [...c.turns].reverse().find(t => t.model)?.model ?? null, config: c.config ?? {},
+            listed: 2, turnLimit: !!last && agentTurnLimit(last), waitingPermission: last?.state === 'running' && !!last.permissions?.some(p => p.state === 'pending'), backend: c.backend ?? 'claude-cli', agentTitle: c.observation?.info?.title ?? null, adapter: c.adapter ?? null, model: [...c.turns].reverse().find(t => t.model)?.model ?? null, config: c.config ?? {},
             usage: usage ? { used: usage.used, size: usage.size, cost: usage.cost ?? null } : null, costUsd: costs.length ? costs.reduce((a, b) => a + b, 0) : null,
             sessionId: c.acpSessionId ?? c.nativeSessionId ?? null, trashedAt: c.trashedAt ?? null };
     }
@@ -263,7 +269,7 @@ export class Conversations {
     listed(project, s) {
         const live = [...this.live.values()].some(x => x.project.id === project.id && x.conversation.id === s.conversationId);
         const { changeId, requestDigest, listed, ...shown } = s;
-        return { ...shown, state: s.state === 'running' && !live ? 'unknown' : s.state };
+        return { ...shown, state: s.state === 'running' && !live ? 'unknown' : s.state, waitingPermission: live && !!s.waitingPermission };
     }
     message(text) {
         requireThat(typeof text === 'string' && text.trim().length > 0, 'invalid', 'Write a message first.');
@@ -280,17 +286,17 @@ export class Conversations {
     // The project's conversations, or those in its trash.
     async list(project, input = {}) {
         let index = await this.index(project);
-        if (index.conversations.some(s => !s.listed))
+        if (index.conversations.some(s => s.listed !== 2))
             index = await this.serial(project.id, () => this.relist(project));
         return index.conversations.filter(s => !!s.trashedAt === !!input.trashed).map(s => this.listed(project, s)).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
     }
     // Summaries written before lists carried their fields are rebuilt from the records once.
     async relist(project) {
         const index = await this.index(project);
-        if (!index.conversations.some(s => !s.listed))
+        if (!index.conversations.some(s => s.listed !== 2))
             return index;
-        const conversations = await Promise.all(index.conversations.map(async (s) => s.listed ? s
-            : await this.load(project, s.conversationId).then(c => this.summary(c), () => ({ ...s, listed: 1 }))));
+        const conversations = await Promise.all(index.conversations.map(async (s) => s.listed === 2 ? s
+            : await this.load(project, s.conversationId).then(c => this.summary(c), () => ({ ...s, listed: 2 }))));
         const next = { ...index, conversations };
         await atomicJson(path.join(await this.folder(project), 'index.json'), next);
         return next;
@@ -402,7 +408,7 @@ export class Conversations {
             const saved = await this.readSettings();
             const backend = input.backend ?? saved.backend ?? this.config.backend ?? 'claude-acp';
             const config = backend === 'claude-cli' ? undefined : input.config ?? saved.choices[backend];
-            const at = now(), c = { format: 2, backend, id: 'c-' + randomBytes(8).toString('hex'), changeId: input.changeId, requestDigest, createdAt: at, createdBy: by, updatedAt: at, version: 0, client: backend === 'codex-acp' ? 'codex' : 'claude-code', nativeSessionId: backend === 'claude-cli' ? randomUUID() : null, confirmed: false, principal: null, title: titleOf(text), turns: [], ...(config && Object.keys(config).length ? { config } : {}) };
+            const at = now(), c = { format: 2, backend, id: 'c-' + randomBytes(8).toString('hex'), changeId: input.changeId, requestDigest, createdAt: at, createdBy: by, updatedAt: at, version: 0, client: backend === 'codex-acp' ? 'codex' : backend === 'acp' ? 'acp' : 'claude-code', nativeSessionId: backend === 'claude-cli' ? randomUUID() : null, confirmed: false, principal: null, title: titleOf(text), turns: [], ...(config && Object.keys(config).length ? { config } : {}) };
             for (const id of input.contexts ?? [])
                 await this.ports.context?.(project, id);
             const turn = this.turn(input.changeId, requestDigest, by, text, 1);
@@ -416,7 +422,7 @@ export class Conversations {
         });
     }
     async send(project, by, input) {
-        const text = this.message(input.text), requestDigest = digest(canonical({ text, ...(input.contexts?.length ? { contexts: input.contexts } : {}) }));
+        const text = this.message(input.text), requestDigest = digest(canonical({ text, ...(input.contexts?.length ? { contexts: input.contexts } : {}), ...(input.continuationOf ? { continuationOf: input.continuationOf } : {}) }));
         return this.serial(project.id, async () => {
             const c = await this.load(project, input.conversationId), existing = c.turns.find(t => t.changeId === input.changeId);
             if (existing) {
@@ -425,6 +431,8 @@ export class Conversations {
             }
             requireThat(!c.trashedAt, 'conflict', 'This conversation is in the trash. Restore it to continue.');
             const last = c.turns.at(-1);
+            if (input.continuationOf)
+                requireThat(last?.id === input.continuationOf && agentTurnLimit(last), 'condition', 'That message is not the latest confirmed Agent turn-limit stop. Nothing was continued.');
             requireThat(!last || last.state !== 'running' || !this.liveTurn(project, c, last), 'conflict', 'The Agent is still answering the previous message. Wait for it, or stop it, before sending another.');
             if (last?.state === 'running' && last.pid) {
                 let alive = false;
@@ -444,6 +452,8 @@ export class Conversations {
             for (const id of input.contexts ?? [])
                 await this.ports.context?.(project, id);
             const turn = this.turn(input.changeId, requestDigest, by, text, c.turns.length + 1);
+            if (input.continuationOf)
+                turn.continuationOf = input.continuationOf;
             if (input.contexts?.length)
                 turn.contexts = [...input.contexts];
             c.turns.push(turn);
@@ -458,7 +468,7 @@ export class Conversations {
         this.choices({ [input.configId]: input.value });
         return this.serial(project.id, async () => {
             const c = await this.load(project, input.conversationId), last = c.turns.at(-1);
-            requireThat(c.backend === 'claude-acp' || c.backend === 'codex-acp', 'unavailable', 'This conversation\'s Agent has no settings Rho can change.');
+            requireThat(c.backend === 'claude-acp' || c.backend === 'codex-acp' || c.backend === 'acp', 'unavailable', 'This conversation\'s Agent has no settings Rho can change.');
             requireThat(!c.trashedAt, 'conflict', 'This conversation is in the trash. Restore it to change its settings.');
             requireThat(!last || last.state !== 'running' || !this.liveTurn(project, c, last), 'conflict', 'The Agent is answering. Change its settings after this message.');
             const driver = this.drivers.get(project.id + '/' + c.id)?.driver;
@@ -548,9 +558,9 @@ export class Conversations {
         return this.settings();
     }
     async inspect(project, backend) {
-        const { ClaudeAcpConversation, CodexAcpConversation } = await import('@rho-workspace/plugin-agent/conversation');
+        const { ClaudeAcpConversation, CodexAcpConversation, GenericAcpConversation } = await import('@rho-workspace/plugin-agent/conversation');
         const common = { cwd: project.root, mcpServers: [], limits: this.limits };
-        const driver = backend === 'codex-acp' ? new CodexAcpConversation({ ...this.config.codexAcp, ...common, codex: this.config.codex }) : new ClaudeAcpConversation({ ...this.config.claudeAcp, ...common, claude: this.binary });
+        const driver = backend === 'codex-acp' ? new CodexAcpConversation({ ...this.config.codexAcp, ...common, codex: this.config.codex }) : backend === 'acp' ? new GenericAcpConversation({ ...common, command: this.config.acpCommand }) : new ClaudeAcpConversation({ preferred: claudePreferred, ...this.config.claudeAcp, ...common, claude: this.binary });
         let found;
         try {
             found = await driver.inspect();
@@ -740,11 +750,11 @@ export class Conversations {
             const grant = await this.ports.grant(project, c);
             c.principal = grant.principal;
             const mcpServers = [{ name: 'rho', command: process.execPath, args: [fileURLToPath(import.meta.resolve('@rho-workspace/plugin-agent/mcp'))], env: [{ name: 'RHO_AGENT_CONNECTION', value: grant.file }] }];
-            const { ClaudeAcpConversation, CodexAcpConversation, ClaudeCliConversation } = await import('@rho-workspace/plugin-agent/conversation');
+            const { ClaudeAcpConversation, CodexAcpConversation, ClaudeCliConversation, GenericAcpConversation } = await import('@rho-workspace/plugin-agent/conversation');
             const observed = { observation: c.observation, observe: (observation) => {
                     requireThat(observation.sessionId === c.acpSessionId, 'conflict', 'The observed Agent session differs from the retained identity.');
                     requireThat(Buffer.byteLength(JSON.stringify(observation)) <= this.limits.maxObservationBytes, 'limit', 'The session projection exceeded maxObservationBytes; prior observations were kept.');
-                    const config = observation.config, learned = config && config.at !== c.observation?.config?.at && config.origin === 'initial' && !c.config && (c.backend === 'claude-acp' || c.backend === 'codex-acp');
+                    const config = observation.config, learned = config && config.at !== c.observation?.config?.at && config.origin === 'initial' && !c.config && (c.backend === 'claude-acp' || c.backend === 'codex-acp' || c.backend === 'acp');
                     c.observation = observation;
                     this.schedule(project, c);
                     for (const live of this.live.values())
@@ -764,8 +774,10 @@ export class Conversations {
             const driver = c.backend === 'codex-acp'
                 ? new CodexAcpConversation({ ...this.config.codexAcp, ...common, codex: this.config.codex })
                 : c.backend === 'claude-acp'
-                    ? new ClaudeAcpConversation({ ...this.config.claudeAcp, ...common, claude: this.binary, plugins: [...this.config.claudeAcp?.plugins ?? [], ...await this.ports.claudePlugins?.(project) ?? []] })
-                    : new ClaudeCliConversation({ cwd: project.root, binary: this.binary, sessionId: c.nativeSessionId, confirmed: c.confirmed, projectName: project.name ?? path.basename(project.root), mcpServers, limits: this.limits, instructions });
+                    ? new ClaudeAcpConversation({ preferred: claudePreferred, ...this.config.claudeAcp, ...common, claude: this.binary, plugins: [...this.config.claudeAcp?.plugins ?? [], ...await this.ports.claudePlugins?.(project) ?? []] })
+                    : c.backend === 'acp'
+                        ? new GenericAcpConversation({ ...common, command: this.config.acpCommand })
+                        : new ClaudeCliConversation({ cwd: project.root, binary: this.binary, sessionId: c.nativeSessionId, confirmed: c.confirmed, projectName: project.name ?? path.basename(project.root), mcpServers, limits: this.limits, instructions });
             this.drivers.set(key, { driver, project, conversation: c });
             return driver;
         });
@@ -885,8 +897,9 @@ export class Conversations {
                 const action = toolActivity(incoming, null, project.root);
                 if (action.targetKind === 'path' && (action.location || incoming.detail))
                     this.capture(live, action.location ?? incoming.detail, 'step:' + incoming.id + ':' + incoming.outcome);
-                if (action.targetKind === 'command' && action.target)
-                    for (const file of commandFiles(action.target, project))
+                // A command's files are captured however its row reads (an install names its packages).
+                if (action.action === 'execute' && incoming.detail)
+                    for (const file of commandFiles(displayCommand(incoming.detail), project))
                         this.capture(live, file, 'command:' + incoming.id + ':' + incoming.outcome);
             }
             if (!kept)
@@ -914,11 +927,12 @@ export class Conversations {
             turn.problem = e instanceof Fault ? e.message : 'Rho could not connect this conversation to the project.';
             return;
         }
-        const wall = setTimeout(() => live.stop('wall-limit', 'rho'), this.limits.turnWallMs);
-        wall.unref();
+        const wall = this.limits.turnWallMs === undefined ? undefined : setTimeout(() => live.stop('wall-limit', 'rho'), this.limits.turnWallMs);
+        wall?.unref();
         const ticking = setInterval(() => void this.describe(live), this.describing.everyMs);
         ticking.unref();
         try {
+            let attached = false;
             const send = (utterance) => driver.run({ text: utterance, signal: controller.signal,
                 session: identity => this.serial(project.id, async () => {
                     requireThat(!identity.acpSessionId || !c.acpSessionId || identity.acpSessionId === c.acpSessionId, 'conflict', 'The original ACP session identity changed.');
@@ -926,6 +940,7 @@ export class Conversations {
                     Object.assign(c, identity);
                     c.confirmed = true;
                     await this.write(project, c);
+                    attached = true;
                 }),
                 event: event => this.observe(live, event),
                 permission: async (request) => {
@@ -950,13 +965,13 @@ export class Conversations {
                     }
                 }
             });
-            const utterance = turn.text + (turn.contexts?.length ? '\n\nRead these exact frozen review contexts with context.read before responding: ' + turn.contexts.join(', ') + '. Reply with annotation.reply and explicit result resource versions.' : '');
+            const utterance = turn.text + (turn.continuationOf ? '\n\nOriginal task:\n' + c.turns[0].text : '') + (turn.contexts?.length ? '\n\nRead these exact frozen review contexts with context.read before responding: ' + turn.contexts.join(', ') + '. Reply with annotation.reply and explicit result resource versions.' : '');
             // The Agent's session ended with its process: after Rho restarts, and on a machine that
             // never ran the session a project was copied from. The messages Rho kept are the record, so
             // the message runs in a new session told what was said before. Nothing is resent as a new
             // request, and the turn names the session it replaced. An Agent reports a session it no
             // longer has as a failed completion rather than a thrown request, so both are read alike.
-            const stale = (completion) => !!c.acpSessionId && !controller.signal.aborted && completion.state === 'failed' && lostSession(completion.problem ?? '');
+            const stale = (completion) => !!c.acpSessionId && !attached && !controller.signal.aborted && completion.state === 'failed' && lostSession(completion.problem ?? '');
             const again = async () => {
                 const earlier = c.acpSessionId;
                 await this.retire(project.id + '/' + c.id);
@@ -973,9 +988,12 @@ export class Conversations {
                 completion = await send(utterance);
                 if (stale(completion))
                     completion = await again();
+                else if (attached && completion.state === 'failed' && lostSession(completion.problem ?? '')) {
+                    completion = { ...completion, state: 'unknown', problem: 'The Agent reported that its session was unavailable after this message was sent. The outcome is unknown; the message was not sent again.' };
+                }
             }
             catch (error) {
-                if (!c.acpSessionId || !lostSession(error) || controller.signal.aborted)
+                if (!c.acpSessionId || attached || !lostSession(error) || controller.signal.aborted)
                     throw error;
                 completion = await again();
             }
@@ -1053,7 +1071,8 @@ export class Conversations {
         const given = shown.get(file);
         const reason = !enabled ? 'Descriptions by a model are switched off; the facts are kept.'
             : c.backend === 'codex-acp' ? 'Descriptions are written with Claude Code; this session\'s Agent is Codex.'
-                : !this.ports.describe ? 'No model is set up to describe files.' : null;
+                : c.backend === 'acp' ? 'Descriptions are written with Claude Code; this session\'s Agent is a configured ACP agent.'
+                    : !this.ports.describe ? 'No model is set up to describe files.' : null;
         const keep = (why) => { if (record.reason !== why) {
             record.state = record.sentence ? 'described' : 'facts';
             record.reason = why;

package/dist/installs.d.ts

@@ -0,0 +1,11 @@
+export interface Installed {
+    tool: string;
+    packages: Array<{
+        name: string;
+        version: string | null;
+    }>;
+    more: number;
+    from: string | null;
+}
+export declare function readInstall(command: string, printed?: string | null): Installed | null;
+export declare function installText(installed: Installed): string;