@berthdev/berth 0.3.6 → 0.4.2

package/dist/src/snapshot/store.js

@@ -21,8 +21,14 @@ export class SnapshotStore {
             return [];
         return readdirSync(this.root)
             .filter((name) => DIR_PATTERN.test(name) && existsSync(join(this.root, name, 'sessions.json')))
-            .sort()
-            .reverse()
+            .sort((a, b) => {
+            const parse = (value) => {
+                const parts = /^(\d{8}T\d{6})(\d{3})?Z(?:-(\d+))?$/.exec(value);
+                return { time: parts[1] + (parts[2] ?? '000'), sequence: Number(parts[3] ?? 1) };
+            };
+            const x = parse(a), y = parse(b);
+            return y.time.localeCompare(x.time) || y.sequence - x.sequence;
+        })
             .map((name) => join(this.root, name));
     }
     read(dir) {
@@ -49,12 +55,14 @@ export class SnapshotStore {
     /** Write atomically: build in a temporary directory, then rename into place. */
     write(sessions, scrollback, now = new Date()) {
         mkdirSync(this.root, { recursive: true });
-        let name = timestampDir(now);
+        const latest = this.newest();
+        const committedAt = latest && Date.parse(latest.createdAt) > now.getTime() ? new Date(latest.createdAt) : now;
+        let name = timestampDir(committedAt);
         for (let n = 2; existsSync(join(this.root, name)); n++)
-            name = `${timestampDir(now)}-${n}`;
+            name = `${timestampDir(committedAt)}-${n}`;
         const tmp = join(this.root, `.tmp-${process.pid}-${name}`);
         mkdirSync(join(tmp, 'scrollback'), { recursive: true });
-        const snapshot = { version: SNAPSHOT_VERSION, createdAt: now.toISOString(), sessions };
+        const snapshot = { version: SNAPSHOT_VERSION, createdAt: committedAt.toISOString(), sessions };
         writeFileSync(join(tmp, 'sessions.json'), `${JSON.stringify(snapshot, null, 2)}\n`);
         for (const [session, text] of Object.entries(scrollback)) {
             writeFileSync(join(tmp, 'scrollback', scrollbackFile(session)), text);
@@ -72,7 +80,7 @@ export class SnapshotStore {
                     rmSync(tmp, { recursive: true, force: true });
                     throw error;
                 }
-                name = `${timestampDir(now)}-${n}`;
+                name = `${timestampDir(committedAt)}-${n}`;
             }
         }
     }
@@ -80,11 +88,22 @@ export class SnapshotStore {
         for (const dir of this.list().slice(keep))
             rmSync(dir, { recursive: true, force: true });
     }
+    /** Missing output is optional; unreadable output must not be silently discarded. */
+    optionalScrollback(dir, session) {
+        try {
+            return readFileSync(join(dir, 'scrollback', scrollbackFile(session)), 'utf8');
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return undefined;
+            throw error;
+        }
+    }
     scrollback(dir, session) {
-        const file = join(dir, 'scrollback', scrollbackFile(session));
-        if (!existsSync(file))
+        const text = this.optionalScrollback(dir, session);
+        if (text === undefined)
             throw new BerthError(`no saved scrollback for ${session}`, ExitCode.notFound);
-        return readFileSync(file, 'utf8');
+        return text;
     }
 }
 //# sourceMappingURL=store.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/snapshot/store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/snapshot/store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC9G,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AA8BpD,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,WAAW,GAAG,+BAA+B,CAAC;AAEpD,SAAS,YAAY,CAAC,IAAU;IAC9B,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAC/E,CAAC;AAED,6EAA6E;AAC7E,SAAS,cAAc,CAAC,OAAe;IACrC,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC;AAC9C,CAAC;AAED,MAAM,OAAO,aAAa;IACH;IAArB,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;IAAG,CAAC;IAErC,0CAA0C;IAC1C,IAAI;QACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACtC,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;aAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;aAC9F,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE;gBAC9B,MAAM,KAAK,GAAG,qCAAqC,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC;gBACjE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACnF,CAAC,CAAC;YACF,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACjC,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;QACjE,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,GAAW;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACxC,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,UAAU,CAAC,wBAAwB,IAAI,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,QAAQ,GAAG,IAAgB,CAAC;QAClC,IAAI,QAAQ,CAAC,OAAO,KAAK,gBAAgB,EAAE,CAAC;YAC1C,MAAM,IAAI,UAAU,CAAC,gCAAgC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC9F,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,MAAM,IAAI,UAAU,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;QAC1F,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM;QACJ,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1B,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1C,CAAC;IAED,gFAAgF;IAChF,KAAK,CAAC,QAA2B,EAAE,UAAkC,EAAE,GAAG,GAAG,IAAI,IAAI,EAAE;QACrF,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC9G,IAAI,IAAI,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE;YAAE,IAAI,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACnG,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,OAAO,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;QAC3D,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC;QACzG,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACpF,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACzD,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACxE,CAAC;QACD,kFAAkF;QAClF,KAAK,IAAI,CAAC,GAAG,CAAC,GAAI,CAAC,EAAE,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC;gBACH,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACrB,OAAO,GAAG,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,GAAI,KAA+B,CAAC,IAAI,CAAC;gBACnD,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;oBAC1D,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC9C,MAAM,KAAK,CAAC;gBACd,CAAC;gBACD,IAAI,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAY;QAChB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,oFAAoF;IACpF,kBAAkB,CAAC,GAAW,EAAE,OAAe;QAC7C,IAAI,CAAC;YAAC,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAAC,CAAC;QACtF,OAAO,KAAK,EAAE,CAAC;YACb,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,SAAS,CAAC;YACzE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAW,EAAE,OAAe;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,IAAI,KAAK,SAAS;YAAE,MAAM,IAAI,UAAU,CAAC,2BAA2B,OAAO,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACtG,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

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

@@ -1,4 +1,5 @@
 import type { Context } from '../context.js';
+import type { SnapshotSession } from './store.js';
 /** Snapshot, never throwing: for callers whose own work must not fail on it. */
 export declare function snapshotQuietly(ctx: Context): void;
 /** Manage sessions found running an agent, and snapshot when there were any. */
@@ -10,4 +11,4 @@ export declare function adoptDiscovered(ctx: Context): string[];
  * forgotten. A session missing from the same server ended on purpose (exit,
  * kill) and is dropped. Returns the snapshot directory.
  */
-export declare function takeSnapshot(ctx: Context, now?: Date, forget?: readonly string[]): string;
+export declare function takeSnapshot(ctx: Context, now?: Date, forget?: readonly string[], pending?: readonly SnapshotSession[]): string;

package/dist/src/snapshot/take.js

@@ -1,4 +1,8 @@
-import { conversationByName } from '../agents/name-key.js';
+import { readProfile } from '../agents/profile.js';
+import { nameCollision } from './identity.js';
+import { watchClosures, wasClosed } from './lifecycle.js';
+import { recoveryStatus } from '../restore/status.js';
+import { withLock } from '../restore/lock.js';
 import { discover } from '../registry/discover.js';
 /** Snapshot, never throwing: for callers whose own work must not fail on it. */
 export function snapshotQuietly(ctx) {
@@ -23,42 +27,42 @@ export function adoptDiscovered(ctx) {
  * forgotten. A session missing from the same server ended on purpose (exit,
  * kill) and is dropped. Returns the snapshot directory.
  */
-export function takeSnapshot(ctx, now = new Date(), forget = []) {
+export function takeSnapshot(ctx, now, forget = [], pending = []) {
+    return withLock(ctx.config.stateDir, () => collectSnapshot(ctx, now ?? new Date(), forget, pending));
+}
+function collectSnapshot(ctx, now, forget, pending) {
     const sessions = [];
-    const scrollback = {};
+    watchClosures(ctx);
     discover(ctx);
     const live = ctx.tmux.listSessions();
     const serverStart = live[0]?.serverStart;
+    const previous = ctx.store.newest();
+    const collisions = new Set(live.filter((session) => nameCollision(ctx, session, previous?.sessions ?? [])).map((session) => session.name));
     for (const s of live) {
-        if (!s.meta.agent)
+        if (!s.meta.agent || collisions.has(s.name))
             continue;
         const cwd = s.meta.cwd ?? s.path;
-        let conversation = s.meta.conversation ?? '';
-        // No hook-reported id: fall back to the name key (spec §4.2).
-        if (!conversation) {
-            conversation = conversationByName(s.meta.agent, cwd, s.name) ?? '';
-            if (conversation)
-                ctx.tmux.setMeta(s.name, { conversation });
-        }
-        sessions.push({ name: s.name, cwd, agent: s.meta.agent, argv: s.meta.argv ?? '', conversation, origin: s.meta.origin ?? 'none', serverStart: s.serverStart });
-        scrollback[s.name] = ctx.tmux.capturePane(s.name, ctx.config.scrollbackLines);
+        const conversation = s.meta.conversation ?? '';
+        sessions.push({ profile: readProfile(s.meta.agent, s.meta.profile), ...recoveryStatus(ctx.tmux, s.name, s.meta), ...(s.meta.ownerWorkspace ? { ownerWorkspace: s.meta.ownerWorkspace } : {}), name: s.name, cwd, agent: s.meta.agent, argv: s.meta.argv ?? '', argvVerified: s.meta.argvVerified === '1', conversation, origin: s.meta.origin ?? 'none', serverStart: s.serverStart, sessionId: s.sessionId, ...(s.meta.bindingIssue ? { bindingIssue: s.meta.bindingIssue } : {}) });
     }
-    const liveNames = new Set(live.map((s) => s.name));
-    const previous = ctx.store.newest();
-    for (const old of previous?.sessions ?? []) {
-        if (liveNames.has(old.name) || forget.includes(old.name))
+    const liveNames = new Set(live.filter((s) => !collisions.has(s.name)).map((s) => s.name));
+    const pendingNames = new Set(pending.map((session) => session.name));
+    const records = [...pending, ...(previous?.sessions ?? []).filter((session) => !pendingNames.has(session.name))];
+    for (const old of records) {
+        if (liveNames.has(old.name) || forget.includes(old.name) || (!pendingNames.has(old.name) && wasClosed(ctx, old)))
             continue;
         // Older snapshots do not say which server they saw: keep the old behaviour.
-        if (!old.serverStart || old.serverStart === serverStart)
+        if (!pendingNames.has(old.name) && !collisions.has(old.name) && !old.retained && old.recovery !== 'failed' && (!old.serverStart || old.serverStart === serverStart))
             continue;
-        sessions.push(old);
-        try {
-            scrollback[old.name] = ctx.store.scrollback(previous.dir, old.name);
-        }
-        catch {
-            // No saved scrollback; the session still comes back.
-        }
+        sessions.push(collisions.has(old.name) || pendingNames.has(old.name) ? { ...old, retained: true } : old);
     }
+    const scrollback = Object.fromEntries(sessions.flatMap((session) => {
+        if (liveNames.has(session.name)) {
+            return [[session.name, ctx.tmux.capturePane(session.name, ctx.config.scrollbackLines)]];
+        }
+        const text = previous ? ctx.store.optionalScrollback(previous.dir, session.name) : undefined;
+        return text === undefined ? [] : [[session.name, text]];
+    }));
     const dir = ctx.store.write(sessions, scrollback, now);
     ctx.store.prune(ctx.config.retention);
     return dir;

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

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

package/dist/src/tmux/client.d.ts

@@ -1,5 +1,5 @@
 /** Berth metadata stored on a tmux session as user options (spec §4). */
-export declare const META_KEYS: readonly ["agent", "cwd", "argv", "conversation", "origin", "state", "note"];
+export declare const META_KEYS: readonly ["agent", "cwd", "argv", "argvVerified", "conversation", "origin", "state", "stateRevision", "nativeCheckedAt", "nativeTranscript", "note", "topic", "producerPane", "producerLifetime", "bindingIssue", "recovery", "recoveryAt", "recoveryDetail", "ownerWorkspace", "restoreSource", "profile"];
 export type MetaKey = (typeof META_KEYS)[number];
 export type SessionMeta = Partial<Record<MetaKey, string>>;
 export interface LiveSession {
@@ -9,8 +9,10 @@ export interface LiveSession {
     meta: SessionMeta;
     /** The tmux server's start time and pid: names one server lifetime. */
     serverStart: string;
+    sessionId: string;
 }
 export interface TmuxTarget {
+    env?: Record<string, string | undefined>;
     bin: string;
     /** `-L` socket name; undefined addresses the default server (or $TMUX inside a pane). */
     socket?: string;
@@ -34,7 +36,9 @@ export declare class Tmux {
     /** Working directory of the session's active pane, as the shell or agent left it. */
     paneCurrentPath(name: string): string | undefined;
     hasSession(name: string): boolean;
-    newSession(name: string, cwd: string, command: string): void;
+    newSession(name: string, cwd: string, command: string): string;
+    /** Explicit values/removals override a server's older global environment. */
+    setEnvironment(name: string, values: Record<string, string | undefined>): void;
     setMeta(name: string, meta: SessionMeta): void;
     /**
      * Make tmux send the session's name, prefixed by its agent state, as the

package/dist/src/tmux/client.js

@@ -1,8 +1,10 @@
+import { formatFields, readFields } from './fields.js';
+import { randomUUID } from 'node:crypto';
+import { basename } from 'node:path';
 import { spawnSync } from 'node:child_process';
 import { BerthError, ExitCode } from '../errors.js';
 /** Berth metadata stored on a tmux session as user options (spec §4). */
-export const META_KEYS = ['agent', 'cwd', 'argv', 'conversation', 'origin', 'state', 'note'];
-const SEP = '\x1f';
+export const META_KEYS = ['agent', 'cwd', 'argv', 'argvVerified', 'conversation', 'origin', 'state', 'stateRevision', 'nativeCheckedAt', 'nativeTranscript', 'note', 'topic', 'producerPane', 'producerLifetime', 'bindingIssue', 'recovery', 'recoveryAt', 'recoveryDetail', 'ownerWorkspace', 'restoreSource', 'profile'];
 const TEST_SOCKET_PREFIX = 'berth-test-';
 export class Tmux {
     target;
@@ -19,7 +21,7 @@ export class Tmux {
     }
     /** Run tmux; returns stdout. Throws BerthError on failure unless `allowFail`. */
     run(args, allowFail = false) {
-        const result = spawnSync(this.target.bin, [...this.baseArgs(), ...args], { encoding: 'utf8' });
+        const result = spawnSync(this.target.bin, [...this.baseArgs(), ...args], { env: this.target.env, encoding: 'utf8', timeout: 3000, killSignal: 'SIGKILL', maxBuffer: 8 * 1024 * 1024 });
         if (result.error) {
             throw new BerthError(`tmux unavailable (${this.target.bin}): ${result.error.message}`, ExitCode.tmuxUnavailable);
         }
@@ -33,48 +35,69 @@ export class Tmux {
         return this.run(['list-sessions', '-F', '#{session_name}'], true).ok;
     }
     listSessions() {
-        const fields = ['#{session_name}', '#{session_attached}', '#{session_path}', '#{start_time}-#{pid}', ...META_KEYS.map((k) => `#{@berth_${k}}`)];
-        const result = this.run(['list-sessions', '-F', fields.join(SEP)], true);
-        if (!result.ok)
-            return [];
-        return result.stdout
-            .split('\n')
-            .filter((line) => line.length > 0)
-            .map((line) => {
-            const [name, attached, path, serverStart, ...values] = line.split(SEP);
+        const fields = ['session_name', 'session_attached', '?session_path,#{session_path},#{pane_current_path}', 'start_time', 'pid', 'session_id', ...META_KEYS.map((k) => `@berth_${k}`)];
+        const result = this.run(['list-sessions', '-F', formatFields(fields)], true);
+        if (!result.ok) {
+            if (/no server running|No such file or directory|Connection refused/i.test(result.stderr))
+                return [];
+            throw new BerthError(`Cannot read tmux sessions: ${result.stderr.trim()}`, ExitCode.failure);
+        }
+        return readFields(result.stdout, fields.length).map((fields) => {
+            const [name, attached, path, start, pid, sessionId, ...values] = fields;
+            const serverStart = `${start}-${pid}`;
             const meta = {};
             META_KEYS.forEach((key, i) => {
-                if (values[i])
-                    meta[key] = values[i];
+                if (values[i]) {
+                    const value = values[i];
+                    if (key === 'argv' && value.startsWith('berth-json:')) {
+                        const decoded = JSON.parse(value.slice('berth-json:'.length));
+                        if (typeof decoded !== 'string')
+                            throw new BerthError('Invalid encoded launch arguments.');
+                        meta[key] = decoded;
+                    }
+                    else
+                        meta[key] = value;
+                }
             });
-            return { name, attachedClients: Number(attached) || 0, path, meta, serverStart };
+            return { name, attachedClients: Number(attached) || 0, path, meta, serverStart, sessionId };
         });
     }
     /** Session that owns a pane, e.g. $TMUX_PANE inside an agent's hook. */
     sessionOfPane(pane) {
-        const result = this.run(['display-message', '-p', '-t', pane, '#{session_name}'], true);
-        const name = result.stdout.trim();
+        const result = this.run(['display-message', '-p', '-t', pane, formatFields(['session_name'])], true);
+        const name = result.ok ? readFields(result.stdout, 1)[0]?.[0] : undefined;
         return result.ok && name ? name : undefined;
     }
     /** Working directory of the session's active pane, as the shell or agent left it. */
     paneCurrentPath(name) {
-        const result = this.run(['display-message', '-p', '-t', `=${name}:`, '#{pane_current_path}'], true);
-        const path = result.stdout.trim();
+        const result = this.run(['display-message', '-p', '-t', `=${name}:`, formatFields(['pane_current_path'])], true);
+        const path = result.ok ? readFields(result.stdout, 1)[0]?.[0] : undefined;
         return result.ok && path ? path : undefined;
     }
     hasSession(name) {
         return this.run(['has-session', '-t', `=${name}`], true).ok;
     }
     newSession(name, cwd, command) {
-        const args = ['new-session', '-d', '-s', name, '-c', cwd];
-        this.run(command ? [...args, command] : args);
+        const args = ['new-session', '-d', '-P', '-F', '#{session_id}', '-s', name, '-c', cwd];
+        return this.run(command ? [...args, command] : args).stdout.trim();
+    }
+    /** Explicit values/removals override a server's older global environment. */
+    setEnvironment(name, values) {
+        for (const [key, value] of Object.entries(values)) {
+            this.run(value === undefined
+                ? ['set-environment', '-r', '-t', `=${name}:`, key]
+                : ['set-environment', '-t', `=${name}:`, key, value]);
+        }
     }
     setMeta(name, meta) {
-        for (const [key, value] of Object.entries(meta)) {
+        const values = meta.state === undefined ? meta : { ...meta, stateRevision: randomUUID() };
+        for (const [key, value] of Object.entries(values)) {
             if (value === undefined)
                 continue;
-            // One line per session in list output: no newlines or separators in values.
-            this.run(['set-option', '-t', `=${name}:`, `@berth_${key}`, value.replace(/[\r\n\x1f]+/g, ' ')]);
+            // Argument values must survive the line-delimited tmux transport unchanged.
+            const encoded = key === 'argv' && (/[\r\n\x1f]/.test(value) || value.startsWith('berth-json:'))
+                ? `berth-json:${JSON.stringify(value)}` : value;
+            this.run(['set-option', '-t', `=${name}:`, `@berth_${key}`, encoded]);
         }
     }
     /**
@@ -102,7 +125,8 @@ export class Tmux {
     }
     /** Server-wide kill, allowed only on Berth test sockets (implementation §5.1). */
     killServer() {
-        if (!this.target.socket?.startsWith(TEST_SOCKET_PREFIX)) {
+        const endpoint = this.target.socketPath ? basename(this.target.socketPath) : this.target.socket;
+        if (!endpoint?.startsWith(TEST_SOCKET_PREFIX)) {
             throw new BerthError('refusing to kill a tmux server that is not a Berth test server');
         }
         this.run(['kill-server'], true);

package/dist/src/tmux/client.js.map

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

package/dist/src/tmux/connections.d.ts

@@ -0,0 +1,22 @@
+import type { HostRecord } from '../registry/hosts.js';
+import type { Tmux } from './client.js';
+export interface ConnectionInfo {
+    pid: number;
+    terminal: string;
+    application: string;
+    workspace?: string;
+    ancestors: number[];
+}
+export declare function processAncestry(pid: number, table: string): {
+    ancestors: number[];
+    application: string;
+};
+/** Live clients only; restore ownership is deliberately not consulted. */
+export declare function connections(tmux: Tmux, hosts?: readonly HostRecord[]): ReadonlyMap<string, ConnectionInfo[]>;
+/** Wait for this terminal process to attach to this exact session, not any client. */
+export declare function waitForAttachment(tmux: Tmux, session: string, terminalPid: number, options?: {
+    timeoutMs?: number;
+    exited?: () => boolean;
+}): Promise<void>;
+/** Detach only clients proven to belong to the caller's terminal processes. */
+export declare function detachTerminalClients(tmux: Tmux, session: string, terminalPids: ReadonlySet<number>): void;

package/dist/src/tmux/connections.js

@@ -0,0 +1,70 @@
+import { formatFields, readFields } from './fields.js';
+import { spawnSync } from 'node:child_process';
+export function processAncestry(pid, table) {
+    const processes = new Map(table.split('\n').flatMap((line) => {
+        const match = /^\s*(\d+)\s+(\d+)\s+(.+)$/.exec(line);
+        return match ? [[Number(match[1]), { parent: Number(match[2]), command: match[3] }]] : [];
+    }));
+    const ancestors = [];
+    let application = '';
+    for (let current = pid; current > 1 && ancestors.length < 64 && !ancestors.includes(current);) {
+        ancestors.push(current);
+        const process = processes.get(current);
+        if (!process)
+            break;
+        if (/iTerm/i.test(process.command))
+            application ||= 'iTerm2';
+        else if (/Cursor(?:\.app| Helper)/i.test(process.command))
+            application ||= 'Cursor';
+        else if (/Visual Studio Code|Code Helper|\/code(?:\s|$)/i.test(process.command))
+            application ||= 'VS Code';
+        else if (/Terminal\.app/.test(process.command))
+            application ||= 'Terminal';
+        else if (/WezTerm|wezterm/.test(process.command))
+            application ||= 'WezTerm';
+        else if (/ghostty/i.test(process.command))
+            application ||= 'Ghostty';
+        current = process.parent;
+    }
+    return { ancestors, application };
+}
+/** Live clients only; restore ownership is deliberately not consulted. */
+export function connections(tmux, hosts = []) {
+    const result = tmux.run(['list-clients', '-F', formatFields(['client_session', 'client_pid', 'client_tty', 'client_termtype'])], true);
+    if (!result.ok || !result.stdout.trim())
+        return new Map();
+    const processes = spawnSync('ps', ['-axo', 'pid=,ppid=,comm='], { encoding: 'utf8', timeout: 2000, killSignal: 'SIGKILL' });
+    const entries = readFields(result.stdout, 4).map(([session, rawPid, terminal, termtype]) => {
+        const pid = Number(rawPid);
+        const ancestry = processAncestry(pid, processes.status === 0 ? processes.stdout : '');
+        const host = hosts.find((host) => host.terminalPids.some((pid) => ancestry.ancestors.includes(pid)));
+        const application = typeof host?.application === 'string' ? host.application.trim() : '';
+        return { session, client: { pid, terminal, ...ancestry, ...(host?.workspace ? { workspace: host.workspace.label } : {}), application: application || ancestry.application || (/iterm/i.test(termtype) ? 'iTerm2' : '') } };
+    }).filter(({ client }) => Number.isSafeInteger(client.pid) && client.pid > 0);
+    return new Map([...new Set(entries.map((entry) => entry.session))].map((session) => [session, entries.filter((entry) => entry.session === session).map((entry) => entry.client)]));
+}
+/** Wait for this terminal process to attach to this exact session, not any client. */
+export async function waitForAttachment(tmux, session, terminalPid, options = {}) {
+    const deadline = Date.now() + (options.timeoutMs ?? 5000);
+    do {
+        if (options.exited?.())
+            throw new Error(`Terminal exited before attaching to ${session}. Try opening it again.`);
+        const clients = connections(tmux).get(session) ?? [];
+        if (clients.some((client) => client.ancestors.includes(terminalPid)))
+            return;
+        if (Date.now() >= deadline)
+            break;
+        await new Promise((resolve) => setTimeout(resolve, 50));
+    } while (true);
+    throw new Error(`Could not confirm attachment to ${session}. Check tmux and try opening it again.`);
+}
+/** Detach only clients proven to belong to the caller's terminal processes. */
+export function detachTerminalClients(tmux, session, terminalPids) {
+    const clients = connections(tmux).get(session) ?? [];
+    for (const client of clients) {
+        if (client.terminal && client.ancestors.some((pid) => terminalPids.has(pid))) {
+            tmux.run(['detach-client', '-t', client.terminal]);
+        }
+    }
+}
+//# sourceMappingURL=connections.js.map

package/dist/src/tmux/connections.js.map

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

package/dist/src/tmux/fields.d.ts

@@ -0,0 +1,7 @@
+/** Encode before framing. Nested substitutions also work on tmux 3.0,
+ * whose chained modifiers retain only the last substitution. */
+export declare function formatFields(keys: readonly string[]): string;
+/** Decode once so escape-looking source text stays literal. */
+export declare function readFields(output: string, count: number): string[][];
+/** Quote literal data embedded in a tmux format, separately from shell quoting. */
+export declare function formatLiteral(value: string): string;

package/dist/src/tmux/fields.js

@@ -0,0 +1,23 @@
+import { BerthError } from '../errors.js';
+const SEPARATOR = '~';
+const escapeEntries = ['=', '\n', '\r', '\t', '\x1f', SEPARATOR].map((character) => [character.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0'), character]);
+const escapes = Object.fromEntries(escapeEntries);
+/** Encode before framing. Nested substitutions also work on tmux 3.0,
+ * whose chained modifiers retain only the last substitution. */
+export function formatFields(keys) {
+    return keys.map((key) => escapeEntries.reduce((inner, [code, character]) => `#{s|${character}|=${code}|:?pid,${inner},}`, `#{${key}}`)).join(SEPARATOR);
+}
+/** Decode once so escape-looking source text stays literal. */
+export function readFields(output, count) {
+    return output.split('\n').filter((line) => line.length > 0).map((line) => {
+        const fields = line.split(SEPARATOR);
+        if (fields.length !== count)
+            throw new BerthError('Malformed tmux record; refusing to infer session identity.');
+        return fields.map((value) => value.replace(/=([0-9A-F]{2})/g, (match, code) => escapes[code] ?? match));
+    });
+}
+/** Quote literal data embedded in a tmux format, separately from shell quoting. */
+export function formatLiteral(value) {
+    return value.replaceAll("#", "##");
+}
+//# sourceMappingURL=fields.js.map

package/dist/src/tmux/fields.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../../src/tmux/fields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,SAAS,GAAG,GAAG,CAAC;AACtB,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACjF,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,CAAU,CAAC,CAAC;AAC7F,MAAM,OAAO,GAAqC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;AAEpF;gEACgE;AAChE,MAAM,UAAU,YAAY,CAAC,IAAuB;IAClD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CACzE,OAAO,SAAS,KAAK,IAAI,UAAU,KAAK,IAAI,EAAE,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAChF,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,UAAU,CAAC,MAAc,EAAE,KAAa;IACtD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK;YAAE,MAAM,IAAI,UAAU,CAAC,4DAA4D,CAAC,CAAC;QAChH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;IAClH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC"}