@owloops/browserbird 1.2.4 → 1.2.6

package/dist/{db-DAXqDqAz.mjs → db-C9ESgb0d.mjs}

@@ -290,6 +290,17 @@ const MIGRATIONS = [{
           ON logs(level, source, created_at DESC);
       `);
 	}
+}, {
+	name: "browser lock",
+	up(d) {
+		d.exec(`
+        CREATE TABLE IF NOT EXISTS browser_lock (
+          id INTEGER PRIMARY KEY CHECK(id = 1),
+          holder TEXT NOT NULL,
+          acquired_at TEXT NOT NULL DEFAULT (datetime('now'))
+        );
+      `);
+	}
 }];
 let db = null;
 function getSchemaVersion(d) {
@@ -1025,4 +1036,4 @@ var db_exports = /* @__PURE__ */ __exportAll({
 });
 
 //#endregion
-export { updateSessionProviderId as $, completeCronRun as A, listFlights as B, failStaleJobs as C, retryAllFailedJobs as D, listJobs as E, ensureSystemCronJob as F, deleteStaleSessions as G, updateCronJob as H, getCronJob as I, getSessionCount as J, findSession as K, getEnabledCronJobs as L, createCronRun as M, deleteCronJob as N, retryJob as O, deleteOldCronRuns as P, touchSession as Q, getFlightStats as R, failJob as S, hasPendingCronJob as T, updateCronJobStatus as U, setCronJobEnabled as V, createSession as W, getSessionTokenStats as X, getSessionMessages as Y, listSessions as Z, clearJobs as _, getSetting as a, logger as at, deleteJob as b, getUserCount as c, getRecentLogs as d, shortUid as et, insertLog as f, claimNextJob as g, logMessage as h, createUser as i, resolveByUid as it, createCronJob as j, SYSTEM_CRON_PREFIX as k, setSetting as l, getMessageStats as m, resolveDbPath as n, openDatabase as nt, getUserByEmail as o, deleteOldMessages as p, getSession as q, resolveDbPathFromArgv as r, optimizeDatabase as rt, getUserById as s, db_exports as t, closeDatabase as tt, deleteOldLogs as u, completeJob as v, getJobStats as w, deleteOldJobs as x, createJob as y, listCronJobs as z };
+export { updateSessionProviderId as $, completeCronRun as A, listFlights as B, failStaleJobs as C, retryAllFailedJobs as D, listJobs as E, ensureSystemCronJob as F, deleteStaleSessions as G, updateCronJob as H, getCronJob as I, getSessionCount as J, findSession as K, getEnabledCronJobs as L, createCronRun as M, deleteCronJob as N, retryJob as O, deleteOldCronRuns as P, touchSession as Q, getFlightStats as R, failJob as S, hasPendingCronJob as T, updateCronJobStatus as U, setCronJobEnabled as V, createSession as W, getSessionTokenStats as X, getSessionMessages as Y, listSessions as Z, clearJobs as _, getSetting as a, resolveByUid as at, deleteJob as b, getUserCount as c, getRecentLogs as d, shortUid as et, insertLog as f, claimNextJob as g, logMessage as h, createUser as i, optimizeDatabase as it, createCronJob as j, SYSTEM_CRON_PREFIX as k, setSetting as l, getMessageStats as m, resolveDbPath as n, getDb as nt, getUserByEmail as o, logger as ot, deleteOldMessages as p, getSession as q, resolveDbPathFromArgv as r, openDatabase as rt, getUserById as s, db_exports as t, closeDatabase as tt, deleteOldLogs as u, completeJob as v, getJobStats as w, deleteOldJobs as x, createJob as y, listCronJobs as z };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { $ as updateSessionProviderId, A as completeCronRun, B as listFlights, C as failStaleJobs, D as retryAllFailedJobs, E as listJobs, F as ensureSystemCronJob, G as deleteStaleSessions, H as updateCronJob, I as getCronJob, J as getSessionCount, K as findSession, L as getEnabledCronJobs, M as createCronRun, N as deleteCronJob, O as retryJob, P as deleteOldCronRuns, Q as touchSession, R as getFlightStats, S as failJob, T as hasPendingCronJob, U as updateCronJobStatus, V as setCronJobEnabled, W as createSession, X as getSessionTokenStats, Y as getSessionMessages, Z as listSessions, _ as clearJobs, a as getSetting, at as logger, b as deleteJob, c as getUserCount, d as getRecentLogs, et as shortUid, f as insertLog, g as claimNextJob, h as logMessage, i as createUser, it as resolveByUid, j as createCronJob, k as SYSTEM_CRON_PREFIX, l as setSetting, m as getMessageStats, n as resolveDbPath, nt as openDatabase, o as getUserByEmail, p as deleteOldMessages, q as getSession, r as resolveDbPathFromArgv, rt as optimizeDatabase, s as getUserById, tt as closeDatabase, u as deleteOldLogs, v as completeJob, w as getJobStats, x as deleteOldJobs, y as createJob, z as listCronJobs } from "./db-DAXqDqAz.mjs";
+import { $ as updateSessionProviderId, A as completeCronRun, B as listFlights, C as failStaleJobs, D as retryAllFailedJobs, E as listJobs, F as ensureSystemCronJob, G as deleteStaleSessions, H as updateCronJob, I as getCronJob, J as getSessionCount, K as findSession, L as getEnabledCronJobs, M as createCronRun, N as deleteCronJob, O as retryJob, P as deleteOldCronRuns, Q as touchSession, R as getFlightStats, S as failJob, T as hasPendingCronJob, U as updateCronJobStatus, V as setCronJobEnabled, W as createSession, X as getSessionTokenStats, Y as getSessionMessages, Z as listSessions, _ as clearJobs, a as getSetting, at as resolveByUid, b as deleteJob, c as getUserCount, d as getRecentLogs, et as shortUid, f as insertLog, g as claimNextJob, h as logMessage, i as createUser, it as optimizeDatabase, j as createCronJob, k as SYSTEM_CRON_PREFIX, l as setSetting, m as getMessageStats, n as resolveDbPath, nt as getDb, o as getUserByEmail, ot as logger, p as deleteOldMessages, q as getSession, r as resolveDbPathFromArgv, rt as openDatabase, s as getUserById, tt as closeDatabase, u as deleteOldLogs, v as completeJob, w as getJobStats, x as deleteOldJobs, y as createJob, z as listCronJobs } from "./db-C9ESgb0d.mjs";
 import { createRequire } from "node:module";
 import { parseArgs, styleText } from "node:util";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
@@ -122,8 +122,8 @@ function unknownSubcommand(subcommand, command, validCommands) {
 /** @fileoverview ASCII banner displayed on daemon startup and in help text. */
 const pkg = createRequire(import.meta.url)("../package.json");
 const buildInfo = [];
-buildInfo.push(`commit: ${"e70043fd3f928c23a5fd3728b655509809d9b0b5".substring(0, 7)}`);
-buildInfo.push(`built: 2026-03-05T11:55:24+04:00`);
+buildInfo.push(`commit: ${"536f400d5d95ecfb7467a216235dcdd8e7d9573f".substring(0, 7)}`);
+buildInfo.push(`built: 2026-03-05T15:03:39+04:00`);
 const buildString = buildInfo.length > 0 ? ` (${buildInfo.join(", ")})` : "";
 const VERSION = `browserbird ${pkg.version}${buildString}`;
 const BIRD = [
@@ -248,8 +248,7 @@ function validateConfig(config) {
 		if (!Array.isArray(agent.channels) || agent.channels.length === 0) throw new Error(`agent "${agent.id}": "channels" must be a non-empty array`);
 		if (agent.fallbackModel && agent.fallbackModel === agent.model) throw new Error(`agent "${agent.id}": fallbackModel cannot be the same as model ("${agent.model}")`);
 	}
-	const browserMode = process.env["BROWSER_MODE"] ?? "persistent";
-	if (config.browser.enabled && browserMode === "persistent" && config.sessions.maxConcurrent > 1) logger.warn("persistent browser mode with maxConcurrent > 1 will cause lock contention; use \"isolated\" or set maxConcurrent to 1");
+	if (config.browser.enabled && getBrowserMode() === "persistent" && config.sessions.maxConcurrent > 1) logger.warn("persistent browser mode with maxConcurrent > 1 will cause lock contention; use \"isolated\" or set maxConcurrent to 1");
 }
 /**
 * Reads and merges JSON config with DEFAULTS but skips env: resolution.
@@ -313,6 +312,10 @@ function ensureMcpConfig(config, configDir) {
 	config.browser.mcpConfigPath = mcpPath;
 	logger.info(`generated mcp config at ${mcpPath} (host: ${host})`);
 }
+/** Returns the browser mode from BROWSER_MODE env var, defaulting to 'persistent'. */
+function getBrowserMode() {
+	return process.env["BROWSER_MODE"] ?? "persistent";
+}
 /** Atomic write: writes to a .tmp file then renames over the target. */
 function saveConfig(configPath, data) {
 	const tmp = configPath + ".tmp";
@@ -908,7 +911,7 @@ function sanitizeConfig(config) {
 		birds: config.birds,
 		browser: {
 			enabled: config.browser.enabled,
-			mode: process.env["BROWSER_MODE"] ?? "persistent",
+			mode: getBrowserMode(),
 			novncHost: config.browser.novncHost,
 			vncPort: config.browser.vncPort,
 			novncPort: config.browser.novncPort
@@ -2103,6 +2106,7 @@ function splitLines(buffer, chunk) {
 
 //#endregion
 //#region src/provider/claude.ts
+/** @fileoverview Claude Code CLI provider: arg building and stream-json parsing. */
 function buildCommand$1(options) {
 	const { message, sessionId, agent, mcpConfigPath } = options;
 	const args = [
@@ -2123,10 +2127,12 @@ function buildCommand$1(options) {
 	args.push("--dangerously-skip-permissions");
 	const oauthToken = process.env["CLAUDE_CODE_OAUTH_TOKEN"];
 	const apiKey = process.env["ANTHROPIC_API_KEY"];
+	const env = oauthToken ? { CLAUDE_CODE_OAUTH_TOKEN: oauthToken } : apiKey ? { ANTHROPIC_API_KEY: apiKey } : {};
+	env["CLAUDE_CONFIG_DIR"] = resolve(".browserbird", "claude");
 	return {
 		binary: "claude",
 		args,
-		env: oauthToken ? { CLAUDE_CODE_OAUTH_TOKEN: oauthToken } : apiKey ? { ANTHROPIC_API_KEY: apiKey } : {}
+		env
 	};
 }
 /**
@@ -2861,6 +2867,29 @@ function truncate(text, maxLength) {
 	return text.slice(0, maxLength) + "...";
 }
 
+//#endregion
+//#region src/browser/lock.ts
+/** @fileoverview SQLite-based browser lock for persistent browser mode. */
+/**
+* Attempts to acquire the browser lock for a given holder.
+* Uses a single conditional UPSERT: inserts if absent, overwrites if stale.
+* Returns false when an active (non-stale) lock is held by someone else.
+*/
+function acquireBrowserLock(holder, timeoutMs) {
+	const timeoutSeconds = Math.ceil(timeoutMs / 1e3);
+	const result = getDb().prepare(`INSERT INTO browser_lock (id, holder, acquired_at)
+       VALUES (1, ?, datetime('now'))
+       ON CONFLICT(id) DO UPDATE SET
+         holder = excluded.holder,
+         acquired_at = excluded.acquired_at
+       WHERE acquired_at <= datetime('now', '-' || ? || ' seconds')`).run(holder, timeoutSeconds);
+	return Number(result.changes) > 0;
+}
+/** Releases the browser lock only if the caller is the current holder. */
+function releaseBrowserLock(holder) {
+	getDb().prepare("DELETE FROM browser_lock WHERE id = 1 AND holder = ?").run(holder);
+}
+
 //#endregion
 //#region src/cron/scheduler.ts
 const TICK_INTERVAL_MS = 6e4;
@@ -2898,40 +2927,48 @@ function startScheduler(config, signal, deps) {
 		const payload = raw;
 		const agent = config.agents.find((a) => a.id === payload.agentId);
 		if (!agent) throw new Error(`agent "${payload.agentId}" not found`);
-		const { events } = spawnProvider(agent.provider, {
-			message: payload.prompt,
-			agent,
-			mcpConfigPath: config.browser.mcpConfigPath
-		}, signal);
-		if (payload.channelId) logMessage(payload.channelId, null, agent.id, "in", payload.prompt);
-		let result = "";
-		let completion;
-		for await (const event of events) if (event.type === "text_delta") result += redact(event.delta);
-		else if (event.type === "completion") completion = event;
-		else if (event.type === "rate_limit") logger.debug(`bird ${shortUid(payload.cronJobUid)} rate limit window resets ${(/* @__PURE__ */ new Date(event.resetsAt * 1e3)).toISOString()}`);
-		else if (event.type === "error") {
-			const safeError = redact(event.error);
-			if (payload.channelId && deps?.postToSlack) {
-				const blocks = sessionErrorBlocks(safeError, { birdName: agent.name });
-				await deps.postToSlack(payload.channelId, `Bird failed: ${safeError}`, { blocks });
-			}
-			throw new Error(safeError);
-		}
-		if (completion && payload.channelId) logMessage(payload.channelId, null, agent.id, "out", result || void 0, completion.tokensIn, completion.tokensOut);
-		if (!result) {
-			logger.info(`bird ${shortUid(payload.cronJobUid)} completed (no output)`);
-			return "completed (no output)";
+		const needsBrowserLock = config.browser.enabled && getBrowserMode() === "persistent";
+		if (needsBrowserLock) {
+			if (!acquireBrowserLock(payload.cronJobUid, config.sessions.processTimeoutMs)) throw new Error("browser is locked by another session");
 		}
-		if (payload.channelId && deps?.postToSlack) {
-			await deps.postToSlack(payload.channelId, result);
-			if (completion) {
-				const blocks = sessionCompleteBlocks(completion, void 0, agent.name);
-				const fallback = `Bird ${agent.name} completed: ${completion.numTurns} turns`;
-				await deps.postToSlack(payload.channelId, fallback, { blocks });
+		try {
+			const { events } = spawnProvider(agent.provider, {
+				message: payload.prompt,
+				agent,
+				mcpConfigPath: config.browser.mcpConfigPath
+			}, signal);
+			if (payload.channelId) logMessage(payload.channelId, null, agent.id, "in", payload.prompt);
+			let result = "";
+			let completion;
+			for await (const event of events) if (event.type === "text_delta") result += redact(event.delta);
+			else if (event.type === "completion") completion = event;
+			else if (event.type === "rate_limit") logger.debug(`bird ${shortUid(payload.cronJobUid)} rate limit window resets ${(/* @__PURE__ */ new Date(event.resetsAt * 1e3)).toISOString()}`);
+			else if (event.type === "error") {
+				const safeError = redact(event.error);
+				if (payload.channelId && deps?.postToSlack) {
+					const blocks = sessionErrorBlocks(safeError, { birdName: agent.name });
+					await deps.postToSlack(payload.channelId, `Bird failed: ${safeError}`, { blocks });
+				}
+				throw new Error(safeError);
+			}
+			if (completion && payload.channelId) logMessage(payload.channelId, null, agent.id, "out", result || void 0, completion.tokensIn, completion.tokensOut);
+			if (!result) {
+				logger.info(`bird ${shortUid(payload.cronJobUid)} completed (no output)`);
+				return "completed (no output)";
 			}
-			logger.info(`bird ${shortUid(payload.cronJobUid)} result posted to ${payload.channelId}`);
-		} else logger.info(`bird ${shortUid(payload.cronJobUid)} completed (${result.length} chars)`);
-		return result;
+			if (payload.channelId && deps?.postToSlack) {
+				await deps.postToSlack(payload.channelId, result);
+				if (completion) {
+					const blocks = sessionCompleteBlocks(completion, void 0, agent.name);
+					const fallback = `Bird ${agent.name} completed: ${completion.numTurns} turns`;
+					await deps.postToSlack(payload.channelId, fallback, { blocks });
+				}
+				logger.info(`bird ${shortUid(payload.cronJobUid)} result posted to ${payload.channelId}`);
+			} else logger.info(`bird ${shortUid(payload.cronJobUid)} completed (${result.length} chars)`);
+			return result;
+		} finally {
+			if (needsBrowserLock) releaseBrowserLock(payload.cronJobUid);
+		}
 	});
 	registerHandler("system_cron_run", (raw) => {
 		const payload = raw;
@@ -3162,6 +3199,12 @@ function createHandler(client, config, signal, getTeamId) {
 			logger.warn("max concurrent sessions reached");
 			return;
 		}
+		const needsBrowserLock = config.browser.enabled && getBrowserMode() === "persistent";
+		if (needsBrowserLock && !acquireBrowserLock(key, config.sessions.processTimeoutMs)) {
+			await client.postMessage(channelId, threadTs, "The browser is in use by another session. Your message will be processed when it finishes.");
+			lock.queue.push(dispatch);
+			return;
+		}
 		lock.processing = true;
 		activeSpawns++;
 		let sessionUid;
@@ -3202,6 +3245,7 @@ function createHandler(client, config, signal, getTeamId) {
 				await client.postMessage(channelId, threadTs, `Something went wrong: ${errMsg}`, { blocks });
 			} catch {}
 		} finally {
+			if (needsBrowserLock) releaseBrowserLock(key);
 			activeSpawns--;
 			lock.processing = false;
 			lock.killCurrent = null;
@@ -3737,7 +3781,7 @@ async function handleBirdCreateSubmission(view, webClient, defaultTimezone) {
 			logger.warn("bird_create submission missing required fields");
 			return;
 		}
-		const { createCronJob, setCronJobEnabled } = await import("./db-DAXqDqAz.mjs").then((n) => n.t);
+		const { createCronJob, setCronJobEnabled } = await import("./db-C9ESgb0d.mjs").then((n) => n.t);
 		const bird = createCronJob(name, schedule, prompt, channelId || void 0, "default", defaultTimezone);
 		if (enabledValue !== "enabled") setCronJobEnabled(bird.uid, false);
 		await webClient.chat.postMessage({
@@ -3751,7 +3795,7 @@ async function handleBirdCreateSubmission(view, webClient, defaultTimezone) {
 }
 async function handleSessionRetry(sessionUid, channelId, userId, config, handler) {
 	try {
-		const { getSession, getLastInboundMessage } = await import("./db-DAXqDqAz.mjs").then((n) => n.t);
+		const { getSession, getLastInboundMessage } = await import("./db-C9ESgb0d.mjs").then((n) => n.t);
 		const session = getSession(sessionUid);
 		if (!session) {
 			logger.warn(`retry: session ${sessionUid} not found`);
@@ -3857,7 +3901,7 @@ async function startDaemon(options) {
 		logger.success("browserbird orchestrator started");
 		logger.info(`agents: ${config.agents.map((a) => a.id).join(", ")}`);
 		logger.info(`max concurrent sessions: ${config.sessions.maxConcurrent}`);
-		if (config.browser.enabled) logger.info(`browser mode: ${process.env["BROWSER_MODE"] ?? "persistent"}`);
+		if (config.browser.enabled) logger.info(`browser mode: ${getBrowserMode()}`);
 	};
 	const onLaunch = async () => {
 		loadDotEnv(envPath);
@@ -4622,7 +4666,7 @@ function handleConfig(argv) {
 		allowPositionals: false,
 		strict: false
 	});
-	printConfig(values.config);
+	printConfig(values.config ?? process.env["BROWSERBIRD_CONFIG"]);
 }
 function printConfig(configPath) {
 	const config = loadRawConfig(configPath);
@@ -4652,7 +4696,7 @@ function printConfig(configPath) {
 	console.log(`\n${c("cyan", "browser:")}`);
 	console.log(`  ${c("dim", "enabled:")}    ${config.browser.enabled ? "yes" : "no"}`);
 	if (config.browser.enabled) {
-		console.log(`  ${c("dim", "mode:")}       ${process.env["BROWSER_MODE"] ?? "persistent"}`);
+		console.log(`  ${c("dim", "mode:")}       ${getBrowserMode()}`);
 		console.log(`  ${c("dim", "vnc port:")}   ${config.browser.vncPort}`);
 		console.log(`  ${c("dim", "novnc port:")} ${config.browser.novncPort}`);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owloops/browserbird",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "Self-hosted AI agent for Slack with a real browser, a scheduler, and a web dashboard",
   "type": "module",
   "bin": {