Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,18 @@ HTTP_MCP_PORT=9100
AGENT_PORT=9200
EXTENSION_PORT=9300

# Optional directories
# RESOURCES_DIR=./resources
# EXECUTION_DIR=./out/

# Agent Configuration
MAX_SESSIONS=5
SESSION_IDLE_TIMEOUT_MS=90000
EVENT_GAP_TIMEOUT_MS=60000

BROWSEROS_BINARY=/Applications/BrowserOS.app/Contents/MacOS/BrowserOS

# PostHog
# PostHog
POSTHOG_API_KEY=
POSTHOG_ENDPOINT=

Expand Down
10 changes: 2 additions & 8 deletions packages/agent/src/agent/ClaudeSDKAgent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,7 @@ export class ClaudeSDKAgent extends BaseAgent {
this.startExecution();
this.abortController = new AbortController();

logger.info('🤖 ClaudeSDKAgent executing', {
message: message.substring(0, 100),
});
logger.info('🤖 ClaudeSDKAgent executing', {message});

try {
const options: any = {
Expand Down Expand Up @@ -329,11 +327,7 @@ export class ClaudeSDKAgent extends BaseAgent {
subtype: (event as any).subtype,
is_error: (event as any).is_error,
num_turns: numTurns,
result: (event as any).result
? typeof (event as any).result === 'string'
? (event as any).result.substring(0, 200)
: JSON.stringify((event as any).result).substring(0, 200)
: 'N/A',
result: (event as any).result ?? 'N/A',
});
}

Expand Down
9 changes: 4 additions & 5 deletions packages/agent/src/agent/CodexSDKAgent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ export class CodexSDKAgent extends BaseAgent {
this.abortController = new AbortController();

logger.info('🤖 CodexSDKAgent executing', {
message: message.substring(0, 100),
message,
});

try {
Expand Down Expand Up @@ -415,12 +415,11 @@ export class CodexSDKAgent extends BaseAgent {

const event = result.value;

// Log Codex events for debugging
const eventData = JSON.stringify(event).substring(0, 100);
// Log Codex events for debugging (console view truncates automatically)
if (event.type === 'error' || event.type === 'turn.failed') {
logger.error('Codex event', {type: event.type, data: eventData});
logger.error('Codex event', event);
} else {
logger.debug('Codex event', {type: event.type, data: eventData});
logger.debug('Codex event', event);
}

// Update event time
Expand Down
49 changes: 39 additions & 10 deletions packages/common/src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import fs from 'node:fs';
import path from 'node:path';

type LogLevel = 'debug' | 'info' | 'warn' | 'error';
type FormatOptions = {useColor?: boolean; truncateStrings?: boolean};

const COLORS = {
debug: '\x1b[36m',
Expand All @@ -15,6 +16,7 @@ const COLORS = {
};

const RESET = '\x1b[0m';
const CONSOLE_META_CHAR_LIMIT = 100;

class Logger {
private level: LogLevel;
Expand All @@ -28,21 +30,45 @@ class Logger {
this.logFilePath = path.join(logDir, 'browseros-server.log');
}

private format(level: LogLevel, message: string, meta?: object): string {
private format(
level: LogLevel,
message: string,
meta?: object,
{useColor = true, truncateStrings = false}: FormatOptions = {},
): string {
const timestamp = new Date().toISOString();
const color = COLORS[level];
const metaStr = meta ? `\n${JSON.stringify(meta, null, 2)}` : '';
return `${color}[${timestamp}] [${level.toUpperCase()}]${RESET} ${message}${metaStr}`;
const prefix = useColor
? `${COLORS[level]}[${timestamp}] [${level.toUpperCase()}]${RESET}`
: `[${timestamp}] [${level.toUpperCase()}]`;
const metaStr = meta
? `\n${this.stringifyMeta(meta, truncateStrings)}`
: '';
return `${prefix} ${message}${metaStr}`;
}

private formatPlain(level: LogLevel, message: string, meta?: object): string {
const timestamp = new Date().toISOString();
const metaStr = meta ? `\n${JSON.stringify(meta, null, 2)}` : '';
return `[${timestamp}] [${level.toUpperCase()}] ${message}${metaStr}`;
private stringifyMeta(meta: object, truncateStrings: boolean): string {
return JSON.stringify(
meta,
(key, value) => {
if (
truncateStrings &&
typeof value === 'string' &&
value.length > CONSOLE_META_CHAR_LIMIT
) {
const extra = value.length - CONSOLE_META_CHAR_LIMIT;
return `${value.slice(0, CONSOLE_META_CHAR_LIMIT)}... (+${extra} chars)`;
}
return value;
},
2,
);
}

private log(level: LogLevel, message: string, meta?: object) {
const formatted = this.format(level, message, meta);
const formatted = this.format(level, message, meta, {
useColor: true,
truncateStrings: true,
});

switch (level) {
case 'error':
Expand All @@ -56,7 +82,10 @@ class Logger {
}

if (this.logFilePath) {
const plainFormatted = this.formatPlain(level, message, meta);
const plainFormatted = this.format(level, message, meta, {
useColor: false,
truncateStrings: false,
});
try {
fs.appendFileSync(this.logFilePath, plainFormatted + '\n');
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion packages/controller-ext/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "BrowserOS Controller",
"version": "1.0.0.5",
"version": "1.0.0.8",
"description": "BrowserOS API bridge for BrowserOS Server",
"key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlh9i/c2A3f0PL86hXhGPzguLIOQ+sPf3/Y8RD11gmdvoU6XqnUqv7GgBvm7SW7316uPnS58AYZY13jGtF4rFrscdda5H2CjZrtOyOycmKp2KzibJLwibXNm/JwKhZ3QEfgsW/orh1SMY2kNj62JemkWLcLyn3E1T+KTcTVyFOxiJS3hyQ+Y0/Jp1HOqGh5lYS58YYzwhId5rrJjfL7wFYtALgt2dEA2r7p4qpe+SW0QLA+ayjRAjS+yt+qitR0eWg+XgqcIk1f1KblN8/yDISssSD4LWiPofe5CmJPnqlHIuI0CpgvAFv9dvgR/w8OFkXxK5h06i6saum1xExj+IwIDAQAB",
"permissions": [
Expand Down
12 changes: 12 additions & 0 deletions packages/controller-ext/src/background/BrowserOSController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,18 @@ export class BrowserOSController {
return this.wsClient.isConnected();
}

notifyWindowFocused(windowId?: number): void {
try {
this.wsClient.send({type: 'focused', windowId});
logger.debug('Sent focused event', {windowId});
} catch (error) {
logger.warn('Failed to send focused event', {
windowId,
error: error instanceof Error ? error.message : String(error),
});
}
}

private registerActions(): void {
logger.info('Registering actions...');

Expand Down
31 changes: 23 additions & 8 deletions packages/controller-ext/src/background/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ async function getOrCreateController(): Promise<BrowserOSController> {
}

async function shutdownController(reason: string): Promise<void> {
logger.info(`[BrowserOS Controller] Shutdown requested: ${reason}`);
logger.info('Controller shutdown requested', {reason});

if (controllerState.initPromise) {
try {
Expand Down Expand Up @@ -138,27 +138,42 @@ function ensureControllerRunning(trigger: string): void {
getOrCreateController().catch(error => {
const message =
error instanceof Error ? error.message : JSON.stringify(error);
logger.error(
`[BrowserOS Controller] Failed to start (trigger=${trigger}): ${message}`,
);
logger.error('Controller failed to start', {trigger, error: message});
});
}

logger.info('[BrowserOS Controller] Extension loaded');
logger.info('Extension loaded');

chrome.runtime.onInstalled.addListener(() => {
logger.info('[BrowserOS Controller] Extension installed');
logger.info('Extension installed');
});

chrome.runtime.onStartup.addListener(() => {
logger.info('[BrowserOS Controller] Browser startup event');
logger.info('Browser startup event');
ensureControllerRunning('runtime.onStartup');
});

// Immediately attempt to start the controller when the service worker initializes
ensureControllerRunning('service-worker-init');

chrome.windows.onFocusChanged.addListener(windowId => {
if (windowId === chrome.windows.WINDOW_ID_NONE) {
return;
}

notifyWindowFocused(windowId).catch(error => {
const message =
error instanceof Error ? error.message : JSON.stringify(error);
logger.warn('Failed to notify focus change', {windowId, error: message});
});
});

chrome.runtime.onSuspend?.addListener(() => {
logger.info('[BrowserOS Controller] Extension suspending');
logger.info('Extension suspending');
void shutdownController('runtime.onSuspend');
});

async function notifyWindowFocused(windowId: number): Promise<void> {
const controller = await getOrCreateController();
controller.notifyWindowFocused(windowId);
}
2 changes: 1 addition & 1 deletion packages/controller-ext/src/config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ export const CONCURRENCY_CONFIG: ConcurrencyConfig = {
export const LOGGING_CONFIG: LoggingConfig = {
enabled: true,
level: 'info',
prefix: '[BrowserOS Controller]',
prefix: '',
};
27 changes: 14 additions & 13 deletions packages/controller-ext/src/utils/Logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,45 @@ export class Logger {
this.prefix = prefix;
}

log(message: string, level: LogLevel = 'info'): void {
log(message: string, level: LogLevel = 'info', data?: object): void {
if (!LOGGING_CONFIG.enabled) return;

const timestamp = new Date().toISOString();
const logMessage = `${this.prefix} [${timestamp}] ${message}`;
const formattedData = data ? `\n${JSON.stringify(data, null, 2)}` : '';

switch (level) {
case 'debug':
if (LOGGING_CONFIG.level === 'debug') console.log(logMessage);
if (LOGGING_CONFIG.level === 'debug') console.log(logMessage + formattedData);
break;
case 'info':
if (['debug', 'info'].includes(LOGGING_CONFIG.level))
console.info(logMessage);
console.info(logMessage + formattedData);
break;
case 'warn':
if (['debug', 'info', 'warn'].includes(LOGGING_CONFIG.level))
console.warn(logMessage);
console.warn(logMessage + formattedData);
break;
case 'error':
console.error(logMessage);
console.error(logMessage + formattedData);
break;
}
}

debug(message: string): void {
this.log(message, 'debug');
debug(message: string, data?: object): void {
this.log(message, 'debug', data);
}

info(message: string): void {
this.log(message, 'info');
info(message: string, data?: object): void {
this.log(message, 'info', data);
}

warn(message: string): void {
this.log(message, 'warn');
warn(message: string, data?: object): void {
this.log(message, 'warn', data);
}

error(message: string): void {
this.log(message, 'error');
error(message: string, data?: object): void {
this.log(message, 'error', data);
}
}

Expand Down
35 changes: 21 additions & 14 deletions packages/controller-ext/src/websocket/WebSocketClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,10 @@ export class WebSocketClient {
this._setStatus(ConnectionStatus.DISCONNECTED);
}

send(message: ProtocolRequest | ProtocolResponse): void {
if (this.status !== ConnectionStatus.CONNECTED) {
throw new Error('WebSocket not connected');
}

if (!this.ws) {
throw new Error('WebSocket instance is null');
}

const messageStr = JSON.stringify(message);
logger.debug(`Sending: ${messageStr.substring(0, 100)}...`);
this.ws.send(messageStr);
send(
message: ProtocolRequest | ProtocolResponse | Record<string, unknown>,
): void {
this._sendSerialized(message);
}

onMessage(handler: (msg: ProtocolResponse) => void): void {
Expand Down Expand Up @@ -220,8 +212,7 @@ export class WebSocketClient {

// Send ping
try {
const pingMessage = JSON.stringify({type: 'ping'});
this.ws.send(pingMessage);
this._sendSerialized({type: 'ping'});
this.pendingPing = true;
logger.debug('Sent heartbeat ping');

Expand Down Expand Up @@ -282,4 +273,20 @@ export class WebSocketClient {
// Emit to all status handlers
this.statusHandlers.forEach(handler => handler(status));
}

private _sendSerialized(
message: ProtocolRequest | ProtocolResponse | Record<string, unknown>,
): void {
if (this.status !== ConnectionStatus.CONNECTED) {
throw new Error('WebSocket not connected');
}

if (!this.ws) {
throw new Error('WebSocket instance is null');
}

const messageStr = JSON.stringify(message);
logger.debug(`Sending: ${messageStr.substring(0, 100)}...`);
this.ws.send(messageStr);
}
}
Loading