Merge branch 'main' into inbox-session-problems

Author: Twixes

.gitignore

@@ -39,6 +39,8 @@ AGENTS.md
 MEMORY.md
 .claude-config/
 .agent-trigger
+.posthog-code/
+.claude/worktrees/
 
 # Testing
 playwright-results/

.posthog-code/environments/twig.toml

@@ -14,8 +14,8 @@
 ## Commands
 
 - `pnpm install` - Install all dependencies
-- `pnpm dev` - Run both agent (watch) and code app via mprocs
-- `pnpm dev:ph` - Run both agent (watch) and code app via phrocs
+- `pnpm dev` - Run both agent (watch) and code app via phrocs
+- `pnpm dev:mprocs` - Run both agent (watch) and code app via mprocs
 - `pnpm dev:agent` - Run agent package in watch mode only
 - `pnpm dev:code` - Run code desktop app only
 - `pnpm build` - Build all packages (turbo)

CLAUDE.md

@@ -34,7 +34,7 @@ cp .env.example .env
 
 ### Running in Development
 
-By default, `pnpm dev` uses [mprocs](https://github.com/pvolok/mprocs) to run the agent and code app in parallel.
+By default, `pnpm dev` uses phrocs (our custom process runner) to run the agent and code app in parallel. phrocs auto-installs on first run and reads the `mprocs.yaml` config file. The binary is downloaded to `bin/phrocs` and is git-ignored.
 
 ```bash
 # Run both agent (watch mode) and code app in parallel
@@ -43,21 +43,13 @@ pnpm dev
 # Or run them separately:
 pnpm dev:agent  # Run agent in watch mode
 pnpm dev:code   # Run code app
-```
-
-### phrocs (alpha)
-
-phrocs is our custom process runner built as a replacement for mprocs. It's currently in alpha and can be used as an alternative dev runner. phrocs does not auto-update — you must manually run the update command to pull the latest version.
-
-```bash
-# Run dev with phrocs (auto-installs on first run)
-pnpm dev:ph
 
 # Manually update phrocs to the latest version
 pnpm update:phrocs
-```
 
-phrocs reads the same `mprocs.yaml` config file. The binary is downloaded to `bin/phrocs` and is git-ignored.
+# Use mprocs instead of phrocs
+pnpm dev:mprocs
+```
 
 > **Want to connect to a local PostHog instance?** See [docs/LOCAL-DEVELOPMENT.md](./docs/LOCAL-DEVELOPMENT.md) for OAuth setup and connecting to localhost:8010.
 

README.md

@@ -173,6 +173,13 @@ const config: ForgeConfig = {
     new MakerDMG({
       icon: "./build/app-icon.icns",
       format: "ULFO",
+      background: "./build/dmg-background.png",
+      iconSize: 80,
+      window: { size: { width: 540, height: 380 } },
+      contents: (opts) => [
+        { x: 135, y: 225, type: "file", path: opts.appPath },
+        { x: 405, y: 225, type: "link", path: "/Applications" },
+      ],
       ...(shouldSignMacApp && appleCodesignIdentity
         ? {
             "code-sign": {

apps/code/build/dmg-background.png

@@ -52,7 +52,7 @@
     "@electron-forge/shared-types": "^7.11.1",
     "@electron/rebuild": "^4.0.3",
     "@playwright/test": "^1.42.0",
-    "@posthog/rollup-plugin": "^1.2.6",
+    "@posthog/rollup-plugin": "^1.4.0",
     "@storybook/addon-a11y": "10.2.0",
     "@storybook/addon-docs": "10.2.0",
     "@storybook/react-vite": "10.2.0",
@@ -130,10 +130,7 @@
     "@posthog/electron-trpc": "workspace:*",
     "@posthog/git": "workspace:*",
     "@posthog/hedgehog-mode": "^0.0.48",
-    "@posthog/quill-blocks": "link:/Users/adamleithp/Dev/posthog/packages/quill/packages/blocks",
-    "@posthog/quill-components": "link:/Users/adamleithp/Dev/posthog/packages/quill/packages/components",
-    "@posthog/quill-primitives": "link:/Users/adamleithp/Dev/posthog/packages/quill/packages/primitives",
-    "@posthog/quill-tokens": "link:/Users/adamleithp/Dev/posthog/packages/quill/packages/tokens",
+    "@posthog/quill": "0.1.0-alpha.6",
     "@posthog/shared": "workspace:*",
     "@radix-ui/react-collapsible": "^1.1.12",
     "@radix-ui/react-icons": "^1.3.2",
@@ -190,6 +187,7 @@
     "rehype-sanitize": "^6.0.0",
     "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.1",
+    "shadcn": "^4.1.2",
     "smol-toml": "^1.6.0",
     "sonner": "^2.0.7",
     "striptags": "^3.2.0",

apps/code/forge.config.ts

@@ -10,10 +10,10 @@ if [ ! -f "$PLIST_FILE" ]; then
   exit 0
 fi
 
-if /usr/libexec/PlistBuddy -c "Print :CFBundleName" "$PLIST_FILE" | grep -q "Array (Development)"; then
+if /usr/libexec/PlistBuddy -c "Print :CFBundleName" "$PLIST_FILE" | grep -q "PostHog Code (Development)"; then
   exit 0
 fi
 
-/usr/libexec/PlistBuddy -c "Set :CFBundleName 'Array (Development)'" "$PLIST_FILE"
-/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName 'Array (Development)'" "$PLIST_FILE"
+/usr/libexec/PlistBuddy -c "Set :CFBundleName 'PostHog Code (Development)'" "$PLIST_FILE"
+/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName 'PostHog Code (Development)'" "$PLIST_FILE"
 /usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier 'com.posthog.array.dev'" "$PLIST_FILE"

apps/code/package.json

@@ -1,4 +1,4 @@
-import type { CloudRegion } from "@shared/types/oauth";
+import type { CloudRegion } from "@shared/types/regions";
 import { eq } from "drizzle-orm";
 import { inject, injectable } from "inversify";
 import { MAIN_TOKENS } from "../../di/tokens";

apps/code/scripts/patch-electron-name.sh

@@ -1,6 +1,11 @@
 import { exposeElectronTRPC } from "@posthog/electron-trpc/main";
+import { contextBridge, webUtils } from "electron";
 import "electron-log/preload";
 
+contextBridge.exposeInMainWorld("electronUtils", {
+  getPathForFile: (file: File) => webUtils.getPathForFile(file),
+});
+
 process.once("loaded", async () => {
   exposeElectronTRPC();
 });