sync: integrate upstream wave 2 through 652515a34

apps/desktop/src/backend/DesktopBackendManager.ts

@@ -663,15 +663,13 @@ export const makeBackendInstance = Effect.fn("makeBackendInstance")(function* (
     Ref.update(state, withActiveRun(runId, f));
 
   const snapshot = Ref.get(state).pipe(
-    Effect.map(
-      (current): DesktopBackendSnapshot => ({
-        desiredRunning: current.desiredRunning,
-        ready: current.ready,
-        activePid: activePid(current.active),
-        restartAttempt: current.restartAttempt,
-        restartScheduled: Option.isSome(current.restartFiber),
-      }),
-    ),
+    Effect.map((current): DesktopBackendSnapshot => ({
+      desiredRunning: current.desiredRunning,
+      ready: current.ready,
+      activePid: activePid(current.active),
+      restartAttempt: current.restartAttempt,
+      restartScheduled: Option.isSome(current.restartFiber),
+    })),
   );
   const currentConfig = Ref.get(state).pipe(Effect.map((current) => current.config));
 

apps/desktop/src/ipc/DesktopIpcHandlers.ts

@@ -21,6 +21,7 @@ import {
   fetchSshEnvironmentDescriptor,
   fetchSshSessionState,
   issueSshWebSocketTicket,
+  resolveSshHost,
   resolveSshPasswordPrompt,
 } from "./methods/sshEnvironment.ts";
 import {
@@ -72,6 +73,7 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
   yield* ipc.handle(clearConnectionCatalog);
 
   yield* ipc.handle(discoverSshHosts);
+  yield* ipc.handle(resolveSshHost);
   yield* ipc.handle(ensureSshEnvironment);
   yield* ipc.handle(disconnectSshEnvironment);
   yield* ipc.handle(fetchSshEnvironmentDescriptor);

apps/desktop/src/ipc/channels.ts

@@ -33,6 +33,7 @@ export const GET_CONNECTION_CATALOG_CHANNEL = "desktop:get-connection-catalog";
 export const SET_CONNECTION_CATALOG_CHANNEL = "desktop:set-connection-catalog";
 export const CLEAR_CONNECTION_CATALOG_CHANNEL = "desktop:clear-connection-catalog";
 export const DISCOVER_SSH_HOSTS_CHANNEL = "desktop:discover-ssh-hosts";
+export const RESOLVE_SSH_HOST_CHANNEL = "desktop:resolve-ssh-host";
 export const ENSURE_SSH_ENVIRONMENT_CHANNEL = "desktop:ensure-ssh-environment";
 export const DISCONNECT_SSH_ENVIRONMENT_CHANNEL = "desktop:disconnect-ssh-environment";
 export const FETCH_SSH_ENVIRONMENT_DESCRIPTOR_CHANNEL = "desktop:fetch-ssh-environment-descriptor";

apps/desktop/src/ipc/methods/sshEnvironment.ts

@@ -117,6 +117,16 @@ export const discoverSshHosts = DesktopIpc.makeIpcMethod({
   }),
 });
 
+export const resolveSshHost = DesktopIpc.makeIpcMethod({
+  channel: IpcChannels.RESOLVE_SSH_HOST_CHANNEL,
+  payload: Schema.String,
+  result: DesktopSshEnvironmentTargetSchema,
+  handler: Effect.fn("desktop.ipc.sshEnvironment.resolveHost")(function* (alias) {
+    const sshEnvironment = yield* DesktopSshEnvironment.DesktopSshEnvironment;
+    return yield* sshEnvironment.resolveHost(alias);
+  }),
+});
+
 export const ensureSshEnvironment = DesktopIpc.makeIpcMethod({
   channel: IpcChannels.ENSURE_SSH_ENVIRONMENT_CHANNEL,
   payload: DesktopSshEnvironmentEnsureInputSchema,

apps/desktop/src/preload.ts

@@ -60,6 +60,7 @@ contextBridge.exposeInMainWorld("desktopBridge", {
     ipcRenderer.invoke(IpcChannels.SET_CONNECTION_CATALOG_CHANNEL, catalog),
   clearConnectionCatalog: () => ipcRenderer.invoke(IpcChannels.CLEAR_CONNECTION_CATALOG_CHANNEL),
   discoverSshHosts: () => ipcRenderer.invoke(IpcChannels.DISCOVER_SSH_HOSTS_CHANNEL),
+  resolveSshHost: (alias) => ipcRenderer.invoke(IpcChannels.RESOLVE_SSH_HOST_CHANNEL, alias),
   ensureSshEnvironment: async (target, options) =>
     unwrapEnsureSshEnvironmentResult(
       await ipcRenderer.invoke(IpcChannels.ENSURE_SSH_ENVIRONMENT_CHANNEL, {

apps/desktop/src/preview-pip-preload.ts

@@ -1,4 +1,3 @@
-// @effect-diagnostics globalDate:off - This isolated Electron preload does not run inside an Effect runtime.
 import type { DesktopPreviewRecordingFrame } from "@t3tools/contracts";
 import { contextBridge, ipcRenderer } from "electron";
 

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -18,6 +18,7 @@ const clientSettings: ClientSettings = {
   browserDefaultZoomFactor: 1.25,
   browserDefaultAppearance: "dark",
   browserRecordingFrameRate: 60,
+  browserLinkTarget: "app",
   browserAutoShowFloatingPreview: false,
   browserProfiles: [{ id: "work", name: "Work", kind: "persistent" }],
   browserDefaultProfileId: "work",
@@ -29,6 +30,7 @@ const clientSettings: ClientSettings = {
   contextWindowMeterEnabled: false,
   dismissedProviderUpdateNotificationKeys: [],
   diffIgnoreWhitespace: true,
+  diffLayout: "stacked",
   environmentIdentificationMode: "artwork",
   sidebarArtworkOverride: null,
   favorites: [],

apps/desktop/src/ssh/DesktopSshEnvironment.ts

@@ -5,6 +5,7 @@ import type {
 } from "@t3tools/contracts";
 import * as NetService from "@t3tools/shared/Net";
 import * as SshAuth from "@t3tools/ssh/auth";
+import { resolveSshTarget } from "@t3tools/ssh/command";
 import { discoverSshHosts } from "@t3tools/ssh/config";
 import {
   SshCommandError,
@@ -54,6 +55,9 @@ export class DesktopSshEnvironment extends Context.Service<
     readonly discoverHosts: (input?: {
       readonly homeDir?: string;
     }) => Effect.Effect<readonly DesktopDiscoveredSshHost[], DesktopSshEnvironmentDiscoverError>;
+    readonly resolveHost: (
+      alias: string,
+    ) => Effect.Effect<DesktopSshEnvironmentTarget, SshCommandError | SshInvalidTargetError>;
     readonly ensureEnvironment: (
       target: DesktopSshEnvironmentTarget,
       options?: { readonly issuePairingToken?: boolean },
@@ -136,6 +140,11 @@ export const make = Effect.gen(function* () {
         Effect.provide(runtimeContext),
         Effect.withSpan("desktop.ssh.discoverHosts"),
       ),
+    resolveHost: (alias) =>
+      resolveSshTarget(alias.trim()).pipe(
+        Effect.provide(runtimeContext),
+        Effect.withSpan("desktop.ssh.resolveHost"),
+      ),
     ensureEnvironment: (target, ensureOptions) =>
       manager
         .ensureEnvironment(target, ensureOptions)

apps/marketing/src/lib/tweets.ts

@@ -7,88 +7,97 @@ export type Tweet = {
 
 export const tweets = [
   {
-    handle: "Shay_Benshabtay",
+    handle: "QuinnyPig",
     content:
-      "T3 code is not perfect, but it's damn good. Open and fun , I can make my own fork for my uses and use the great tooling with my own needs.",
-    link: "https://x.com/Shay_Benshabtay/status/2054668503857156326",
+      "Of course @theo is gonna favor his own product.\n\nBut I don’t have a horse in this race, so believe me when I say T3 code is freaking transformational.",
+    excerpt:
+      "...I don’t have a horse in this race, so believe me when I say T3 code is freaking transformational.",
+    link: "https://x.com/QuinnyPig/status/2089581739887014376",
   },
   {
-    handle: "teja2495",
+    handle: "tannerlinsley",
+    content: "I would just use T3 Code at that point and contribute back.",
+    link: "https://x.com/tannerlinsley/status/2035067912659341399",
+  },
+  {
+    handle: "ryanrhughes",
     content:
-      "I’ve completely switched to T3 Code for all my workflows. I just switch between different subscriptions and harnesses depending on what I need.",
-    excerpt: "I’ve completely switched to T3 Code for all my workflows.",
-    link: "https://x.com/teja2495/status/2052420254991581623",
+      "I think I've finally found the one AI harness to steal me away from the terminal — @t3dotcodes.",
+    excerpt: "I think I've finally found the one AI harness to steal me away from the terminal",
+    link: "https://x.com/ryanrhughes/status/2093051703616573769",
   },
   {
     handle: "developedbyed",
     content: "might say alpha but T3 code is pretty awesome, really fast too",
     link: "https://x.com/developedbyed/status/2030627970532921605",
   },
   {
-    handle: "tannerlinsley",
+    handle: "RhysSullivan",
     content:
-      "The minute T3 Code supports Claude Code, it could potentially become my daily driver. There's something special there.",
-    link: "https://x.com/tannerlinsley/status/2031102771529920966",
+      "T3 Code is worth giving a try if you haven’t yet\n\nIt takes what I liked so much about codex’s remote setup and improves upon it, it’s a great UX using it on both desktop and mobile\n\nAlso is just nice to have all the official harnesses in one app",
+    excerpt:
+      "It takes what I liked so much about codex’s remote setup and improves upon it, it’s a great UX using it on both desktop and mobile",
+    link: "https://x.com/RhysSullivan/status/2089750636686643493",
   },
   {
-    handle: "aronprins",
-    content:
-      "I already loved T3 Code by @theo and @jullerino, but their Connections implementation is next level epic and for this they should both earn maximum repect 🔥🫡",
-    excerpt: "I already loved T3 Code, but their Connections implementation is next level epic.",
-    link: "https://x.com/aronprins/status/2045102518196183109",
+    handle: "DavidKPiano",
+    content: "It's like Claude Code if they didn't vibe-code the entire thing",
+    link: "https://x.com/DavidKPiano/status/2054682983504719930",
   },
   {
-    handle: "BennettBuhner",
+    handle: "JoshuaRileyDev",
     content:
-      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere! The app is great but the website is even greater, so instead of needing to SSH into a machine, T3 IS my SSH!",
-    excerpt:
-      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere.",
-    link: "https://x.com/BennettBuhner/status/2054667115697754387",
+      "Well I was 2,000 miles away on holiday and able to do iOS development from just my phone, T3 Code’s remote feature is a magical experience",
+    excerpt: "I was 2,000 miles away on holiday and able to do iOS development from just my phone",
+    link: "https://x.com/JoshuaRileyDev/status/2094379365408616837",
   },
   {
-    handle: "ex0t1clol",
-    content: "T3 Code is proof electron apps don't have to suck",
-    link: "https://x.com/ex0t1clol/status/2054666870008021197",
+    handle: "aronprins",
+    content:
+      "T3 Code works better than Claude and Codex combined… and T3 actually combines then (and more!) 🤯\n\nHuge shoutout to @theo and @jullerino\n\nAmazing product fellers 🔥🙌",
+    excerpt:
+      "T3 Code works better than Claude and Codex combined… and T3 actually combines then (and more!)",
+    link: "https://x.com/aronprins/status/2089761738358915267",
   },
   {
-    handle: "Josikinz",
+    handle: "teja2495",
     content:
-      "T3 code is better because it’s like if the codex Mac app didn’t make my computer run like shit 😋",
-    link: "https://x.com/Josikinz/status/2030367951694745870",
+      "I’ve completely switched to T3 Code for all my workflows. I just switch between different subscriptions and harnesses depending on what I need.",
+    excerpt: "I’ve completely switched to T3 Code for all my workflows.",
+    link: "https://x.com/teja2495/status/2052420254991581623",
   },
   {
-    handle: "jetpackjoe_",
-    content: "T3 code is pretty alright I guess",
-    link: "https://x.com/jetpackjoe_/status/2054666792933404959",
+    handle: "ryanrhughes",
+    content:
+      "Then there's the mobile app. All of my threads, on all of my environments, in my pocket. Fantastic.\n\nWhile traveling the other day, I had to use T3 Code alongside my old Claude Code + Herdr setup from 36,000ft on my phone.\n\nOn T3 Code, it felt like LAN. On the TUI, every keystroke took about 1sec to show up because it had to roundtrip to the device before I was able to actually see it. Brutal.",
+    excerpt: "...from 36,000ft on my phone. On T3 Code, it felt like LAN.",
+    link: "https://x.com/ryanrhughes/status/2093051708939059204",
   },
   {
-    handle: "mil000",
-    content: "T3 code saved my relationship!",
-    link: "https://x.com/mil000/status/2030120041451246071",
+    handle: "ex0t1clol",
+    content: "T3 Code is proof electron apps don't have to suck",
+    link: "https://x.com/ex0t1clol/status/2054666870008021197",
   },
   {
-    handle: "_winter_wonders",
-    content: "Heartbreaking: AI-hater has to admit T3 Code is really good.",
-    link: "https://x.com/_winter_wonders/status/2052350198764970434",
+    handle: "enunomaduro",
+    content: "So I tried @theo's T3 Code...",
+    link: "https://x.com/enunomaduro/status/2091915930141876495",
   },
   {
-    handle: "kostyniuk00",
+    handle: "pocarles",
     content:
-      "I was not expecting a year ago, that my anti-AI colleagues would thank me a year later, for persuading them to try T3 Code Beta, that really helped them with organizing their workflows. \n\nFantastic product by @jullerino and @theo. Go try it out if you haven’t yet!",
+      "Only using Codex and T3 now.\n\nI thought all AI coding harnesses had roughly the same impact. Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
     excerpt:
-      "My anti-AI colleagues thanked me for persuading them to try T3 Code Beta. Fantastic product.",
-    link: "https://x.com/kostyniuk00/status/2052041388179468521",
+      "Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
+    link: "https://x.com/pocarles/status/2054673964274758046",
   },
   {
-    handle: "gnukeith",
+    handle: "BennettBuhner",
     content:
-      "I tried T3 Code it actually fixed issues that Opus couldn’t solve in Claude Code + Theo has replied with “UwU” under my post. Dario has not.",
-    link: "https://x.com/gnukeith/status/2054670073579630730",
-  },
-  {
-    handle: "peculiarnewbie",
-    content: "T3 Code is iOS and other harnesses are androids",
-    link: "https://x.com/peculiarnewbie/status/2054671685027233827",
+      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere! The app is great but the website is even greater, so instead of needing to SSH into a machine, T3 IS my SSH!",
+    excerpt:
+      "T3 Code is literally Codex but better; all your favorite models and harnesses, accessible anywhere.",
+    link: "https://x.com/BennettBuhner/status/2054667115697754387",
   },
   {
     handle: "leodev",
@@ -97,27 +106,38 @@ export const tweets = [
     link: "https://x.com/leodev/status/2054679746353537042",
   },
   {
-    handle: "pocarles",
+    handle: "Shay_Benshabtay",
     content:
-      "Only using Codex and T3 now.\n\nI thought all AI coding harnesses had roughly the same impact. Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
-    excerpt:
-      "Using T3 Code taught me how wrong I was. The interface between you and the model changes everything.",
-    link: "https://x.com/pocarles/status/2054673964274758046",
-  },
-  {
-    handle: "DavidKPiano",
-    content: "It's like Claude Code if they didn't vibe-code the entire thing",
-    link: "https://x.com/DavidKPiano/status/2054682983504719930",
+      "T3 code is not perfect, but it's damn good. Open and fun , I can make my own fork for my uses and use the great tooling with my own needs.",
+    link: "https://x.com/Shay_Benshabtay/status/2054668503857156326",
   },
   {
     handle: "iamkaffe",
     content: "T3Code was the first one to truly care about Linux users.",
     link: "https://x.com/iamkaffe/status/2054675539311411280",
   },
   {
-    handle: "uwunetes",
+    handle: "_winter_wonders",
+    content: "Heartbreaking: AI-hater has to admit T3 Code is really good.",
+    link: "https://x.com/_winter_wonders/status/2052350198764970434",
+  },
+  {
+    handle: "kostyniuk00",
     content:
-      "claude code make me go *whine whine whine* and t3 code make me go woof woof awooooo!!!",
-    link: "https://x.com/uwunetes/status/2054683356022120640",
+      "I was not expecting a year ago, that my anti-AI colleagues would thank me a year later, for persuading them to try T3 Code Beta, that really helped them with organizing their workflows. \n\nFantastic product by @jullerino and @theo. Go try it out if you haven’t yet!",
+    excerpt:
+      "My anti-AI colleagues thanked me for persuading them to try T3 Code Beta. Fantastic product.",
+    link: "https://x.com/kostyniuk00/status/2052041388179468521",
+  },
+  {
+    handle: "Josikinz",
+    content:
+      "T3 code is better because it’s like if the codex Mac app didn’t make my computer run like shit 😋",
+    link: "https://x.com/Josikinz/status/2030367951694745870",
+  },
+  {
+    handle: "mil000",
+    content: "T3 code saved my relationship!",
+    link: "https://x.com/mil000/status/2030120041451246071",
   },
 ] satisfies Tweet[];