Merge branch 'main' into task-run-scope

Author: joshsny

apps/array/package.json

@@ -116,8 +116,11 @@
     "@xterm/addon-web-links": "^0.11.0",
     "@xterm/xterm": "^5.5.0",
     "ai": "^5.0.75",
+    "chokidar": "^5.0.0",
     "cmdk": "^1.1.1",
     "date-fns": "^3.3.1",
+    "electron-log": "^5.4.3",
+    "electron-store": "^11.0.0",
     "idb-keyval": "^6.2.2",
     "node-addon-api": "^8.5.0",
     "node-pty": "1.1.0-beta39",
@@ -133,7 +136,6 @@
     "sonner": "^2.0.7",
     "uuid": "^9.0.1",
     "zod": "^4.1.12",
-    "zustand": "^4.5.0",
-    "electron-store": "^11.0.0"
+    "zustand": "^4.5.0"
   }
 }

apps/array/src/api/generated.ts

@@ -20067,30 +20067,3 @@ export class ApiClient {
 export function createApiClient(fetcher: Fetcher, baseUrl?: string) {
   return new ApiClient(fetcher).setBaseUrl(baseUrl ?? "");
 }
-
-/**
- Example usage:
- const api = createApiClient((method, url, params) =>
-   fetch(url, { method, body: JSON.stringify(params) }).then((res) => res.json()),
- );
- api.get("/users").then((users) => console.log(users));
- api.post("/users", { body: { name: "John" } }).then((user) => console.log(user));
- api.put("/users/:id", { path: { id: 1 }, body: { name: "John" } }).then((user) => console.log(user));
-
- // With error handling
- const result = await api.get("/users/{id}", { path: { id: "123" }, withResponse: true });
- if (result.ok) {
-   // Access data directly
-   const user = result.data;
-   console.log(user);
-
-   // Or use the json() method for compatibility
-   const userFromJson = await result.json();
-   console.log(userFromJson);
- } else {
-   const error = result.data;
-   console.error(`Error ${result.status}:`, error);
- }
-*/
-
-// </ApiClient>

apps/array/src/api/posthogClient.ts

@@ -1,7 +1,10 @@
+import { logger } from "@renderer/lib/logger";
 import type { LogEntry, Task, TaskRun } from "@shared/types";
 import { buildApiFetcher } from "./fetcher";
 import { createApiClient, type Schemas } from "./generated";
 
+const log = logger.scope("posthog-client");
+
 export class PostHogAPIClient {
   private api: ReturnType<typeof createApiClient>;
   private _teamId: number | null = null;
@@ -238,7 +241,7 @@ export class PostHogAPIClient {
       const response = await fetch(logUrl);
 
       if (!response.ok) {
-        console.warn(
+        log.warn(
           `Failed to fetch logs: ${response.status} ${response.statusText}`,
         );
         return [];
@@ -254,7 +257,7 @@ export class PostHogAPIClient {
         .split("\n")
         .map((line) => JSON.parse(line) as LogEntry);
     } catch (err) {
-      console.warn("Failed to fetch task logs from latest run", err);
+      log.warn("Failed to fetch task logs from latest run", err);
       return [];
     }
   }

apps/array/src/main/index.ts

@@ -10,14 +10,15 @@ import {
   type MenuItemConstructorOptions,
   shell,
 } from "electron";
+import "./lib/logger";
 import { ANALYTICS_EVENTS } from "../types/analytics.js";
 import { registerAgentIpc, type TaskController } from "./services/agent.js";
-import { registerFoldersIpc } from "./services/folders.js";
-import { registerWorktreeIpc } from "./services/worktree.js";
-import "./services/index.js";
+import { setupAgentHotReload } from "./services/dev-reload.js";
 import { registerFileWatcherIpc } from "./services/fileWatcher.js";
+import { registerFoldersIpc } from "./services/folders.js";
 import { registerFsIpc } from "./services/fs.js";
 import { registerGitIpc } from "./services/git.js";
+import "./services/index.js";
 import { registerOAuthHandlers } from "./services/oauth.js";
 import { registerOsIpc } from "./services/os.js";
 import { registerPosthogIpc } from "./services/posthog.js";
@@ -28,6 +29,7 @@ import {
 } from "./services/posthog-analytics.js";
 import { registerShellIpc } from "./services/shell.js";
 import { registerAutoUpdater } from "./services/updates.js";
+import { registerWorktreeIpc } from "./services/worktree.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -183,6 +185,11 @@ app.whenReady().then(() => {
   // Initialize PostHog analytics
   initializePostHog();
   trackAppEvent(ANALYTICS_EVENTS.APP_STARTED);
+
+  // Dev mode: Watch agent package and restart via mprocs
+  if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
+    setupAgentHotReload();
+  }
 });
 
 app.on("window-all-closed", async () => {

apps/array/src/main/lib/logger.ts

@@ -0,0 +1,31 @@
+import log from "electron-log/main";
+
+// Initialize IPC transport to forward main process logs to renderer dev tools
+log.initialize();
+
+log.transports.file.level = "info";
+log.transports.console.level = "info";
+
+export const logger = {
+  info: (message: string, ...args: unknown[]) => log.info(message, ...args),
+  warn: (message: string, ...args: unknown[]) => log.warn(message, ...args),
+  error: (message: string, ...args: unknown[]) => log.error(message, ...args),
+  debug: (message: string, ...args: unknown[]) => log.debug(message, ...args),
+
+  scope: (name: string) => {
+    const scoped = log.scope(name);
+    return {
+      info: (message: string, ...args: unknown[]) =>
+        scoped.info(message, ...args),
+      warn: (message: string, ...args: unknown[]) =>
+        scoped.warn(message, ...args),
+      error: (message: string, ...args: unknown[]) =>
+        scoped.error(message, ...args),
+      debug: (message: string, ...args: unknown[]) =>
+        scoped.debug(message, ...args),
+    };
+  },
+};
+
+export type Logger = typeof logger;
+export type ScopedLogger = ReturnType<typeof logger.scope>;

apps/array/src/main/preload.ts

@@ -6,6 +6,7 @@ import type {
   TabContextMenuResult,
   TaskContextMenuResult,
 } from "./services/contextMenu.types.js";
+import "electron-log/preload";
 
 interface MessageBoxOptions {
   type?: "none" | "info" | "error" | "question" | "warning";

apps/array/src/main/services/agent.ts

@@ -2,13 +2,25 @@ import { randomUUID } from "node:crypto";
 import { mkdirSync, rmSync, symlinkSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { Agent, PermissionMode } from "@posthog/agent";
+import { Agent, type OnLogCallback, PermissionMode } from "@posthog/agent";
 import {
   app,
   type BrowserWindow,
   type IpcMainInvokeEvent,
   ipcMain,
 } from "electron";
+import { logger } from "../lib/logger";
+
+const log = logger.scope("agent");
+
+const onAgentLog: OnLogCallback = (level, scope, message, data) => {
+  const scopedLog = logger.scope(scope);
+  if (data !== undefined) {
+    scopedLog[level](message, data);
+  } else {
+    scopedLog[level](message);
+  }
+};
 
 interface AgentStartParams {
   taskId: string;
@@ -35,18 +47,12 @@ export interface TaskController {
 }
 
 function getClaudeCliPath(): string {
-  const { existsSync } = require("node:fs");
   const appPath = app.getAppPath();
 
   const claudeCliPath = app.isPackaged
     ? join(`${appPath}.unpacked`, ".vite/build/claude-cli/cli.js")
     : join(appPath, ".vite/build/claude-cli/cli.js");
 
-  console.log("[agent] Claude CLI path:", claudeCliPath);
-  console.log("[agent] Claude CLI exists:", existsSync(claudeCliPath));
-  console.log("[agent] App path:", appPath);
-  console.log("[agent] Is packaged:", app.isPackaged);
-
   return claudeCliPath;
 }
 
@@ -106,12 +112,9 @@ export function registerAgentIpc(
           process.env.CLAUDE_CONFIG_DIR || join(app.getPath("home"), ".claude");
         const statsigPath = join(claudeConfigDir, "statsig");
         rmSync(statsigPath, { recursive: true, force: true });
-        console.log(
-          "[agent] Cleared statsig cache to work around input_examples bug",
-        );
+        log.info("Cleared statsig cache to work around input_examples bug");
       } catch (error) {
-        // Ignore errors if the folder doesn't exist
-        console.warn("[agent] Could not clear statsig cache:", error);
+        log.warn("Could not clear statsig cache:", error);
       }
 
       const taskId = randomUUID();
@@ -133,7 +136,7 @@ export function registerAgentIpc(
         if (stderrBuffer.length > 50) {
           stderrBuffer.shift();
         }
-        console.error(`[agent][claude-stderr] ${text}`);
+        log.error(`[claude-stderr] ${text}`);
         emitToRenderer({
           type: "status",
           ts: Date.now(),
@@ -156,6 +159,7 @@ export function registerAgentIpc(
         posthogApiUrl: apiHost,
         posthogProjectId: projectId,
         debug: true,
+        onLog: onAgentLog,
       });
 
       const controllerEntry: TaskController = {
@@ -191,7 +195,7 @@ export function registerAgentIpc(
               });
             }
           } catch (err) {
-            console.warn("[agent] failed to fetch task progress", err);
+            log.warn("Failed to fetch task progress", err);
           }
         };
 
@@ -224,7 +228,7 @@ export function registerAgentIpc(
             } catch {}
             symlinkSync(process.execPath, nodeSymlinkPath);
           } catch (err) {
-            console.warn("[agent] Failed to setup mock node environment", err);
+            log.warn("Failed to setup mock node environment", err);
           }
 
           const newPath = `${mockNodeDir}:${process.env.PATH || ""}`;
@@ -245,14 +249,6 @@ export function registerAgentIpc(
           const mcpOverrides = {};
           const claudeCliPath = getClaudeCliPath();
 
-          console.log("[agent] Query overrides:", {
-            model,
-            pathToClaudeCodeExecutable: claudeCliPath,
-            hasAbortController: !!abortController,
-            hasStderr: !!forwardClaudeStderr,
-            hasEnv: !!envOverrides,
-          });
-
           await agent.runTask(posthogTaskId, taskRunId, {
             repositoryPath: repoPath,
             permissionMode: resolvedPermission,
@@ -277,7 +273,7 @@ export function registerAgentIpc(
 
           emitToRenderer({ type: "done", success: true, ts: Date.now() });
         } catch (err) {
-          console.error("[agent] task execution failed", err);
+          log.error("Task execution failed", err);
           let errorMessage = err instanceof Error ? err.message : String(err);
           const cause =
             err instanceof Error && "cause" in err && err.cause

apps/array/src/main/services/dev-reload.ts

@@ -0,0 +1,33 @@
+import path from "node:path";
+import { type FSWatcher, watch } from "chokidar";
+import { app } from "electron";
+import { logger } from "../lib/logger";
+
+const log = logger.scope("dev-reload");
+
+let watcher: FSWatcher | null = null;
+
+export function setupAgentHotReload(): void {
+  if (watcher) return;
+
+  const monorepoRoot = path.resolve(app.getAppPath(), "../..");
+  const agentDistPath = path.join(monorepoRoot, "packages/agent/dist");
+
+  log.info(`Watching agent package: ${agentDistPath}`);
+
+  let debounceTimeout: NodeJS.Timeout | null = null;
+
+  watcher = watch(agentDistPath, {
+    ignoreInitial: true,
+    ignored: /node_modules/,
+  });
+
+  watcher.on("change", (filePath) => {
+    if (debounceTimeout) clearTimeout(debounceTimeout);
+    debounceTimeout = setTimeout(() => {
+      log.info(`Agent rebuilt: ${path.basename(filePath)}`);
+      log.info("Exiting for mprocs to restart...");
+      process.exit(0);
+    }, 1000);
+  });
+}

apps/array/src/main/services/fileWatcher.ts

@@ -7,6 +7,9 @@ import {
   type IpcMainInvokeEvent,
   ipcMain,
 } from "electron";
+import { logger } from "../lib/logger";
+
+const log = logger.scope("file-watcher");
 
 const WATCHER_IGNORE_PATTERNS = ["**/node_modules/**", "**/.git/**"];
 const DEBOUNCE_MS = 100;
@@ -72,7 +75,7 @@ class FileService {
           return a.name.localeCompare(b.name);
         });
     } catch (error) {
-      console.error("Failed to list directory:", error);
+      log.error("Failed to list directory:", error);
       return [];
     }
   }
@@ -115,7 +118,7 @@ class FileService {
       repoPath,
       (err, events) => {
         if (err) {
-          console.error("Watcher error:", err);
+          log.error("Watcher error:", err);
           return;
         }
 
@@ -162,7 +165,7 @@ class FileService {
         gitDirToWatch,
         (err, events) => {
           if (err) {
-            console.error("Git watcher error:", err);
+            log.error("Git watcher error:", err);
             return;
           }
           if (
@@ -175,7 +178,7 @@ class FileService {
         },
       );
     } catch (error) {
-      console.warn("Failed to set up git watcher:", error);
+      log.warn("Failed to set up git watcher:", error);
     }
 
     state.subscription = subscription;
@@ -196,7 +199,7 @@ class FileService {
           ignore: WATCHER_IGNORE_PATTERNS,
         });
       } catch (error) {
-        console.error("Failed to write snapshot:", error);
+        log.error("Failed to write snapshot:", error);
       }
 
       await state.subscription?.unsubscribe();