Merge branch 'main' into posthog-code/cloud-resume-keep-message-visible

Author: tatoalo

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

@@ -13,6 +13,10 @@ import {
   type AutoresearchSessionClient,
   type AutoresearchStorageClient,
 } from "@posthog/core/autoresearch/identifiers";
+import {
+  CLOUD_TASK_CLIENT,
+  type CloudTaskClient,
+} from "@posthog/core/cloud-task/cloudTaskClient";
 import {
   CODE_REVIEW_WORKSPACE_CLIENT,
   REVERT_HUNK_SERVICE,
@@ -76,8 +80,10 @@ import {
 import { PI_RUNNER } from "@posthog/core/pi-runtime/identifiers";
 import type { PiRunner } from "@posthog/core/pi-runtime/piRunner";
 import {
-  PI_SESSION_CLIENT,
-  type PiSessionClient,
+  LOCAL_PI_SESSION_FACTORY,
+  PI_SESSION_PROVIDER,
+  type PiSessionFactory,
+  type PiSessionProvider,
 } from "@posthog/core/pi-runtime/piSessionController";
 import {
   type BundleLocalSkill,
@@ -295,7 +301,9 @@ export interface RendererBindings {
   [ANALYTICS_TRACKER]: AnalyticsTracker;
   [TASK_CREATION_HOST]: ITaskCreationHost;
   [PI_RUNNER]: PiRunner;
-  [PI_SESSION_CLIENT]: PiSessionClient;
+  [PI_SESSION_PROVIDER]: PiSessionProvider;
+  [LOCAL_PI_SESSION_FACTORY]: PiSessionFactory;
+  [CLOUD_TASK_CLIENT]: CloudTaskClient;
   [TASK_CREATION_EFFECTS]: TaskCreationEffects;
   [RENDERER_TASK_SERVICE]: TaskService;
   [TASK_SERVICE]: TaskService;

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

@@ -2,6 +2,10 @@ import "reflect-metadata";
 import { useDevFlagsStore } from "@features/dev-toolbar/devFlagsStore";
 import { TypedContainer } from "@inversifyjs/strongly-typed";
 import type { TrpcRouter } from "@main/trpc/router";
+import {
+  CLOUD_TASK_CLIENT,
+  type CloudTaskClient,
+} from "@posthog/core/cloud-task/cloudTaskClient";
 import {
   CODE_REVIEW_WORKSPACE_CLIENT,
   REVERT_HUNK_SERVICE,
@@ -35,7 +39,7 @@ import type { LocalMcpWorkspaceClient } from "@posthog/core/local-mcp/localMcpIm
 import { PI_RUNNER } from "@posthog/core/pi-runtime/identifiers";
 import { piRuntimeModule } from "@posthog/core/pi-runtime/pi-runtime.module";
 import type { PiRunner } from "@posthog/core/pi-runtime/piRunner";
-import { PI_SESSION_CLIENT } from "@posthog/core/pi-runtime/piSessionController";
+import { LOCAL_PI_SESSION_FACTORY } from "@posthog/core/pi-runtime/piSessionController";
 import {
   CLOUD_ARTIFACT_BUNDLE_LOCAL_SKILL,
   CLOUD_ARTIFACT_READ_FILE_AS_BASE64,
@@ -89,7 +93,9 @@ import {
 import { WorkspaceSetupService } from "@posthog/core/workspace/WorkspaceSetupService";
 import { setRootContainer } from "@posthog/di/container";
 import { HOST_TRPC_CLIENT } from "@posthog/host-router/client";
-import { TrpcPiSessionClient } from "@posthog/host-router/pi-session-client";
+import { TrpcCloudTaskClient } from "@posthog/host-router/cloud-task-client";
+import { TrpcPiRunner } from "@posthog/host-router/pi-runner";
+import { TrpcPiSessionFactory } from "@posthog/host-router/pi-session-factory";
 import {
   BROWSER_TABS_CLIENT,
   type BrowserTabsClient,
@@ -156,7 +162,6 @@ import { trpcClient } from "@renderer/trpc";
 import { hostTrpcClient } from "@renderer/trpc/client";
 import type { TRPCClient } from "@trpc/client";
 import { hostLog, logger } from "@utils/logger";
-import { TrpcPiRunner } from "../platform-adapters/trpc-pi-runner";
 import type { RendererBindings } from "./bindings";
 import { TASK_SERVICE as RENDERER_TASK_SERVICE, TRPC_CLIENT } from "./tokens";
 
@@ -297,7 +302,8 @@ container
 // Bind services
 container.bind<ITaskCreationHost>(TASK_CREATION_HOST).to(TrpcTaskCreationHost);
 container.bind<PiRunner>(PI_RUNNER).to(TrpcPiRunner);
-container.bind(PI_SESSION_CLIENT).to(TrpcPiSessionClient);
+container.bind(LOCAL_PI_SESSION_FACTORY).to(TrpcPiSessionFactory);
+container.bind<CloudTaskClient>(CLOUD_TASK_CLIENT).to(TrpcCloudTaskClient);
 container.load(piRuntimeModule);
 container.bind(TASK_CREATION_EFFECTS).toConstantValue(taskCreationEffects);
 container.bind<TaskService>(RENDERER_TASK_SERVICE).to(TaskService);

apps/mobile/eas.json

@@ -4,20 +4,27 @@
     "appVersionSource": "remote"
   },
   "build": {
+    "base": {
+      "node": "22.19.0"
+    },
     "development": {
+      "extends": "base",
       "developmentClient": true,
       "distribution": "internal"
     },
     "preview": {
+      "extends": "base",
       "distribution": "internal"
     },
     "production": {
+      "extends": "base",
       "autoIncrement": true,
       "android": {
         "buildType": "app-bundle"
       }
     },
     "play-registration": {
+      "extends": "base",
       "distribution": "internal",
       "android": {
         "buildType": "apk"

apps/mobile/metro.config.js

@@ -16,12 +16,9 @@ config.resolver.nodeModulesPaths = [
   path.resolve(monorepoRoot, "node_modules"),
 ];
 
-// Force React to resolve from monorepo root, and alias workspace packages
-// directly to their TypeScript source so Babel can transpile them (Metro
-// does not consume the ESM `dist/` build cleanly).
+// Force React to resolve from monorepo root
 config.resolver.extraNodeModules = {
   react: path.resolve(monorepoRoot, "node_modules/react"),
-  "@posthog/shared": path.resolve(monorepoRoot, "packages/shared/src/index.ts"),
 };
 
 // Apply NativeWind first so its resolver/transformer changes are in place
@@ -42,4 +39,35 @@ nativeWindConfig.resolver = {
   sourceExts: [...nativeWindConfig.resolver.sourceExts, "svg"],
 };
 
+// Resolve @posthog/shared to its TypeScript source so Babel transpiles it.
+// Its package.json `exports` point at `dist/`, which is only present after a
+// `pnpm build` -- EAS Build never runs one, so bundling there fails outright.
+// This must be a resolveRequest hook rather than an `extraNodeModules` alias:
+// pnpm symlinks the package into node_modules, so Metro resolves it there
+// first and never consults the alias, and an alias also cannot map subpath
+// imports like `@posthog/shared/domain-types`.
+const SHARED_PACKAGE = "@posthog/shared";
+const sharedSrc = path.resolve(monorepoRoot, "packages/shared/src");
+const upstreamResolveRequest = nativeWindConfig.resolver.resolveRequest;
+
+nativeWindConfig.resolver.resolveRequest = (context, moduleName, platform) => {
+  if (
+    moduleName === SHARED_PACKAGE ||
+    moduleName.startsWith(`${SHARED_PACKAGE}/`)
+  ) {
+    const subpath = moduleName.slice(SHARED_PACKAGE.length + 1) || "index";
+    return context.resolveRequest(
+      context,
+      path.join(sharedSrc, subpath),
+      platform,
+    );
+  }
+
+  return (upstreamResolveRequest ?? context.resolveRequest)(
+    context,
+    moduleName,
+    platform,
+  );
+};
+
 module.exports = nativeWindConfig;

apps/mobile/src/app/task/[id].tsx

@@ -1,22 +1,29 @@
 import { Text } from "@components/text";
-import { DEFAULT_CLAUDE_EXECUTION_MODE } from "@posthog/core/sessions/executionModes";
+import { getCloudReasoningConfigOptionId } from "@posthog/core/sessions/cloudSessionConfig";
+import { getDefaultExecutionModeForAdapter } from "@posthog/core/sessions/executionModes";
 import {
   countUserMessages,
   getSessionActivityPhase,
 } from "@posthog/core/sessions/sessionActivity";
+import type { CloudComposerSelection } from "@posthog/core/task-detail/composerModelPolicy";
 import { isTaskRunning } from "@posthog/core/tasks/taskArchive";
 import {
+  type Adapter,
+  DEFAULT_CODEX_MODEL,
   DEFAULT_GATEWAY_MODEL,
   DEFAULT_REASONING_EFFORT,
   type ExecutionMode,
-  getReasoningEffortOptions,
+  isModalModelId,
+  isSupportedReasoningEffort,
+  KIMI_MODEL_FLAG,
   type SupportedReasoningEffort,
   serializeCloudPrompt,
   type Task,
 } from "@posthog/shared";
 import { useQueryClient } from "@tanstack/react-query";
 import * as Haptics from "expo-haptics";
 import { useLocalSearchParams, useRouter } from "expo-router";
+import { useFeatureFlag } from "posthog-react-native";
 import { useCallback, useEffect, useRef, useState } from "react";
 import {
   ActivityIndicator,
@@ -57,6 +64,7 @@ import {
 import { useTaskSessionStore } from "@/features/tasks/stores/taskSessionStore";
 import { useTaskStore } from "@/features/tasks/stores/taskStore";
 import { confirmStopRun } from "@/features/tasks/utils/archiveGuard";
+import { buildCloudTaskRunConfig } from "@/features/tasks/utils/cloudTaskRunConfig";
 import { useScreenInsets } from "@/hooks/useScreenInsets";
 import {
   ANALYTICS_EVENTS,
@@ -167,11 +175,45 @@ export default function TaskDetailScreen() {
   const [initialComposerMessage, setInitialComposerMessage] = useState<
     string | undefined
   >();
+  const composerAdapter: Adapter =
+    task?.latest_run?.runtime_adapter &&
+    !session?.terminalStatus &&
+    composerConfig?.adapter !== task.latest_run.runtime_adapter
+      ? task.latest_run.runtime_adapter
+      : (composerConfig?.adapter ??
+        task?.latest_run?.runtime_adapter ??
+        "claude");
+  const composerConfigMatchesAdapter =
+    composerConfig?.adapter === undefined
+      ? composerAdapter === "claude"
+      : composerConfig.adapter === composerAdapter;
   const composerMode: ExecutionMode =
-    composerConfig?.mode ?? DEFAULT_CLAUDE_EXECUTION_MODE;
-  const composerModel = composerConfig?.model ?? DEFAULT_GATEWAY_MODEL;
+    (composerConfigMatchesAdapter ? composerConfig?.mode : undefined) ??
+    getDefaultExecutionModeForAdapter(composerAdapter);
+  const kimiEnabled = !!useFeatureFlag(KIMI_MODEL_FLAG);
+  const persistedComposerModel =
+    (composerConfigMatchesAdapter ? composerConfig?.model : undefined) ??
+    task?.latest_run?.model ??
+    (composerAdapter === "codex" ? DEFAULT_CODEX_MODEL : DEFAULT_GATEWAY_MODEL);
+  // Fall a persisted Kimi selection back to the default when the flag is off so
+  // a hidden model never gets sent on the retry-after-terminal path. The
+  // composer independently re-resolves against the live config once mounted.
+  const composerModel =
+    !kimiEnabled && isModalModelId(persistedComposerModel)
+      ? DEFAULT_GATEWAY_MODEL
+      : persistedComposerModel;
+  const requestedComposerReasoning = composerConfigMatchesAdapter
+    ? composerConfig?.reasoning
+    : undefined;
   const composerReasoning: SupportedReasoningEffort =
-    composerConfig?.reasoning ?? DEFAULT_REASONING_EFFORT;
+    requestedComposerReasoning &&
+    isSupportedReasoningEffort(
+      composerAdapter,
+      composerModel,
+      requestedComposerReasoning,
+    )
+      ? requestedComposerReasoning
+      : DEFAULT_REASONING_EFFORT;
 
   const messagingMode = useMessagingMode(taskId);
   const queuedCount = useQueuedCount(taskId);
@@ -314,18 +356,18 @@ export default function TaskDetailScreen() {
               )
             : text;
 
-        const supportsReasoning =
-          getReasoningEffortOptions("claude", composerModel) !== null;
         const updatedTask = await getPostHogApiClient().runTaskInCloud(
           taskId,
           undefined,
           {
             resumeFromRunId: task.latest_run?.id,
             pendingUserMessage,
-            adapter: "claude",
-            model: composerModel,
-            reasoningLevel: supportsReasoning ? composerReasoning : undefined,
-            initialPermissionMode: composerMode,
+            ...buildCloudTaskRunConfig({
+              adapter: composerAdapter,
+              mode: composerMode,
+              model: composerModel,
+              reasoning: composerReasoning,
+            }),
             rtkEnabled: usePreferencesStore.getState().rtkEnabledCloud,
           },
         );
@@ -351,6 +393,7 @@ export default function TaskDetailScreen() {
       connectToTask,
       updateTaskInCache,
       composerMode,
+      composerAdapter,
       composerModel,
       composerReasoning,
     ],
@@ -507,6 +550,17 @@ export default function TaskDetailScreen() {
     [taskId, setComposerConfig, setConfigOption],
   );
 
+  const handleAdapterChange = useCallback(
+    (selection: CloudComposerSelection) => {
+      if (!taskId) return;
+      setComposerConfig(taskId, selection);
+      const preferences = usePreferencesStore.getState();
+      preferences.setLastNewTaskMode(selection.mode);
+      preferences.setLastUsedReasoningEffort(selection.reasoning);
+    },
+    [taskId, setComposerConfig],
+  );
+
   const handleModelChange = useCallback(
     (value: string) => {
       if (!taskId) return;
@@ -520,10 +574,14 @@ export default function TaskDetailScreen() {
     (value: SupportedReasoningEffort) => {
       if (!taskId) return;
       setComposerConfig(taskId, { reasoning: value });
-      setConfigOption(taskId, "effort", value).catch(() => {});
+      setConfigOption(
+        taskId,
+        getCloudReasoningConfigOptionId(composerAdapter),
+        value,
+      ).catch(() => {});
       usePreferencesStore.getState().setLastUsedReasoningEffort(value);
     },
-    [taskId, setComposerConfig, setConfigOption],
+    [taskId, composerAdapter, setComposerConfig, setConfigOption],
   );
 
   const handleStop = useCallback(() => {
@@ -575,6 +633,12 @@ export default function TaskDetailScreen() {
         undefined,
         {
           resumeFromRunId: task.latest_run?.id,
+          ...buildCloudTaskRunConfig({
+            adapter: composerAdapter,
+            mode: composerMode,
+            model: composerModel,
+            reasoning: composerReasoning,
+          }),
           rtkEnabled: usePreferencesStore.getState().rtkEnabledCloud,
         },
       );
@@ -591,7 +655,17 @@ export default function TaskDetailScreen() {
         "Could not restart the task. Please try again.",
       );
     }
-  }, [taskId, task, disconnectFromTask, connectToTask, updateTaskInCache]);
+  }, [
+    taskId,
+    task,
+    disconnectFromTask,
+    connectToTask,
+    updateTaskInCache,
+    composerAdapter,
+    composerModel,
+    composerReasoning,
+    composerMode,
+  ]);
 
   // Clear retrying once the agent finishes a turn or the run terminates.
   useEffect(() => {
@@ -785,6 +859,9 @@ export default function TaskDetailScreen() {
             />
           ) : null}
           <TaskChatComposer
+            key={taskId}
+            adapter={composerAdapter}
+            canChangeAdapter={!!session?.terminalStatus}
             onSend={handleSendPrompt}
             restoredDraft={restoredDraft}
             editing={!!editingQueuedId}
@@ -798,6 +875,7 @@ export default function TaskDetailScreen() {
             mode={composerMode}
             model={composerModel}
             reasoning={composerReasoning}
+            onAdapterChange={handleAdapterChange}
             onModeChange={handleModeChange}
             onModelChange={handleModelChange}
             onReasoningChange={handleReasoningChange}