@berthdev/berth 0.3.5 → 0.4.2

package/dist/src/tmux/install.js

@@ -1,7 +1,9 @@
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { shellQuote } from '../shell.js';
+import { formatLiteral } from './fields.js';
+import { writeConfigFile } from '../config/write.js';
 /**
  * `berth tmux install` (spec §5.3): a managed block in the user's tmux config
  * that snapshots on session create / rename / close. Hooks use a fixed array
@@ -16,7 +18,7 @@ function hookArgs(cliPath) {
     // Hooks are global in the user's tmux config and run in whichever server
     // fires them: pass that server's socket so state stays per server. #{q:}
     // quotes values for the shell (session names may contain quotes).
-    const berth = `${shellQuote(process.execPath)} ${shellQuote(cliPath)} --socket-path #{q:socket_path}`;
+    const berth = `${formatLiteral(shellQuote(process.execPath))} ${formatLiteral(shellQuote(cliPath))} --socket-path #{q:socket_path}`;
     // `|| true`: tmux prints a failed run-shell into the pane; a hook must never disturb it.
     const quiet = '>/dev/null 2>&1 || true';
     const snapshot = `${berth} snapshot ${quiet}`;
@@ -34,34 +36,45 @@ function hookArgs(cliPath) {
 export function tmuxConfPath(env = process.env) {
     return join(env.HOME || homedir(), '.tmux.conf');
 }
-function withoutBlock(text) {
-    const start = text.indexOf(BEGIN);
-    const end = text.indexOf(END);
-    if (start < 0 || end < start)
-        return text;
-    return (text.slice(0, start) + text.slice(end + END.length)).replace(/\n{3,}/g, '\n\n').replace(/^\n+/, '');
+function replaceBlock(text, replacement) {
+    const starts = [...text.matchAll(/^[\t ]*# >>> berth >>>[\t ]*\r?$/gm)];
+    const ends = [...text.matchAll(/^[\t ]*# <<< berth <<<[\t ]*\r?$/gm)];
+    if (!starts.length && !ends.length)
+        return `${text}${replacement && text && !text.endsWith('\n') ? '\n' : ''}${replacement}`;
+    if (starts.length !== 1 || ends.length !== 1 || starts[0].index >= ends[0].index) {
+        throw new Error('Invalid Berth managed block in tmux configuration; repair its markers before retrying.');
+    }
+    const end = ends[0].index + ends[0][0].length;
+    return text.slice(0, starts[0].index) + replacement + text.slice(text[end] === '\n' ? end + 1 : end);
+}
+function applyHooks(tmux, commands, file) {
+    try {
+        if (tmux.serverRunning())
+            for (const args of commands)
+                tmux.run(args);
+    }
+    catch (error) {
+        throw new Error(`Configuration-file changes are complete (${file}), but running tmux hooks could not be updated: ${error instanceof Error ? error.message : String(error)}. Retry the command to finish the live update.`);
+    }
 }
 export function installTmux(tmux, cliPath, env = process.env) {
     const file = tmuxConfPath(env);
     const current = existsSync(file) ? readFileSync(file, 'utf8') : '';
     const lines = hookArgs(cliPath).map((args) => args.map((a, i) => (i === 3 ? `'${a.replace(/'/g, `'\\''`)}'` : a)).join(' '));
     const block = [BEGIN, '# Managed by berth; remove with `berth tmux uninstall`.', ...lines, END].join('\n');
-    const base = withoutBlock(current).replace(/\s*$/, '');
-    writeFileSync(file, `${base ? `${base}\n\n` : ''}${block}\n`);
-    if (tmux.serverRunning())
-        for (const args of hookArgs(cliPath))
-            tmux.run(args, true);
+    writeConfigFile(file, replaceBlock(current, `${block}\n`));
+    applyHooks(tmux, hookArgs(cliPath), file);
     return file;
 }
 export function uninstallTmux(tmux, env = process.env) {
     const file = tmuxConfPath(env);
     if (existsSync(file)) {
-        const rest = withoutBlock(readFileSync(file, 'utf8')).replace(/\s*$/, '');
-        writeFileSync(file, rest ? `${rest}\n` : '');
+        const current = readFileSync(file, 'utf8');
+        const rest = replaceBlock(current, '');
+        if (rest !== current)
+            writeConfigFile(file, rest);
     }
-    if (tmux.serverRunning())
-        for (const event of [...EVENTS, 'alert-bell', ...ATTACH_EVENTS])
-            tmux.run(['set-hook', '-gu', `${event}[${INDEX}]`], true);
+    applyHooks(tmux, [...EVENTS, 'alert-bell', ...ATTACH_EVENTS].map((event) => ['set-hook', '-gu', `${event}[${INDEX}]`]), file);
     return file;
 }
 //# sourceMappingURL=install.js.map

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

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

package/dist/src/tools.d.ts

@@ -1,5 +1,7 @@
 import type { Context } from './context.js';
 import type { Tools } from './iterm2/install.js';
-/** Absolute path of a binary on PATH, or the name unchanged when not found. */
+/** Match executable-file PATH search; explicit paths never search PATH. */
+export declare function executableOnPath(name: string, env?: NodeJS.ProcessEnv, cwd?: string): string | undefined;
+/** Absolute executable path, or the original command when unavailable. */
 export declare function resolveBinary(name: string, env?: NodeJS.ProcessEnv): string;
 export declare function toolsFor(ctx: Context, cliPath: string): Tools;

package/dist/src/tools.js

@@ -1,16 +1,28 @@
-import { existsSync } from 'node:fs';
-import { delimiter, isAbsolute, join } from 'node:path';
-/** Absolute path of a binary on PATH, or the name unchanged when not found. */
+import { socketPathFor } from './config/index.js';
+import { accessSync, constants, statSync } from 'node:fs';
+import { delimiter, resolve } from 'node:path';
+/** Match executable-file PATH search; explicit paths never search PATH. */
+export function executableOnPath(name, env = process.env, cwd = process.cwd()) {
+    if (!name)
+        return undefined;
+    const candidates = name.includes('/') ? [resolve(cwd, name)]
+        : (env.PATH === undefined ? ['/usr/bin', '/bin'] : env.PATH.split(delimiter)).map((dir) => resolve(cwd, dir || '.', name));
+    return candidates.find((file) => {
+        try {
+            accessSync(file, constants.X_OK);
+            return statSync(file).isFile();
+        }
+        catch {
+            return false;
+        }
+    });
+}
+/** Absolute executable path, or the original command when unavailable. */
 export function resolveBinary(name, env = process.env) {
-    if (isAbsolute(name))
-        return name;
-    for (const dir of (env.PATH ?? '').split(delimiter)) {
-        if (dir && existsSync(join(dir, name)))
-            return join(dir, name);
-    }
-    return name;
+    return executableOnPath(name, env) ?? name;
 }
 export function toolsFor(ctx, cliPath) {
-    return { node: process.execPath, cli: cliPath, tmux: resolveBinary(ctx.config.tmuxBin), socket: ctx.config.tmuxSocket, path: process.env.PATH };
+    const env = Object.fromEntries(['HOME', 'XDG_CONFIG_HOME', 'XDG_STATE_HOME', 'BERTH_CONFIG', 'BERTH_STATE_DIR'].flatMap((key) => ctx.env[key] ? [[key, ctx.env[key]]] : []));
+    return { node: process.execPath, cli: cliPath, tmux: resolveBinary(ctx.config.tmuxBin, ctx.env), socketPath: socketPathFor(ctx.config.tmuxSocket, ctx.config.tmuxSocketPath, ctx.env), path: ctx.env.PATH, env };
 }
 //# sourceMappingURL=tools.js.map

package/dist/src/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIxD,+EAA+E;AAC/E,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG;IAC3D,IAAI,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,IAAI,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAY,EAAE,OAAe;IACpD,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;AAClJ,CAAC"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAI/C,2EAA2E;AAC3E,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IACnF,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7H,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9B,IAAI,CAAC;YAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAAC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;QAAC,CAAC;QACzE,MAAM,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG;IAC3D,OAAO,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAY,EAAE,OAAe;IACpD,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9K,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;AACnN,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@berthdev/berth",
-  "version": "0.3.5",
+  "version": "0.4.2",
   "description": "Keep terminal-based coding agents running in tmux and bring each back, conversation included.",
   "type": "module",
   "main": "dist/src/index.js",

package/dist/src/agents/name-key.d.ts

@@ -1 +0,0 @@
-export declare function conversationByName(agent: string, cwd: string, name: string, env?: NodeJS.ProcessEnv): string | undefined;

package/dist/src/agents/name-key.js

@@ -1,66 +0,0 @@
-import { closeSync, existsSync, openSync, readdirSync, readSync, realpathSync, statSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-/**
- * Name key (spec §4.2): an agent started with `--name X` records X as a
- * `custom-title` entry near the top of its transcript. The newest transcript
- * in the session's directory carrying that title is the session's
- * conversation. Claude Code and Qoder CLI keep a directory's transcripts as
- * <root>/projects/<encoded cwd>/<id>.jsonl; Claude encodes every
- * non-alphanumeric character as '-', Qoder documents '/' as '-'.
- */
-const HEADER_LINES = 40;
-const ROOTS = {
-    claude: (env) => join(env.HOME || homedir(), '.claude'),
-    qoder: (env) => env.QODER_CONFIG_DIR || join(env.HOME || homedir(), '.qoder'),
-};
-const ENCODINGS = [(p) => p.replace(/[^A-Za-z0-9]/g, '-'), (p) => p.replace(/\//g, '-')];
-function projectDirs(root, cwd) {
-    const paths = [cwd];
-    try {
-        const real = realpathSync(cwd);
-        if (real !== cwd)
-            paths.push(real);
-    }
-    catch {
-        // The directory may be gone; the recorded path still names its transcripts.
-    }
-    const dirs = paths.flatMap((p) => ENCODINGS.map((encode) => join(root, 'projects', encode(p))));
-    return [...new Set(dirs)].filter((d) => existsSync(d));
-}
-function titleOf(file) {
-    const fd = openSync(file, 'r');
-    try {
-        const buffer = Buffer.alloc(64 * 1024);
-        const read = readSync(fd, buffer, 0, buffer.length, 0);
-        for (const line of buffer.subarray(0, read).toString('utf8').split('\n').slice(0, HEADER_LINES)) {
-            try {
-                const entry = JSON.parse(line);
-                if (entry.type === 'custom-title' && entry.customTitle)
-                    return entry.customTitle;
-            }
-            catch {
-                // Partial or non-JSON line.
-            }
-        }
-        return undefined;
-    }
-    finally {
-        closeSync(fd);
-    }
-}
-export function conversationByName(agent, cwd, name, env = process.env) {
-    const root = ROOTS[agent];
-    if (!root)
-        return undefined;
-    const files = projectDirs(root(env), cwd)
-        .flatMap((dir) => readdirSync(dir).filter((f) => f.endsWith('.jsonl')).map((f) => join(dir, f)))
-        .map((file) => ({ file, mtime: statSync(file).mtimeMs }))
-        .sort((a, b) => b.mtime - a.mtime);
-    for (const { file } of files) {
-        if (titleOf(file) === name)
-            return file.replace(/^.*\//, '').replace(/\.jsonl$/, '');
-    }
-    return undefined;
-}
-//# sourceMappingURL=name-key.js.map

package/dist/src/agents/name-key.js.map

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