feat: array.json and scripts qol

Author: jonathanlab

.gitignore

@@ -36,4 +36,7 @@ AGENTS.md
 .envrc
 
 # Session store used for example-client.ts
-.session-store.json
+.session-store.json
+
+.turbo
+.agent-trigger

apps/array/src/main/index.ts

@@ -20,6 +20,7 @@ import {
 // Legacy type kept for backwards compatibility with taskControllers map
 type TaskController = unknown;
 
+import { shellManager } from "./lib/shellManager.js";
 import { setupAgentHotReload } from "./services/dev-reload.js";
 import { registerFileWatcherIpc } from "./services/fileWatcher.js";
 import { registerFoldersIpc } from "./services/folders.js";
@@ -57,8 +58,15 @@ const taskControllers = new Map<string, TaskController>();
 // instead of ::1. This matches how the renderer already reaches the PostHog API.
 dns.setDefaultResultOrder("ipv4first");
 
-// Set app name to ensure consistent userData path across platforms
-app.setName("Array");
+// Set app name based on workspace (for unique userData paths per workspace)
+const workspaceName = process.env.ARRAY_WORKSPACE_NAME;
+const appName = workspaceName ? `Array (${workspaceName})` : "Array";
+app.setName(appName);
+
+// Use workspace-specific data directory if provided
+if (process.env.ARRAY_WORKSPACE_DATA_DIR) {
+  app.setPath("userData", process.env.ARRAY_WORKSPACE_DATA_DIR);
+}
 
 function ensureClaudeConfigDir(): void {
   const existing = process.env.CLAUDE_CONFIG_DIR;
@@ -87,13 +95,16 @@ function setupExternalLinkHandlers(window: BrowserWindow): void {
 }
 
 function createWindow(): void {
+  const windowTitle = workspaceName ? `Array (${workspaceName})` : "Array";
+
   mainWindow = new BrowserWindow({
     width: 900,
     height: 600,
     minWidth: 900,
     minHeight: 600,
     backgroundColor: "#0a0a0a",
     titleBarStyle: "hiddenInset",
+    title: windowTitle,
     show: false,
     webPreferences: {
       nodeIntegration: true,
@@ -111,6 +122,13 @@ function createWindow(): void {
 
   setupExternalLinkHandlers(mainWindow);
 
+  // Kill all shell sessions when renderer reloads (dev hot reload or CMD R)
+  mainWindow.webContents.on("did-start-loading", () => {
+    if (mainWindow?.webContents) {
+      shellManager.destroyByWebContents(mainWindow.webContents);
+    }
+  });
+
   // Set up menu for keyboard shortcuts
   const template: MenuItemConstructorOptions[] = [
     {
@@ -249,6 +267,10 @@ app.on("activate", () => {
 registerAutoUpdater(() => mainWindow);
 
 ipcMain.handle("app:get-version", () => app.getVersion());
+ipcMain.handle(
+  "app:get-workspace-name",
+  () => process.env.ARRAY_WORKSPACE_NAME || null,
+);
 
 // Register IPC handlers via services
 registerPosthogIpc();

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

@@ -83,7 +83,12 @@ class ShellManagerImpl {
     );
 
     const env = buildShellEnv(additionalEnv);
-    const ptyProcess = pty.spawn(shell, ["-l"], {
+
+    // If there's an initial command, spawn shell with -c to run it directly (no echo)
+    // Otherwise spawn an interactive login shell
+    const shellArgs = initialCommand ? ["-c", initialCommand] : ["-l"];
+
+    const ptyProcess = pty.spawn(shell, shellArgs, {
       name: "xterm-256color",
       cols: 80,
       rows: 24,
@@ -108,12 +113,6 @@ class ShellManagerImpl {
       resolveExit({ exitCode });
     });
 
-    if (initialCommand) {
-      setTimeout(() => {
-        ptyProcess.write(`${initialCommand}\n`);
-      }, 100);
-    }
-
     const session: ShellSession = {
       pty: ptyProcess,
       webContents,
@@ -136,15 +135,15 @@ class ShellManagerImpl {
   write(sessionId: string, data: string): void {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      throw new Error(`Shell session ${sessionId} not found`);
+      return;
     }
     session.pty.write(data);
   }
 
   resize(sessionId: string, cols: number, rows: number): void {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      throw new Error(`Shell session ${sessionId} not found`);
+      return;
     }
     session.pty.resize(cols, rows);
   }
@@ -180,6 +179,21 @@ class ShellManagerImpl {
       }
     }
   }
+
+  destroyByWebContents(webContents: WebContents): void {
+    for (const [sessionId, session] of this.sessions.entries()) {
+      if (session.webContents === webContents) {
+        log.info(`Destroying shell session ${sessionId} (webContents reload)`);
+        this.destroy(sessionId);
+      }
+    }
+  }
+
+  destroyAll(): void {
+    for (const sessionId of this.sessions.keys()) {
+      this.destroy(sessionId);
+    }
+  }
 }
 
 export const shellManager = new ShellManagerImpl();

apps/array/src/main/preload.ts

@@ -313,6 +313,8 @@ contextBridge.exposeInMainWorld("electronAPI", {
   onClearStorage: (listener: () => void): (() => void) =>
     createVoidIpcListener("clear-storage", listener),
   getAppVersion: (): Promise<string> => ipcRenderer.invoke("app:get-version"),
+  getWorkspaceName: (): Promise<string | null> =>
+    ipcRenderer.invoke("app:get-workspace-name"),
   onUpdateReady: (listener: () => void): (() => void) =>
     createVoidIpcListener("updates:ready", listener),
   installUpdate: (): Promise<{ installed: boolean }> =>
@@ -465,6 +467,10 @@ contextBridge.exposeInMainWorld("electronAPI", {
       ipcRenderer.invoke("workspace:is-running", taskId),
     getTerminals: (taskId: string): Promise<WorkspaceTerminalInfo[]> =>
       ipcRenderer.invoke("workspace:get-terminals", taskId),
+    stop: (taskId: string): Promise<void> =>
+      ipcRenderer.invoke("workspace:stop", taskId),
+    restart: (taskId: string): Promise<ScriptExecutionResult> =>
+      ipcRenderer.invoke("workspace:restart", taskId),
     onTerminalCreated: (
       listener: IpcEventListener<WorkspaceTerminalInfo & { taskId: string }>,
     ): (() => void) =>

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

@@ -209,7 +209,18 @@ class FileService {
   }
 
   private emit(channel: string, data: unknown): void {
-    this.mainWindow?.webContents.send(channel, data);
+    try {
+      if (
+        this.mainWindow &&
+        !this.mainWindow.isDestroyed() &&
+        this.mainWindow.webContents &&
+        !this.mainWindow.webContents.isDestroyed()
+      ) {
+        this.mainWindow.webContents.send(channel, data);
+      }
+    } catch {
+      // Window or webContents was destroyed, ignore
+    }
   }
 }
 

apps/array/src/main/services/workspace/configLoader.ts

@@ -19,10 +19,12 @@ export interface LoadConfigResult {
 export async function loadConfig(
   worktreePath: string,
   worktreeName: string,
+  mainRepoPath?: string,
 ): Promise<LoadConfigResult> {
   // Search order:
-  // 1. .array/{WORKSPACE_NAME}/array.json (workspace-specific)
-  // 2. {repo-root}/array.json (repository root)
+  // 1. .array/{WORKSPACE_NAME}/array.json (workspace-specific in worktree)
+  // 2. {worktree}/array.json (worktree root)
+  // 3. {main-repo}/array.json (original repo root, for uncommitted configs)
 
   const workspaceConfigPath = path.join(
     worktreePath,
@@ -32,6 +34,9 @@ export async function loadConfig(
   );
 
   const repoConfigPath = path.join(worktreePath, "array.json");
+  const mainRepoConfigPath = mainRepoPath
+    ? path.join(mainRepoPath, "array.json")
+    : null;
 
   // Try workspace-specific config first
   const workspaceResult = await tryLoadConfig(workspaceConfigPath);
@@ -46,7 +51,7 @@ export async function loadConfig(
     return { config: null, source: null };
   }
 
-  // Try repo root config
+  // Try repo root config (worktree path)
   const repoResult = await tryLoadConfig(repoConfigPath);
   if (repoResult.config) {
     log.info(`Loaded config from repo root: ${repoConfigPath}`);
@@ -59,6 +64,21 @@ export async function loadConfig(
     return { config: null, source: null };
   }
 
+  // Try main repo root config (for uncommitted configs in worktree scenarios)
+  if (mainRepoConfigPath && mainRepoConfigPath !== repoConfigPath) {
+    const mainRepoResult = await tryLoadConfig(mainRepoConfigPath);
+    if (mainRepoResult.config) {
+      log.info(`Loaded config from main repo: ${mainRepoConfigPath}`);
+      return { config: mainRepoResult.config, source: "repo" };
+    }
+    if (mainRepoResult.errors) {
+      log.warn(
+        `Invalid config at ${mainRepoConfigPath}: ${mainRepoResult.errors.join(", ")}`,
+      );
+      return { config: null, source: null };
+    }
+  }
+
   return { config: null, source: null };
 }
 

apps/array/src/main/services/workspace/index.ts

@@ -75,6 +75,19 @@ export function registerWorkspaceIpc(
     async () => workspaceService?.getAllWorkspaces() ?? {},
     { rethrow: false, fallback: {} },
   );
+
+  handle<[string], void>("workspace:stop", (_event, taskId) =>
+    getService().stopWorkspace(taskId),
+  );
+
+  handle<[string], ScriptExecutionResult>(
+    "workspace:restart",
+    async (_event, taskId) => getService().restartWorkspace(taskId),
+    {
+      rethrow: false,
+      fallback: { success: false, terminalSessionIds: [], errors: ["Failed"] },
+    },
+  );
 }
 
 export { loadConfig, normalizeScripts } from "./configLoader";