Merge branch 'main' into swap-model-on-plan-card

Author: dmarticus

apps/code/electron.vite.config.ts

@@ -1,4 +1,4 @@
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { builtinModules, createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -45,6 +45,43 @@ const nodeExternals = [
 // the staged node_modules at runtime (see scripts/before-pack.ts).
 const nativeModules = buildExternals;
 
+const nearestPackageType = (fromFile: string): string | undefined => {
+  let dir = path.dirname(fromFile);
+  while (true) {
+    const manifest = path.join(dir, "package.json");
+    if (existsSync(manifest)) {
+      try {
+        return JSON.parse(readFileSync(manifest, "utf-8")).type;
+      } catch {
+        return undefined;
+      }
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) return undefined;
+    dir = parent;
+  }
+};
+
+const resolvesToCommonJs = (name: string): boolean => {
+  let resolved: string;
+  try {
+    resolved = require.resolve(name);
+  } catch {
+    return false;
+  }
+  if (resolved.endsWith(".cjs")) return true;
+  if (resolved.endsWith(".mjs")) return false;
+  return nearestPackageType(resolved) !== "module";
+};
+
+const computeDevThirdPartyExternals = (): RegExp[] =>
+  Object.keys(pkg.dependencies ?? {})
+    .filter((name) => !name.startsWith("@posthog/") && resolvesToCommonJs(name))
+    .map(
+      (name) =>
+        new RegExp(`^${name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(/.+)?$`),
+    );
+
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, path.resolve(__dirname, "../.."), "");
   const isDev = mode === "development";
@@ -115,6 +152,7 @@ export default defineConfig(({ mode }) => {
             "electron/main",
             ...nodeExternals,
             ...nativeModules,
+            ...(isDev ? computeDevThirdPartyExternals() : []),
           ],
           onwarn(warning, warn) {
             if (warning.code === "UNUSED_EXTERNAL_IMPORT") return;

apps/code/package.json

@@ -57,7 +57,7 @@
     "@types/react": "^19.2.15",
     "@types/react-dom": "^19.2.3",
     "@types/semver": "^7.7.1",
-    "@vitejs/plugin-react": "^4.7.0",
+    "@vitejs/plugin-react": "^5.2.0",
     "@vitest/ui": "^4.1.8",
     "adm-zip": "^0.5.17",
     "electron": "^42.3.0",

apps/code/src/renderer/di/bindings.ts

@@ -59,6 +59,8 @@ import {
   type BundleLocalSkill,
   CLOUD_ARTIFACT_BUNDLE_LOCAL_SKILL,
   CLOUD_ARTIFACT_READ_FILE_AS_BASE64,
+  CLOUD_ARTIFACT_RESOLVE_SKILL_DEPENDENCIES,
+  type ResolveSkillBundleDependencies,
 } from "@posthog/core/sessions/cloudArtifactIdentifiers";
 import {
   LOCAL_HANDOFF_DIALOG,
@@ -272,6 +274,7 @@ export interface RendererBindings {
   [REVERT_HUNK_SERVICE]: RevertHunkService;
   [SKILLS_WORKSPACE_CLIENT]: SkillsWorkspaceClient;
   [CLOUD_ARTIFACT_BUNDLE_LOCAL_SKILL]: BundleLocalSkill;
+  [CLOUD_ARTIFACT_RESOLVE_SKILL_DEPENDENCIES]: ResolveSkillBundleDependencies;
   [CLOUD_ARTIFACT_READ_FILE_AS_BASE64]: ReadFileAsBase64;
   [LLM_GATEWAY_SERVICE]: LlmGatewayService;
   [TITLE_GENERATOR_FILE_READ_CLIENT]: FileReadClient;

apps/code/src/renderer/di/container.ts

@@ -32,6 +32,7 @@ import type { LlmMessage } from "@posthog/core/llm-gateway/schemas";
 import {
   CLOUD_ARTIFACT_BUNDLE_LOCAL_SKILL,
   CLOUD_ARTIFACT_READ_FILE_AS_BASE64,
+  CLOUD_ARTIFACT_RESOLVE_SKILL_DEPENDENCIES,
 } from "@posthog/core/sessions/cloudArtifactIdentifiers";
 import {
   LOCAL_HANDOFF_DIALOG,
@@ -393,6 +394,11 @@ container
   .toConstantValue((skillBundleRef) =>
     hostTrpcClient.skills.bundleLocal.query(skillBundleRef),
   );
+container
+  .bind(CLOUD_ARTIFACT_RESOLVE_SKILL_DEPENDENCIES)
+  .toConstantValue((skillBundleRefs) =>
+    hostTrpcClient.skills.resolveDependencies.query(skillBundleRefs),
+  );
 container.bind(LLM_GATEWAY_SERVICE).toConstantValue({
   prompt: (
     messages: LlmMessage[],

apps/code/vite-main-plugins.mts

@@ -119,6 +119,11 @@ function detectBinaryArch(
   return null;
 }
 
+function isStagedCopyCurrent(source: string, dest: string): boolean {
+  if (!existsSync(dest)) return false;
+  return statSync(dest).mtimeMs >= statSync(source).mtimeMs;
+}
+
 function signClaudeBinary(destPath: string): void {
   if (targetPlatform() !== "darwin") return;
   if (process.platform !== "darwin") {
@@ -196,6 +201,11 @@ export function copyClaudeExecutable(): Plugin {
         return;
       }
 
+      if (isStagedCopyCurrent(source, destBinary)) {
+        claudeCliCopied = true;
+        return;
+      }
+
       copyFileSync(source, destBinary);
       if (targetPlatform() !== "win32") {
         execSync(`chmod +x "${destBinary}"`);
@@ -569,6 +579,11 @@ export function copyCodexAcpBinaries(): Plugin {
 
         if (existsSync(sourcePath)) {
           const destPath = join(destDir, binaryName);
+
+          if (isStagedCopyCurrent(sourcePath, destPath)) {
+            continue;
+          }
+
           copyFileSync(sourcePath, destPath);
           console.log(`Copied ${binary.name} binary to ${destDir}`);
 

apps/code/vite.shared.mts

@@ -102,6 +102,10 @@ export const workspaceAliases: Alias[] = [
       "../../packages/workspace-server/src/$1",
     ),
   },
+  {
+    find: /^@posthog\/platform\/(.+)$/,
+    replacement: path.resolve(__dirname, "../../packages/platform/src/$1"),
+  },
 ];
 
 export const mainAliases: Alias[] = [
@@ -113,6 +117,10 @@ export const mainAliases: Alias[] = [
       "../../packages/electron-trpc/src/main/index.ts",
     ),
   },
+  {
+    find: /^@posthog\/git\/(.+)$/,
+    replacement: path.resolve(__dirname, "../../packages/git/src/$1"),
+  },
   ...workspaceAliases,
 ];
 

apps/mobile/package.json

@@ -64,7 +64,7 @@
     "phosphor-react-native": "^3.0.2",
     "posthog-react-native": "^4.18.0",
     "posthog-react-native-session-replay": "^1.6.0",
-    "react": "19.1.0",
+    "react": "19.2.6",
     "react-native": "0.81.5",
     "react-native-keyboard-controller": "1.18.5",
     "react-native-reanimated": "~4.1.1",
@@ -77,11 +77,11 @@
   },
   "devDependencies": {
     "@testing-library/react-native": "^13.3.3",
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.2.0",
     "@types/react-test-renderer": "^19.1.0",
     "@vitejs/plugin-react": "^4.7.0",
     "react-native-svg-transformer": "^1.5.3",
-    "react-test-renderer": "^19.1.0",
+    "react-test-renderer": "^19.2.6",
     "tailwindcss": "^3.4.18",
     "typescript": "~5.9.2",
     "vite": "^6.4.1",

package.json

@@ -61,5 +61,10 @@
       "biome check --write --unsafe --files-ignore-unknown=true --no-errors-on-unmatched",
       "bash -c 'pnpm typecheck'"
     ]
+  },
+  "pnpm": {
+    "overrides": {
+      "vite": "npm:rolldown-vite@7.3.1"
+    }
   }
 }

packages/agent/package.json

@@ -125,7 +125,7 @@
     "tsup": "^8.5.1",
     "tsx": "^4.20.6",
     "typescript": "^5.5.0",
-    "vitest": "^2.1.8"
+    "vitest": "^4.1.8"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "0.25.0",

packages/agent/src/adapters/claude/conversion/acp-to-sdk.ts

@@ -4,6 +4,7 @@ import type { PromptRequest } from "@agentclientprotocol/sdk";
 import type { SDKUserMessage } from "@anthropic-ai/claude-agent-sdk";
 import type { ContentBlockParam } from "@anthropic-ai/sdk/resources";
 import { isClaudeImageMimeType, isImageFile } from "@posthog/shared";
+import { isLocalSkillCommandChunk } from "../../local-skill";
 
 const PDF_EXTENSIONS = new Set(["pdf"]);
 
@@ -80,18 +81,6 @@ function transformMcpCommand(text: string): string {
   return text;
 }
 
-function isLocalSkillCommandChunk(
-  chunk: PromptRequest["prompt"][number],
-  skillName: string,
-): boolean {
-  if (chunk.type !== "text") {
-    return false;
-  }
-
-  const match = chunk.text.trim().match(/^\/([^\s]+)(?:\s+[\s\S]*)?$/);
-  return match?.[1] === skillName;
-}
-
 function processPromptChunk(
   chunk: PromptRequest["prompt"][number],
   content: ContentBlockParam[],