sync: update from upstream with type fixes (#21)

* Rework message metadata, timestamps, and tool work log rows (pingdotgg#3022)

Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

* [codex] Sync app-server protocol, service tiers, and provider startup (pingdotgg#3036)

Co-authored-by: codex <codex@users.noreply.github.com>

* [codex] Reduce Git status polling churn (pingdotgg#3037)

Co-authored-by: codex <codex@users.noreply.github.com>

* Fix turn fold proejctions (pingdotgg#3041)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

* fix(git): disable external diff for patch output (pingdotgg#2553)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* [codex] Refine inline tool call timeline UI (pingdotgg#3052)

Co-authored-by: codex <codex@users.noreply.github.com>

* [codex] fix slow websocket shutdown (pingdotgg#2869)

Co-authored-by: Julius Marminge <julius@macmini.local>

* Handle non-resumable pending user input (pingdotgg#2766)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* fix: avoid sending composer during IME enter (pingdotgg#2817)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

---------

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Magnus Alexander Strømseng <magnus.stromseng@gmail.com>
Co-authored-by: Julius Marminge <julius@macmini.local>
Co-authored-by: Mika Cohen <mjc@kernel.org>
Co-authored-by: Huakun <huakun.shen@huakunshen.com>
Co-authored-by: Cursor <cursoragent@cursor.com>

Author: 9 people

apps/desktop/src/backend/tailscaleEndpointProvider.ts

@@ -121,7 +121,7 @@ export const resolveTailscaleAdvertisedEndpoints = Effect.fn("resolveTailscaleAd
       input.readMagicDnsName ??
       readTailscaleStatus.pipe(
         Effect.map((status) => status.magicDnsName),
-        Effect.catch(() => Effect.succeed<string | null>(null)),
+        Effect.orElseSucceed(() => null),
       );
     const dnsName =
       input.statusJson === undefined

apps/mobile/src/app/settings/index.tsx

@@ -1,4 +1,4 @@
-import { useAuth, useUser, useUserProfileModal } from "@clerk/expo";
+import { useAuth, useUser } from "@clerk/expo";
 import * as Notifications from "expo-notifications";
 import { Link, Stack, useRouter } from "expo-router";
 import { SymbolView } from "expo-symbols";
@@ -68,7 +68,6 @@ function ConfiguredSettingsRouteScreen() {
   const { push } = useRouter();
   const { getToken, isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
   const { user } = useUser();
-  const { isAvailable: isUserProfileModalAvailable, presentUserProfile } = useUserProfileModal();
   const { savedConnectionsById } = useRemoteEnvironmentState();
   const [notificationStatus, setNotificationStatus] = useState<NotificationStatus>("checking");
   const [liveActivityStatus, setLiveActivityStatus] = useState<LiveActivityStatus>("checking");
@@ -266,15 +265,11 @@ function ConfiguredSettingsRouteScreen() {
       push("/settings/waitlist");
       return;
     }
-    if (isUserProfileModalAvailable) {
-      void presentUserProfile();
-      return;
-    }
     Alert.alert(
       "T3 Cloud unavailable",
       "Native T3 Cloud account management is not available in this build.",
     );
-  }, [isLoaded, isSignedIn, isUserProfileModalAvailable, presentUserProfile, push]);
+  }, [isLoaded, isSignedIn, push]);
 
   return (
     <View collapsable={false} className="flex-1 bg-sheet">

apps/server/scripts/acp-mock-agent.ts

@@ -22,6 +22,7 @@ const emitXAiAskUserQuestion = process.env.T3_ACP_EMIT_XAI_ASK_USER_QUESTION ===
 const failSetConfigOption = process.env.T3_ACP_FAIL_SET_CONFIG_OPTION === "1";
 const exitOnSetConfigOption = process.env.T3_ACP_EXIT_ON_SET_CONFIG_OPTION === "1";
 const promptResponseText = process.env.T3_ACP_PROMPT_RESPONSE_TEXT;
+const promptDelayMs = Number(process.env.T3_ACP_PROMPT_DELAY_MS ?? "0");
 const permissionOptionIds = {
   allowOnce: process.env.T3_ACP_ALLOW_ONCE_OPTION_ID ?? "allow-once",
   allowAlways: process.env.T3_ACP_ALLOW_ALWAYS_OPTION_ID ?? "allow-always",
@@ -364,6 +365,10 @@ const program = Effect.gen(function* () {
     Effect.gen(function* () {
       const requestedSessionId = String(request.sessionId ?? sessionId);
 
+      if (Number.isFinite(promptDelayMs) && promptDelayMs > 0) {
+        yield* Effect.sleep(`${promptDelayMs} millis`);
+      }
+
       if (emitInterleavedAssistantToolCalls) {
         const toolCallId = "tool-call-1";
 

apps/server/src/codexModelOptions.test.ts

@@ -0,0 +1,22 @@
+import { assert, it } from "@effect/vitest";
+
+import { ProviderInstanceId } from "@t3tools/contracts";
+import { createModelSelection } from "@t3tools/shared/model";
+
+import { getCodexServiceTierOptionValue } from "./codexModelOptions.ts";
+
+it("returns the selected Codex service tier id", () => {
+  const selection = createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.5", [
+    { id: "serviceTier", value: "flex" },
+  ]);
+
+  assert.equal(getCodexServiceTierOptionValue(selection), "flex");
+});
+
+it("keeps legacy persisted fast mode selections working", () => {
+  const selection = createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.4", [
+    { id: "fastMode", value: true },
+  ]);
+
+  assert.equal(getCodexServiceTierOptionValue(selection), "fast");
+});

apps/server/src/codexModelOptions.ts

@@ -0,0 +1,14 @@
+import type { ModelSelection } from "@t3tools/contracts";
+import {
+  getModelSelectionBooleanOptionValue,
+  getModelSelectionStringOptionValue,
+} from "@t3tools/shared/model";
+
+export function getCodexServiceTierOptionValue(
+  modelSelection: ModelSelection | null | undefined,
+): string | undefined {
+  return (
+    getModelSelectionStringOptionValue(modelSelection, "serviceTier") ??
+    (getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true ? "fast" : undefined)
+  );
+}

apps/server/src/git/GitManager.ts

@@ -747,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
     );
   const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (cwd: string) {
     const details = yield* gitCore
-      .statusDetails(cwd)
+      .statusDetailsRemote(cwd)
       .pipe(Effect.catchIf(isNotGitRepositoryError, () => Effect.succeed(null)));
     if (details === null || !details.isRepo) {
       return null;