chore: merge upstream pingdotgg/t3code through 42da166d13

apps/desktop/src/app/DesktopObservability.ts

@@ -4,6 +4,7 @@ import {
   makeTraceSink,
   type SignalExport,
 } from "@t3tools/shared/observability";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as SharedObservability from "@t3tools/shared/observability";
 import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 import {
@@ -625,12 +626,16 @@ const layerTelemetry = Layer.unwrap(
   Effect.gen(function* () {
     const environment = yield* DesktopEnvironment.DesktopEnvironment;
     const endpoints = yield* resolveOtlpEndpoints;
+    // `host.name` keeps machines apart on a shared collector; one set in
+    // `OTEL_RESOURCE_ATTRIBUTES` wins, since explicit attributes override it.
     const resource = {
       serviceName: "t3code-desktop",
+      serviceVersion: environment.appVersion,
       attributes: {
         "service.namespace": "t3code",
         "service.runtime": "desktop",
         "service.mode": environment.isDevelopment ? "development" : "packaged",
+        "host.name": endpoints.resourceAttributes["host.name"] || (yield* HostProcess.Hostname),
       },
     };
 

apps/desktop/src/shell/DesktopShellEnvironment.test.ts

@@ -367,6 +367,32 @@ describe("DesktopShellEnvironment", () => {
     }),
   );
 
+  it.effect("hydrates missing CA trust variables from the login shell", () =>
+    Effect.gen(function* () {
+      const env: NodeJS.ProcessEnv = {
+        SHELL: "/bin/zsh",
+        PATH: "/usr/bin",
+        SSL_CERT_DIR: "/etc/ssl/certs",
+      };
+
+      yield* runShellEnvironment({
+        env,
+        platform: "darwin",
+        handler: () =>
+          envOutput({
+            PATH: "/opt/zerobrew/bin:/usr/bin",
+            SSL_CERT_FILE: "/opt/zerobrew/etc/ca-certificates/cacert.pem",
+            SSL_CERT_DIR: "/opt/zerobrew/etc/ca-certificates",
+            NODE_EXTRA_CA_CERTS: "/Users/me/corp-root.pem",
+          }),
+      });
+
+      assert.equal(env.SSL_CERT_FILE, "/opt/zerobrew/etc/ca-certificates/cacert.pem");
+      assert.equal(env.SSL_CERT_DIR, "/etc/ssl/certs");
+      assert.equal(env.NODE_EXTRA_CA_CERTS, "/Users/me/corp-root.pem");
+    }),
+  );
+
   it.effect("keeps mise's PATH record with the login shell PATH", () =>
     Effect.gen(function* () {
       const env: NodeJS.ProcessEnv = {

apps/desktop/src/shell/DesktopShellEnvironment.ts

@@ -86,6 +86,9 @@ const LOGIN_SHELL_ENV_NAMES = [
   "XDG_SESSION_DESKTOP",
   "XDG_SESSION_TYPE",
   "WAYLAND_DISPLAY",
+  "SSL_CERT_FILE",
+  "SSL_CERT_DIR",
+  "NODE_EXTRA_CA_CERTS",
   "T3CODE_TELEMETRY_ENABLED",
   "__MISE_DIFF",
 ] as const;
@@ -454,6 +457,12 @@ const installPosixEnvironment = Effect.fn("desktop.shellEnvironment.installPosix
       "XDG_DATA_HOME",
       "XDG_RUNTIME_DIR",
       "WAYLAND_DISPLAY",
+      // CA trust set in the shell profile. Without it, a Node or OpenSSL build
+      // that has no bundled roots (a shared-OpenSSL node on PATH) cannot verify
+      // TLS, so provider updaters and agents fail to reach their registries.
+      "SSL_CERT_FILE",
+      "SSL_CERT_DIR",
+      "NODE_EXTRA_CA_CERTS",
       // The telemetry opt-out is documented as a shell variable; GUI launches never see it.
       "T3CODE_TELEMETRY_ENABLED",
     ] as const) {

apps/mobile/src/components/AndroidScreenHeader.tsx

@@ -6,6 +6,7 @@ import { AppText as Text } from "./AppText";
 import { cn } from "../lib/cn";
 import { MaterialIconButton } from "./MaterialIconButton";
 import { AndroidAnchoredMenu } from "./AndroidAnchoredMenu";
+import { splitAndroidHeaderActions } from "./headerMenu.android";
 import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
 import { useMaterialToolbarLayout } from "./useMaterialToolbarLayout";
 
@@ -16,6 +17,8 @@ export interface AndroidHeaderAction {
   readonly disabled?: boolean;
   readonly loading?: boolean;
   readonly selected?: boolean;
+  readonly destructive?: boolean;
+  readonly overflowOnly?: boolean;
 }
 
 export function AndroidHeaderIconButton(props: {
@@ -45,10 +48,10 @@ export function AndroidScreenHeader(props: {
     props.embedded,
   );
   const [headerWidth, setHeaderWidth] = useState(0);
-  const actions = props.actions ?? [];
-  const directCount = actions.length > 2 ? (headerWidth >= 600 ? 3 : 1) : actions.length;
-  const visibleActions = actions.slice(0, directCount);
-  const overflowActions = actions.slice(directCount);
+  const { visibleActions, overflowActions } = splitAndroidHeaderActions(
+    props.actions ?? [],
+    headerWidth >= 600,
+  );
 
   return (
     <View
@@ -115,6 +118,7 @@ export function AndroidScreenHeader(props: {
               title: action.accessibilityLabel,
               attributes: {
                 disabled: Boolean(action.disabled),
+                destructive: action.destructive,
                 state: action.selected ? "on" : undefined,
               },
             }))}

apps/mobile/src/components/AppSymbol.tsx

@@ -175,6 +175,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   circle: IconCircle,
   "circle.dashed": IconCircleDashed,
   "circle.inset.filled": IconCircleDot,
+  "circle.dashed.inset.filled": IconCircleDot,
   clock: IconClock,
   timer: IconClock,
   ticket: IconTicket,

apps/mobile/src/components/ProviderIcon.tsx

@@ -1,8 +1,8 @@
 import { Image } from "expo-image";
-import { Path, Svg } from "react-native-svg";
+import { Defs, LinearGradient, Path, Stop, Svg } from "react-native-svg";
 import { View } from "react-native";
 import { providerInstanceInitials } from "@t3tools/client-runtime/state/provider-instance-display";
-import { useState } from "react";
+import { useId, useState } from "react";
 import { resolveOfficialAcpRegistryIconUrl } from "@t3tools/contracts";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 import { AppText as Text } from "./AppText";
@@ -66,6 +66,7 @@ function AcpRegistryProviderIcon(props: {
 export function ProviderIcon(props: ProviderIconProps) {
   const { themeAppearance } = useAppearancePreferences();
   const isDarkMode = themeAppearance === "dark";
+  const gradientId = useId();
   const size = props.size ?? 16;
   const mono = isDarkMode ? "#e5e5e5" : "#171717";
 
@@ -99,12 +100,35 @@ export function ProviderIcon(props: ProviderIconProps) {
       isDarkMode ? fill.dark : fill.light;
     return (
       <Svg width={size} height={size} viewBox={packageIcon.viewBox} fill="none">
-        {packageIcon.paths.map((path) => (
+        <Defs>
+          {packageIcon.paths.map((path, index) =>
+            path.gradient ? (
+              <LinearGradient
+                key={path.d}
+                id={`${gradientId}-${index}`}
+                x1={path.gradient.x1}
+                y1={path.gradient.y1}
+                x2={path.gradient.x2}
+                y2={path.gradient.y2}
+                gradientUnits="userSpaceOnUse"
+              >
+                {path.gradient.stops.map((stop) => (
+                  <Stop key={stop.offset} offset={stop.offset} stopColor={stop.color} />
+                ))}
+              </LinearGradient>
+            ) : null,
+          )}
+        </Defs>
+        {packageIcon.paths.map((path, index) => (
           <Path
             key={path.d}
             d={path.d}
             fillRule={path.fillRule}
-            fill={themeFill(path.fill ?? packageIcon.fill)}
+            fill={
+              path.gradient
+                ? `url(#${gradientId}-${index})`
+                : themeFill(path.fill ?? packageIcon.fill)
+            }
           />
         ))}
       </Svg>

apps/mobile/src/components/headerMenu.android.ts

@@ -41,3 +41,16 @@ export function findHeaderMenuAction(
   }
   return undefined;
 }
+
+export function splitAndroidHeaderActions<Action extends { readonly overflowOnly?: boolean }>(
+  actions: ReadonlyArray<Action>,
+  wide: boolean,
+) {
+  const inline = actions.filter((action) => !action.overflowOnly);
+  const directCount = actions.length > 2 ? (wide ? 3 : 1) : inline.length;
+  const visibleActions = inline.slice(0, directCount);
+  return {
+    visibleActions,
+    overflowActions: actions.filter((action) => !visibleActions.includes(action)),
+  };
+}

apps/mobile/src/components/headerMenu.test.ts

@@ -1,5 +1,9 @@
 import { describe, expect, it } from "vite-plus/test";
-import { androidHeaderMenuActions, findHeaderMenuAction } from "./headerMenu.android";
+import {
+  androidHeaderMenuActions,
+  findHeaderMenuAction,
+  splitAndroidHeaderActions,
+} from "./headerMenu.android";
 import type { ScreenHeaderMenuItem } from "./ScreenHeader.types";
 
 const items: ReadonlyArray<ScreenHeaderMenuItem> = [
@@ -63,4 +67,36 @@ describe("header menus", () => {
     expect(findHeaderMenuAction(items, "sessions")).toBeUndefined();
     expect(findHeaderMenuAction(items, "removed-session")).toBeUndefined();
   });
+
+  it("keeps overflow-only Android header actions in the overflow menu", () => {
+    const action = (accessibilityLabel: string, overflowOnly?: boolean) => ({
+      accessibilityLabel,
+      icon: "trash" as const,
+      onPress: () => {},
+      overflowOnly,
+    });
+    const labels = (
+      split: ReturnType<typeof splitAndroidHeaderActions<ReturnType<typeof action>>>,
+    ) => ({
+      visible: split.visibleActions.map((item) => item.accessibilityLabel),
+      overflow: split.overflowActions.map((item) => item.accessibilityLabel),
+    });
+    const open = action("Open");
+    const remove = action("Delete", true);
+    expect(labels(splitAndroidHeaderActions([open, action("Comment")], false))).toEqual({
+      visible: ["Open", "Comment"],
+      overflow: [],
+    });
+    expect(labels(splitAndroidHeaderActions([open, remove], true))).toEqual({
+      visible: ["Open"],
+      overflow: ["Delete"],
+    });
+    expect(labels(splitAndroidHeaderActions([remove], true))).toEqual({
+      visible: [],
+      overflow: ["Delete"],
+    });
+    expect(
+      labels(splitAndroidHeaderActions([action("Review"), action("Comment"), open, remove], true)),
+    ).toEqual({ visible: ["Review", "Comment", "Open"], overflow: ["Delete"] });
+  });
 });

apps/mobile/src/features/home/useThreadListActions.ts

@@ -312,7 +312,9 @@ export function useThreadListActions(): {
         if (!canSnooze(thread, { now: new Date().toISOString() })) {
           Alert.alert(
             "Could not snooze thread",
-            thread.hasPendingApprovals || thread.hasPendingUserInput
+            thread.hasPendingApprovals ||
+              thread.hasPendingUserInput ||
+              thread.pendingSubagentRequest != null
               ? "This thread is waiting on you. Respond to the pending request before snoozing it."
               : "This thread is still starting a turn. Try again once it's running.",
           );

apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx

@@ -1,6 +1,11 @@
+import { sortProjectsByGroupOrder } from "@t3tools/client-runtime/state/project-grouping";
+import { useMemo } from "react";
 import { ScrollView } from "react-native";
 import type { ControlPillMenuProps } from "../../components/ControlPillMenu.types";
 import { ListFilterMenu } from "../workspace/ListFilterMenu";
+import { useProjects, useThreadShells } from "../../state/entities";
+import { useMobileProjectGroupingSettings } from "../../state/project-grouping";
+import { buildHomeProjectScopes, sortHomeProjectScopes } from "../home/homeThreadList";
 import { DEFAULT_PR_LIST_CONTROLS, type PullRequestListControls } from "./pullRequestList";
 
 const STATES = { open: "Open", closed: "Closed", merged: "Merged", all: "All states" } as const;
@@ -28,6 +33,30 @@ function choices(field: string, options: Readonly<Record<string, string>>, selec
   }));
 }
 
+/** The project list's own order, which is the order its sidebar and new-task picker show. */
+function useProjectsInSidebarOrder<Project extends { id: string; environmentId: string }>(
+  projects: readonly Project[],
+) {
+  const allProjects = useProjects();
+  const threads = useThreadShells();
+  const { sidebarProjectGroupingMode } = useMobileProjectGroupingSettings();
+  const scopes = useMemo(
+    () =>
+      sortHomeProjectScopes({
+        scopes: buildHomeProjectScopes({
+          projects: allProjects,
+          environmentId: null,
+          projectGroupingMode: sidebarProjectGroupingMode,
+        }),
+        threads,
+        pendingTasks: [],
+        projectSortOrder: "updated_at",
+      }).map((scope) => ({ memberProjectRefs: scope.projectRefs })),
+    [allProjects, sidebarProjectGroupingMode, threads],
+  );
+  return useMemo(() => sortProjectsByGroupOrder(projects, scopes), [projects, scopes]);
+}
+
 export function PullRequestListFilters(props: {
   readonly environments: readonly { id: string; label: string }[];
   readonly environmentId: string | null;
@@ -39,6 +68,7 @@ export function PullRequestListFilters(props: {
   readonly projects: readonly { id: string; title: string; environmentId: string }[];
 }) {
   const { value } = props;
+  const projects = useProjectsInSidebarOrder(props.projects);
   const selectedLabels = value.filters.labels?.flat() ?? [];
   const selectedLabelSet = new Set(selectedLabels);
   const author = value.filters.author;
@@ -76,7 +106,7 @@ export function PullRequestListFilters(props: {
         props.onChange({ ...value, sort: next as PullRequestListControls["sort"] });
         break;
       case "project": {
-        const project = props.projects.find(
+        const project = projects.find(
           (project) => JSON.stringify([project.environmentId, project.id]) === next,
         );
         props.onChange({
@@ -165,15 +195,15 @@ export function PullRequestListFilters(props: {
     {
       id: "projects",
       title:
-        props.projects.find(
+        projects.find(
           (project) =>
             project.id === value.projectId && project.environmentId === value.projectEnvironmentId,
         )?.title ?? "Project",
       subactions: choices(
         "project",
         Object.fromEntries([
           ["", "All projects"],
-          ...props.projects.map((project) => [
+          ...projects.map((project) => [
             JSON.stringify([project.environmentId, project.id]),
             project.title,
           ]),

apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx

@@ -154,7 +154,7 @@ export function PullRequestReviewSheet({
         />
       }
     >
-      {reviewing && offered.length ? (
+      {reviewing && offered.length > 1 ? (
         <SegmentedControl
           options={offered.map((option) => ({ value: option.value, label: option.title }))}
           selected={verdict?.value ?? "comment"}