@berthdev/berth 0.3.6 → 0.4.3

package/dist/src/restore/ensure.js

@@ -1,57 +1,191 @@
-import { existsSync } from 'node:fs';
-import { delimiter, join } from 'node:path';
-import { launchCommand, resumeCommand, requireAdapter } from '../agents/commands.js';
-import { shellSplit } from '../shell.js';
+import { ARGUMENTS_UNAVAILABLE } from '../registry/discover.js';
+import { applyLaunchEnvironment, captureProfile, profileAtRoot, readProfile } from '../agents/profile.js';
+import { recordIdentity, nameCollision, COLLISION_HINT } from '../snapshot/identity.js';
+import { withPlaceholder } from '../registry/launch.js';
+import { usableDirectory } from '../registry/directory.js';
+import { wasClosed, serverOwnerAlive } from '../snapshot/lifecycle.js';
+import { existsSync, statSync } from 'node:fs';
+import { executableOnPath } from '../tools.js';
+import { keptArgs, recoveryOptionsRequired, launchCommand, resumeCommand, requireAdapter } from '../agents/commands.js';
+import { shellQuote, shellSplit } from '../shell.js';
+import { recoveryStatus } from './status.js';
+import { BerthError } from '../errors.js';
+import { takeSnapshot } from '../snapshot/take.js';
 import { withLock } from './lock.js';
-function onPath(binary, env = process.env) {
-    if (!binary)
-        return true;
-    if (binary.includes('/'))
-        return existsSync(binary);
-    return (env.PATH ?? '').split(delimiter).some((dir) => dir && existsSync(join(dir, binary)));
-}
 function selected(s, options) {
+    if (options.ownerWorkspace && s.ownerWorkspace !== options.ownerWorkspace)
+        return false;
     if (options.session && s.name !== options.session)
         return false;
     if (options.origin && options.origin !== 'all' && s.origin !== options.origin)
         return false;
     return true;
 }
-function rebuild(ctx, s) {
-    if (!existsSync(s.cwd))
+function prepare(ctx, s) {
+    if (s.bindingIssue)
+        return { name: s.name, outcome: 'skipped-binding-conflict', detail: s.bindingIssue };
+    if (!usableDirectory(s.cwd))
         return { name: s.name, outcome: 'skipped-missing-cwd', detail: s.cwd };
     const adapter = requireAdapter(s.agent);
+    if (s.agent !== 'shell' && !s.conversation)
+        return { name: s.name, outcome: 'skipped-unbound', detail: 'Use the agent native conversation picker, or explicitly start a new session.' };
+    if (s.agent !== 'shell' && !readProfile(s.agent, s.profile))
+        return { name: s.name, outcome: 'skipped-unknown-profile', detail: 'Choose the agent profile for this saved conversation (Choose Recovery Profile, or berth recovery-profile <session> --root <directory>).' };
+    if (recoveryOptionsRequired(s.agent, s.argv, s.argvVerified))
+        return { name: s.name, outcome: 'skipped-unverified-arguments', detail: 'Saved launch options need review. Use Review Recovery Options or berth recovery-options <session> -- <options>.' };
     const input = { adapter, name: s.name, cwd: s.cwd, overrides: ctx.config.agents };
-    const resumed = s.conversation
-        ? resumeCommand({ ...input, conversation: s.conversation, originalArgv: s.argv })
-        : undefined;
-    let command = resumed ?? launchCommand({ ...input, extraArgs: [] });
-    let outcome = resumed ? 'resumed' : 'launched';
+    const command = s.agent === 'shell' ? launchCommand(input) : resumeCommand({ ...input, conversation: s.conversation, originalArgv: s.argv });
+    if (command === undefined)
+        return { name: s.name, outcome: 'skipped-unsupported-resume', detail: 'This agent has no exact-ID resume command.' };
     const [binary] = command ? shellSplit(command) : [''];
-    if (!onPath(binary ?? '')) {
-        command = '';
-        outcome = 'shell';
-    }
-    ctx.tmux.newSession(s.name, s.cwd, command);
-    ctx.tmux.setMeta(s.name, {
-        agent: s.agent,
-        cwd: s.cwd,
-        argv: s.argv,
-        conversation: s.conversation || undefined,
-        origin: s.origin,
+    if (binary && !executableOnPath(binary, ctx.env, s.cwd))
+        return { name: s.name, outcome: 'skipped-missing-binary', detail: `Install ${binary}, then retry.` };
+    return { command };
+}
+function rebuild(ctx, s) {
+    const prepared = prepare(ctx, s);
+    if (!('command' in prepared))
+        return prepared;
+    const { command } = prepared;
+    const adapter = requireAdapter(s.agent);
+    // Register expected identity before the agent can emit its start hook.
+    return withPlaceholder(ctx, s.name, s.cwd, () => {
+        const profile = readProfile(s.agent, s.profile);
+        if (profile)
+            applyLaunchEnvironment(ctx, s.name, s.agent, profile);
+        ctx.tmux.setMeta(s.name, {
+            profile: profile ? JSON.stringify(profile) : undefined,
+            agent: s.agent, cwd: s.cwd, argv: s.argv, argvVerified: s.argvVerified ? '1' : undefined, restoreSource: recordIdentity(s),
+            conversation: s.conversation || undefined, origin: s.origin, ownerWorkspace: s.ownerWorkspace,
+            ...(s.agent === 'shell' ? {} : {
+                recovery: adapter.events.start.length ? 'requested' : 'unconfirmed',
+                recoveryAt: String(Date.now()),
+                recoveryDetail: adapter.events.start.length ? 'Waiting for the expected conversation.' : 'This agent cannot acknowledge recovery. Inspect the terminal.',
+            }),
+        });
+        ctx.tmux.setTitle(s.name);
+        if (s.agent !== 'shell')
+            ctx.tmux.run(['set-option', '-w', '-t', `=${s.name}:`, 'remain-on-exit', 'on']);
+        ctx.tmux.run(['respawn-pane', '-k', '-t', `=${s.name}:`, ...(command ? [command] : [])]);
+        return { name: s.name, outcome: s.agent === 'shell' ? 'launched' : 'resume-requested' };
     });
-    ctx.tmux.setTitle(s.name);
-    return { name: s.name, outcome, detail: outcome === 'shell' ? `${binary} not found` : undefined };
 }
-/** Rebuild missing managed sessions from a snapshot; live ones are left alone. */
-export function restoreFrom(ctx, snapshot, options = {}) {
+/** A failed attempt never turns an owned placeholder into a successful recovery. */
+function attempt(ctx, s) {
+    try {
+        if (ctx.tmux.hasSession(s.name)) {
+            const live = ctx.tmux.listSessions().find((session) => session.name === s.name);
+            if (live)
+                return { name: s.name, outcome: nameCollision(ctx, live, [s]) ? 'skipped-name-conflict' : 'skipped-live' };
+        }
+        return rebuild(ctx, s);
+    }
+    catch (error) {
+        return { name: s.name, outcome: 'failed', detail: error.message };
+    }
+}
+function restoreSelected(ctx, snapshot, options) {
     if (!snapshot)
         return [];
-    return withLock(ctx.config.stateDir, () => snapshot.sessions
-        .filter((s) => selected(s, options))
-        .map((s) => (ctx.tmux.hasSession(s.name) ? { name: s.name, outcome: 'skipped-live' } : rebuild(ctx, s))), options.lockTimeoutMs);
+    const live = new Set(ctx.tmux.listSessions().map((session) => session.name));
+    const sessions = snapshot.sessions.filter((s) => selected(s, options) && !wasClosed(ctx, s)
+        && (live.has(s.name) || s.recovery === 'failed' || !serverOwnerAlive(ctx, s.serverStart)));
+    const results = sessions.map((s) => attempt(ctx, s));
+    const pending = sessions.flatMap((s, index) => results[index].outcome === 'failed'
+        ? [{ ...s, sessionId: undefined, recovery: 'failed', recoveryDetail: results[index].detail }] : []);
+    if (pending.length || results.some((r) => r.outcome === 'resume-requested' || r.outcome === 'launched')) {
+        takeSnapshot(ctx, new Date(), [], pending);
+    }
+    return results;
+}
+/** Explicit restore uses its chosen snapshot; ensure reads latest inside the lock. */
+export function restoreFrom(ctx, snapshot, options = {}) {
+    return withLock(ctx.config.stateDir, () => restoreSelected(ctx, snapshot, options), options.lockTimeoutMs);
 }
 export function ensure(ctx, options = {}) {
-    return restoreFrom(ctx, ctx.store.newest(), options);
+    return withLock(ctx.config.stateDir, () => restoreSelected(ctx, ctx.store.newest(), options), options.lockTimeoutMs);
+}
+/** Replace only an explicitly failed/unconfirmed attempt, keeping its exact target. */
+export function retryRecovery(ctx, name) {
+    return withLock(ctx.config.stateDir, () => {
+        const live = ctx.tmux.listSessions().find((session) => session.name === name);
+        if (live && nameCollision(ctx, live, ctx.store.newest()?.sessions ?? [])) {
+            return { name, outcome: 'skipped-name-conflict', detail: COLLISION_HINT };
+        }
+        if (live) {
+            const status = recoveryStatus(ctx.tmux, name, live.meta).recovery;
+            if (status !== 'failed' && status !== 'unconfirmed')
+                throw new BerthError('This session has no failed or unconfirmed recovery to retry.');
+            takeSnapshot(ctx);
+        }
+        const saved = ctx.store.newest()?.sessions.find((session) => session.name === name);
+        if (!saved)
+            throw new BerthError(`No recovery record for ${name}. Refresh the list.`);
+        const prepared = prepare(ctx, saved);
+        if (!('command' in prepared))
+            return prepared;
+        if (live)
+            ctx.tmux.killSession(name);
+        const result = attempt(ctx, saved);
+        takeSnapshot(ctx, new Date(), [], result.outcome === 'failed' ? [{ ...saved, sessionId: undefined, recovery: 'failed', recoveryDetail: result.detail }] : []);
+        return result;
+    }, 3000);
+}
+/** Relocate one stopped recovery record without changing its conversation identity. */
+export function relocateRecovery(ctx, name, cwd) {
+    if (!existsSync(cwd) || !statSync(cwd).isDirectory())
+        throw new BerthError('Choose an existing folder.');
+    withLock(ctx.config.stateDir, () => {
+        if (ctx.tmux.hasSession(name))
+            throw new BerthError('End the live session before changing its recovery folder.');
+        const saved = ctx.store.newest();
+        if (!saved?.sessions.some((session) => session.name === name))
+            throw new BerthError(`No recovery record for ${name}.`);
+        const sessions = saved.sessions.map((session) => session.name === name ? { ...session, cwd } : session);
+        const scrollback = retainedScrollback(ctx, saved, sessions);
+        ctx.store.write(sessions, scrollback);
+    }, 3000);
+}
+/** Explicitly choose a stopped conversation's profile; never infer it from the host. */
+export function setRecoveryProfile(ctx, name, root) {
+    return withLock(ctx.config.stateDir, () => {
+        if (ctx.tmux.hasSession(name))
+            throw new BerthError('Profile changes require a stopped session. A live agent reports its profile through its start hook.');
+        const saved = ctx.store.newest();
+        const record = saved?.sessions.find((session) => session.name === name);
+        if (!saved || !record || record.agent === 'shell')
+            throw new BerthError('No saved agent conversation for this session.');
+        if (root && !usableDirectory(root))
+            throw new BerthError('Choose an existing accessible agent profile folder.');
+        const profile = root ? profileAtRoot(record.agent, ctx.env, root) : captureProfile(record.agent, ctx.env);
+        const sessions = saved.sessions.map((session) => session.name === name ? { ...session, profile } : session);
+        const scrollback = retainedScrollback(ctx, saved, sessions);
+        ctx.store.write(sessions, scrollback);
+        return profile;
+    });
+}
+/** Explicitly replace only the options an adapter can preserve on resume. */
+export function setRecoveryOptions(ctx, name, options) {
+    withLock(ctx.config.stateDir, () => {
+        if (ctx.tmux.hasSession(name))
+            throw new BerthError('Recovery options require a stopped session.');
+        const saved = ctx.store.newest();
+        const record = saved?.sessions.find((session) => session.name === name);
+        if (!saved || !record || record.agent === 'shell')
+            throw new BerthError('No saved agent conversation for this session.');
+        const adapter = requireAdapter(record.agent);
+        const argv = [adapter.binary, ...options].map(shellQuote).join(' ');
+        if (JSON.stringify(keptArgs(adapter, argv)) !== JSON.stringify(options))
+            throw new BerthError('Use only supported resume options, without a prompt or -- terminator.');
+        const sessions = saved.sessions.map((session) => session.name === name ? { ...session, argv, argvVerified: true, ...(session.bindingIssue === ARGUMENTS_UNAVAILABLE ? { bindingIssue: undefined } : {}) } : session);
+        const scrollback = retainedScrollback(ctx, saved, sessions);
+        ctx.store.write(sessions, scrollback);
+    });
+}
+function retainedScrollback(ctx, saved, sessions) {
+    return Object.fromEntries(sessions.flatMap((session) => {
+        const text = ctx.store.optionalScrollback(saved.dir, session.name);
+        return text === undefined ? [] : [[session.name, text]];
+    }));
 }
 //# sourceMappingURL=ensure.js.map

package/dist/src/restore/ensure.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure.js","sourceRoot":"","sources":["../../../src/restore/ensure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ensure.js","sourceRoot":"","sources":["../../../src/restore/ensure.ts"],"names":[],"mappings":"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"}

package/dist/src/restore/lock.d.ts

@@ -1,6 +1,4 @@
-/**
- * Directory lock (implementation §2.4): created atomically, holds the owner
- * PID. An abandoned lock is taken over by renaming it away first, so two
- * waiters cannot both remove it and both proceed. Others wait up to `timeoutMs`.
- */
+/** Synchronous session operations permit nested calls on their owning stack. */
 export declare function withLock<T>(stateDir: string, fn: () => T, timeoutMs?: number): T;
+/** Awaited host transactions retain ownership until completion without blocking the event loop. */
+export declare function withAsyncLock<T>(stateDir: string, fn: () => Promise<T>, timeoutMs?: number): Promise<T>;

package/dist/src/restore/lock.js

@@ -1,74 +1,104 @@
-import { mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { processLifetime, processOwnerAlive } from '../process-owner.js';
+import { randomUUID } from 'node:crypto';
+import { mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
 import { BerthError } from '../errors.js';
-/** A lock directory with no PID yet is its owner's first moment; older than this, the owner died there. */
-const PIDLESS_GRACE_MS = 10_000;
-function alive(pid) {
+const held = new Set();
+function sleep() { Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 20); }
+function readTickets(dir) {
+    return readdirSync(dir).filter((name) => name.endsWith('.json')).flatMap((name) => {
+        try {
+            const value = JSON.parse(readFileSync(join(dir, name), 'utf8'));
+            return value.id === name.slice(0, -5) && Number.isSafeInteger(value.number) && value.number >= 0 && processOwnerAlive(value.pid, value.lifetime, value.createdAt ?? statSync(join(dir, name)).mtimeMs) ? [value] : [];
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return [];
+            throw error; // A corrupt active contender must not be silently bypassed.
+        }
+    });
+}
+function legacyOwnerAlive(stateDir) {
     try {
-        process.kill(pid, 0);
-        return true;
+        const file = join(stateDir, 'ensure.lock', 'pid');
+        return processOwnerAlive(Number(readFileSync(file, 'utf8')), undefined, statSync(file).mtimeMs);
     }
     catch (error) {
-        return error.code === 'EPERM';
+        if (error.code === 'ENOENT')
+            return false;
+        throw error;
     }
 }
-function sleep(ms) {
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
-}
-/** Whether the lock at `dir` belongs to nobody any more. */
-function abandoned(dir) {
+/** Immutable ticket identities avoid stale-lock replacement races. */
+function contender(stateDir) {
+    const dir = join(resolve(stateDir), 'ensure-tickets');
+    mkdirSync(dir, { recursive: true });
+    const id = randomUUID();
+    const file = join(dir, `${id}.json`);
+    const temporary = `${file}.tmp`;
+    const lifetime = processLifetime(process.pid).key;
+    const createdAt = Date.now();
+    const release = () => {
+        rmSync(file, { force: true });
+        rmSync(temporary, { force: true });
+    };
+    const publish = (number) => {
+        writeFileSync(temporary, JSON.stringify({ id, pid: process.pid, number, lifetime, createdAt }), { mode: 0o600 });
+        renameSync(temporary, file);
+    };
     try {
-        const owner = Number(readFileSync(join(dir, 'pid'), 'utf8'));
-        return Number.isInteger(owner) && owner > 0 && !alive(owner);
+        publish(0);
+        const number = Math.max(0, ...readTickets(dir).map((ticket) => ticket.number)) + 1;
+        publish(number);
+        return {
+            blocked: () => legacyOwnerAlive(stateDir) || readTickets(dir).some((ticket) => ticket.id !== id && (ticket.number === 0 || ticket.number < number || (ticket.number === number && ticket.id < id))),
+            release,
+        };
     }
-    catch {
-        try {
-            return Date.now() - statSync(dir).mtimeMs > PIDLESS_GRACE_MS;
-        }
-        catch {
-            return false; // released meanwhile
-        }
+    catch (error) {
+        release();
+        throw error;
     }
 }
-/**
- * Directory lock (implementation §2.4): created atomically, holds the owner
- * PID. An abandoned lock is taken over by renaming it away first, so two
- * waiters cannot both remove it and both proceed. Others wait up to `timeoutMs`.
- */
+/** Synchronous session operations permit nested calls on their owning stack. */
 export function withLock(stateDir, fn, timeoutMs = 30_000) {
-    mkdirSync(stateDir, { recursive: true });
-    const dir = join(stateDir, 'ensure.lock');
+    const key = resolve(stateDir);
+    if (held.has(key))
+        return fn();
+    const ticket = contender(key);
     const deadline = Date.now() + timeoutMs;
-    for (;;) {
+    try {
+        while (ticket.blocked()) {
+            if (Date.now() >= deadline)
+                throw new BerthError(`another restore is running (${stateDir})`);
+            sleep();
+        }
+        held.add(key);
         try {
-            mkdirSync(dir);
-            writeFileSync(join(dir, 'pid'), String(process.pid));
-            break;
+            return fn();
         }
-        catch (error) {
-            if (error.code !== 'EEXIST')
-                throw error;
-            if (abandoned(dir)) {
-                const stale = `${dir}.stale-${process.pid}-${Date.now()}`;
-                try {
-                    renameSync(dir, stale);
-                    rmSync(stale, { recursive: true, force: true });
-                }
-                catch {
-                    // Another waiter took it over first; try again.
-                }
-                continue;
-            }
-            if (Date.now() > deadline)
-                throw new BerthError(`another restore is running (${dir})`);
-            sleep(100);
+        finally {
+            held.delete(key);
         }
     }
+    finally {
+        ticket.release();
+    }
+}
+/** Awaited host transactions retain ownership until completion without blocking the event loop. */
+export async function withAsyncLock(stateDir, fn, timeoutMs = 30_000) {
+    const ticket = contender(stateDir);
+    const deadline = Date.now() + timeoutMs;
     try {
-        return fn();
+        while (ticket.blocked()) {
+            if (Date.now() >= deadline)
+                throw new BerthError('Another operation is using this state. Try again when it finishes.');
+            await new Promise((resolve) => setTimeout(resolve, 20));
+        }
+        return await fn();
     }
     finally {
-        rmSync(dir, { recursive: true, force: true });
+        ticket.release();
     }
 }
 //# sourceMappingURL=lock.js.map

package/dist/src/restore/lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../../src/restore/lock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../../src/restore/lock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC5G,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;AAG/B,SAAS,KAAK,KAAW,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;AAC5F,SAAS,WAAW,CAAC,GAAW;IAC9B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChF,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAW,CAAC;YAC1E,OAAO,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,EAAE,CAAC;YAClE,MAAM,KAAK,CAAC,CAAC,4DAA4D;QAC3E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AACD,SAAS,gBAAgB,CAAC,QAAgB;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QAClD,OAAO,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAClG,CAAC;IACD,OAAO,KAAK,EAAE,CAAC;QACb,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACrE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,sEAAsE;AACtE,SAAS,SAAS,CAAC,QAAgB;IACjC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACtD,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;IACxB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,GAAG,IAAI,MAAM,CAAC;IAChC,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAE,CAAC,GAAG,CAAC;IACnD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE;QACjC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACjH,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC;IACF,IAAI,CAAC;QACH,OAAO,CAAC,CAAC,CAAC,CAAC;QACX,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;QACnF,OAAO,CAAC,MAAM,CAAC,CAAC;QAChB,OAAO;YACL,OAAO,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAC5E,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;YACtH,OAAO;SACR,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,CAAC;QACV,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,QAAQ,CAAI,QAAgB,EAAE,EAAW,EAAE,SAAS,GAAG,MAAM;IAC3E,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ;gBAAE,MAAM,IAAI,UAAU,CAAC,+BAA+B,QAAQ,GAAG,CAAC,CAAC;YAC7F,KAAK,EAAE,CAAC;QACV,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,IAAI,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;QAAC,CAAC;gBACZ,CAAC;YAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAAC,CAAC;IAC/B,CAAC;YAAS,CAAC;QAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AACjC,CAAC;AAED,mGAAmG;AACnG,MAAM,CAAC,KAAK,UAAU,aAAa,CAAI,QAAgB,EAAE,EAAoB,EAAE,SAAS,GAAG,MAAM;IAC/F,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ;gBAAE,MAAM,IAAI,UAAU,CAAC,oEAAoE,CAAC,CAAC;YACvH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,MAAM,EAAE,EAAE,CAAC;IACpB,CAAC;YAAS,CAAC;QAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAAC,CAAC;AACjC,CAAC"}

package/dist/src/restore/status.d.ts

@@ -0,0 +1,9 @@
+import type { Tmux, SessionMeta } from '../tmux/client.js';
+export type RecoveryState = 'requested' | 'confirmed' | 'unconfirmed' | 'failed';
+export interface RecoveryStatus {
+    recovery?: RecoveryState;
+    recoveryAt?: string;
+    recoveryDetail?: string;
+}
+/** A running pane proves process existence, not successful conversation resume. */
+export declare function recoveryStatus(tmux: Tmux, name: string, meta: SessionMeta): RecoveryStatus;

package/dist/src/restore/status.js

@@ -0,0 +1,16 @@
+/** A running pane proves process existence, not successful conversation resume. */
+export function recoveryStatus(tmux, name, meta) {
+    if (!meta.recovery)
+        return {};
+    const base = { recovery: meta.recovery, recoveryAt: meta.recoveryAt, recoveryDetail: meta.recoveryDetail };
+    if (meta.recovery === 'failed' || meta.recovery === 'confirmed')
+        return base;
+    const dead = tmux.run(['display-message', '-p', '-t', `=${name}:`, '#{pane_dead}'], true);
+    if (dead.ok && dead.stdout.trim() === '1')
+        return { ...base, recovery: 'failed', recoveryDetail: 'Agent process exited. Inspect terminal output before retrying.' };
+    if (meta.recovery === 'requested' && Date.now() - Number(meta.recoveryAt) >= 30_000) {
+        return { ...base, recovery: 'unconfirmed', recoveryDetail: 'No matching conversation acknowledgement. Inspect the terminal before continuing.' };
+    }
+    return base;
+}
+//# sourceMappingURL=status.js.map

package/dist/src/restore/status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/restore/status.ts"],"names":[],"mappings":"AAKA,mFAAmF;AACnF,MAAM,UAAU,cAAc,CAAC,IAAU,EAAE,IAAY,EAAE,IAAiB;IACxE,IAAI,CAAC,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC;IAC9B,MAAM,IAAI,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAyB,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;IAC5H,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,CAAC;IAC1F,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,gEAAgE,EAAE,CAAC;IACpK,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,MAAM,EAAE,CAAC;QACpF,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,mFAAmF,EAAE,CAAC;IACnJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/src/snapshot/identity.d.ts

@@ -0,0 +1,7 @@
+import type { Context } from '../context.js';
+import type { LiveSession } from '../tmux/client.js';
+import type { SnapshotSession } from './store.js';
+export declare function recordIdentity(saved: SnapshotSession): string;
+export declare function sameSession(saved: SnapshotSession, live: LiveSession): boolean;
+export declare function nameCollision(ctx: Context, live: LiveSession, records: readonly SnapshotSession[]): SnapshotSession | undefined;
+export declare const COLLISION_HINT = "A stopped conversation reserves this name. Rename or end this live session to recover the saved conversation; its record has been preserved.";

package/dist/src/snapshot/identity.js

@@ -0,0 +1,20 @@
+import { createHash } from 'node:crypto';
+import { wasClosed } from './lifecycle.js';
+export function recordIdentity(saved) {
+    return createHash('sha256').update(JSON.stringify([saved.serverStart, saved.sessionId, saved.name, saved.agent, saved.cwd, saved.conversation, saved.profile])).digest('hex');
+}
+export function sameSession(saved, live) {
+    if (live.meta.restoreSource === recordIdentity(saved) && live.meta.agent === saved.agent && (live.meta.conversation ?? '') === saved.conversation)
+        return true;
+    if (!saved.serverStart || saved.serverStart !== live.serverStart)
+        return false;
+    if (saved.sessionId)
+        return saved.sessionId === live.sessionId;
+    // Upgrade a legacy record only with matching lifetime and binding evidence.
+    return saved.agent === live.meta.agent && saved.conversation === (live.meta.conversation ?? '');
+}
+export function nameCollision(ctx, live, records) {
+    return records.find((saved) => saved.name === live.name && !wasClosed(ctx, saved) && !sameSession(saved, live));
+}
+export const COLLISION_HINT = 'A stopped conversation reserves this name. Rename or end this live session to recover the saved conversation; its record has been preserved.';
+//# sourceMappingURL=identity.js.map

package/dist/src/snapshot/identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/snapshot/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,UAAU,cAAc,CAAC,KAAsB;IACnD,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChL,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAsB,EAAE,IAAiB;IACnE,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,KAAK,cAAc,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,KAAK,KAAK,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAC/J,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAC/E,IAAI,KAAK,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC;IAC/D,4EAA4E;IAC5E,OAAO,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;AAClG,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAY,EAAE,IAAiB,EAAE,OAAmC;IAChG,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAClH,CAAC;AACD,MAAM,CAAC,MAAM,cAAc,GAAG,8IAA8I,CAAC"}

package/dist/src/snapshot/lifecycle.d.ts

@@ -0,0 +1,9 @@
+import type { Context } from '../context.js';
+/** Runtime-only closure evidence survives the last session and server disappearing. */
+export declare function watchClosures(ctx: Context): void;
+export declare function wasClosed(ctx: Context, session: {
+    serverStart?: string;
+    sessionId?: string;
+}): boolean;
+/** A still-running owner can finish its closure hook before recovery is considered. */
+export declare function serverOwnerAlive(ctx: Context, serverStart: string | undefined): boolean;

package/dist/src/snapshot/lifecycle.js

@@ -0,0 +1,37 @@
+import { existsSync, mkdirSync } from 'node:fs';
+import { join } from 'node:path';
+import { shellQuote } from '../shell.js';
+import { formatLiteral } from '../tmux/fields.js';
+/** Runtime-only closure evidence survives the last session and server disappearing. */
+export function watchClosures(ctx) {
+    if (!ctx.tmux.serverRunning())
+        return;
+    const directory = join(ctx.config.stateDir, 'closed');
+    const installed = ctx.tmux.run(['show-option', '-gqv', '@berth_closure_directory'], true).stdout.trim();
+    if (installed === directory)
+        return;
+    mkdirSync(directory, { recursive: true });
+    const marker = `${formatLiteral(directory)}/#{start_time}-#{pid}-#{hook_session}`;
+    const command = `: > ${shellQuote(marker)}`;
+    try {
+        ctx.tmux.run(['set-hook', '-g', 'session-closed[98]', `run-shell ${shellQuote(command)}`]);
+        ctx.tmux.run(['set-option', '-g', '@berth_closure_directory', directory]);
+    }
+    catch (error) {
+        if (ctx.tmux.serverRunning())
+            throw error;
+    }
+}
+export function wasClosed(ctx, session) {
+    if (!session.serverStart || !session.sessionId)
+        return false;
+    return existsSync(join(ctx.config.stateDir, 'closed', `${session.serverStart}-${session.sessionId}`));
+}
+/** A still-running owner can finish its closure hook before recovery is considered. */
+export function serverOwnerAlive(ctx, serverStart) {
+    if (!serverStart)
+        return false;
+    const current = ctx.tmux.run(['display-message', '-p', '#{start_time}-#{pid}'], true);
+    return current.ok && current.stdout.trim() === serverStart;
+}
+//# sourceMappingURL=lifecycle.js.map

package/dist/src/snapshot/lifecycle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../../src/snapshot/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,uFAAuF;AACvF,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;QAAE,OAAO;IACtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,0BAA0B,CAAC,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACxG,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,GAAG,aAAa,CAAC,SAAS,CAAC,uCAAuC,CAAC;IAClF,MAAM,OAAO,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;IAC5C,IAAI,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,oBAAoB,EAAE,aAAa,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3F,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,IAAI,EAAE,0BAA0B,EAAE,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;YAAE,MAAM,KAAK,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAY,EAAE,OAAqD;IAC3F,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7D,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;AACxG,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,gBAAgB,CAAC,GAAY,EAAE,WAA+B;IAC5E,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,IAAI,EAAE,sBAAsB,CAAC,EAAE,IAAI,CAAC,CAAC;IACtF,OAAO,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC;AAC7D,CAAC"}

package/dist/src/snapshot/store.d.ts

@@ -1,13 +1,21 @@
+import type { AgentProfile } from '../agents/profile.js';
+import type { RecoveryStatus } from '../restore/status.js';
 /** One managed session as recorded in a snapshot (implementation §2.1). */
-export interface SnapshotSession {
+export interface SnapshotSession extends RecoveryStatus {
     name: string;
     cwd: string;
     agent: string;
     argv: string;
+    argvVerified?: boolean;
     conversation: string;
     origin: string;
     /** The tmux server lifetime the session was last seen in (absent in older snapshots). */
     serverStart?: string;
+    sessionId?: string;
+    retained?: boolean;
+    profile?: AgentProfile;
+    bindingIssue?: string;
+    ownerWorkspace?: string;
 }
 export interface Snapshot {
     version: 1;
@@ -27,5 +35,7 @@ export declare class SnapshotStore {
     /** Write atomically: build in a temporary directory, then rename into place. */
     write(sessions: SnapshotSession[], scrollback: Record<string, string>, now?: Date): string;
     prune(keep: number): void;
+    /** Missing output is optional; unreadable output must not be silently discarded. */
+    optionalScrollback(dir: string, session: string): string | undefined;
     scrollback(dir: string, session: string): string;
 }