Move mobile and shared runtime cleanups below relay

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

Author: juliusmarminge

apps/mobile/src/features/threads/use-project-actions.ts

@@ -13,9 +13,10 @@ import {
   type RuntimeMode,
 } from "@t3tools/contracts";
 import { buildTemporaryWorktreeBranchName, sanitizeFeatureBranchName } from "@t3tools/shared/git";
+import { uuidv4 } from "../../lib/uuid";
 
 import type { DraftComposerImageAttachment } from "../../lib/composerImages";
-import { uuidv4 } from "../../lib/uuid";
+import { makeTurnCommandMetadata } from "../../lib/commandMetadata";
 import { getEnvironmentClient } from "../../state/environment-session-registry";
 import { environmentRuntimeManager } from "../../state/use-environment-runtime";
 import { vcsRefManager } from "../../state/use-vcs-refs";
@@ -93,8 +94,9 @@ export function useProjectActions() {
         return null;
       }
 
-      const threadId = ThreadId.make(uuidv4());
-      const createdAt = new Date().toISOString();
+      const metadata = makeTurnCommandMetadata();
+      const threadId = ThreadId.make(metadata.threadId);
+      const createdAt = metadata.createdAt;
       const initialMessageText = input.initialMessageText.trim();
       const nextTitle = deriveThreadTitleFromPrompt(input.initialMessageText);
 
@@ -109,10 +111,10 @@ export function useProjectActions() {
 
       await client.orchestration.dispatchCommand({
         type: "thread.turn.start",
-        commandId: CommandId.make(uuidv4()),
+        commandId: CommandId.make(metadata.commandId),
         threadId,
         message: {
-          messageId: MessageId.make(uuidv4()),
+          messageId: MessageId.make(metadata.messageId),
           role: "user",
           text: initialMessageText,
           attachments: input.initialAttachments,
@@ -143,7 +145,7 @@ export function useProjectActions() {
               }
             : {}),
         },
-        createdAt: new Date().toISOString(),
+        createdAt,
       });
 
       await refreshRemoteData([input.project.environmentId]);

apps/mobile/src/lib/commandMetadata.test.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { makeQueuedMessageMetadata, makeTurnCommandMetadata } from "./commandMetadata";
+
+vi.mock("expo-crypto", () => ({
+  randomUUID: () => crypto.randomUUID(),
+}));
+
+describe("mobile command metadata", () => {
+  it("creates ids and timestamps for thread starts", () => {
+    const metadata = makeTurnCommandMetadata();
+
+    expect(metadata.commandId).toMatch(
+      /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+    );
+    expect(metadata.messageId).toMatch(
+      /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+    );
+    expect(metadata.threadId).toMatch(
+      /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+    );
+    expect(metadata.createdAt).toMatch(/^\d{4}-\d{2}-\d{2}T/);
+  });
+
+  it("creates ids and timestamps for queued messages", () => {
+    const metadata = makeQueuedMessageMetadata();
+
+    expect(metadata.commandId).toMatch(
+      /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+    );
+    expect(metadata.messageId).toMatch(
+      /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+    );
+    expect(metadata.createdAt).toMatch(/^\d{4}-\d{2}-\d{2}T/);
+  });
+});

apps/mobile/src/lib/commandMetadata.ts

@@ -0,0 +1,25 @@
+import { uuidv4 } from "./uuid";
+
+export interface TurnCommandMetadata {
+  readonly commandId: string;
+  readonly messageId: string;
+  readonly threadId: string;
+  readonly createdAt: string;
+}
+
+export function makeTurnCommandMetadata(): TurnCommandMetadata {
+  return {
+    commandId: uuidv4(),
+    messageId: uuidv4(),
+    threadId: uuidv4(),
+    createdAt: new Date().toISOString(),
+  };
+}
+
+export function makeQueuedMessageMetadata(): Omit<TurnCommandMetadata, "threadId"> {
+  return {
+    commandId: uuidv4(),
+    messageId: uuidv4(),
+    createdAt: new Date().toISOString(),
+  };
+}

apps/mobile/src/lib/connection.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { redactPairingCredential } from "./connection";
+
+vi.mock("./runtime", () => ({
+  mobileRemoteHttpRuntime: {
+    runPromise: vi.fn(),
+  },
+}));
+
+describe("mobile remote connection records", () => {
+  it("removes one-time bootstrap credentials before persisting pairing URLs", () => {
+    expect(redactPairingCredential("https://desktop.example/#token=bootstrap-token")).toBe(
+      "https://desktop.example/",
+    );
+    expect(redactPairingCredential("https://desktop.example/?token=bootstrap-token")).toBe(
+      "https://desktop.example/",
+    );
+  });
+
+  it("removes hosted pairing credentials while keeping the advertised host", () => {
+    expect(
+      redactPairingCredential(
+        "https://app.t3.codes/pair?host=https%3A%2F%2Fdesktop.example&token=bootstrap-token&label=Desktop",
+      ),
+    ).toBe("https://app.t3.codes/pair?host=https%3A%2F%2Fdesktop.example&label=Desktop");
+  });
+});

apps/mobile/src/lib/connection.ts

@@ -3,7 +3,7 @@ import {
   bootstrapRemoteBearerSession,
   fetchRemoteEnvironmentDescriptor,
 } from "@t3tools/client-runtime";
-import { resolveRemotePairingTarget } from "@t3tools/shared/remote";
+import { resolveRemotePairingTarget, stripPairingTokenFromUrl } from "@t3tools/shared/remote";
 import { mobileRemoteHttpRuntime } from "./runtime";
 
 export interface RemoteConnectionInput {
@@ -27,6 +27,15 @@ export type RemoteClientConnectionState =
   | "reconnecting"
   | "disconnected";
 
+export function redactPairingCredential(pairingUrl: string): string {
+  const trimmed = pairingUrl.trim();
+  try {
+    return stripPairingTokenFromUrl(new URL(trimmed)).toString();
+  } catch {
+    return trimmed;
+  }
+}
+
 export async function bootstrapRemoteConnection(
   input: RemoteConnectionInput,
 ): Promise<SavedRemoteConnection> {
@@ -50,7 +59,7 @@ export async function bootstrapRemoteConnection(
   return {
     environmentId: descriptor.environmentId,
     environmentLabel: descriptor.label,
-    pairingUrl: input.pairingUrl.trim(),
+    pairingUrl: redactPairingCredential(input.pairingUrl),
     displayUrl: target.httpBaseUrl,
     httpBaseUrl: target.httpBaseUrl,
     wsBaseUrl: target.wsBaseUrl,

apps/mobile/src/state/use-remote-catalog.ts

@@ -31,11 +31,11 @@ const projectsSortOrder = Order.mapInput(
 
 const threadsSortOrder = Order.mapInput(
   Order.Struct({
-    activityAt: Order.flip(Order.Number),
+    activityAt: Order.flip(Order.String),
     environmentId: Order.String,
   }),
   (thread: EnvironmentScopedThreadShell) => ({
-    activityAt: new Date(thread.updatedAt ?? thread.createdAt).getTime(),
+    activityAt: thread.updatedAt ?? thread.createdAt,
     environmentId: thread.environmentId,
   }),
 );

apps/mobile/src/state/use-thread-composer-state.ts

@@ -6,6 +6,7 @@ import { CommandId, MessageId, type EnvironmentId, type ThreadId } from "@t3tool
 import { deriveActiveWorkStartedAt } from "@t3tools/shared/orchestrationTiming";
 import { Atom } from "effect/unstable/reactivity";
 
+import { makeQueuedMessageMetadata } from "../lib/commandMetadata";
 import {
   convertPastedImagesToAttachments,
   pasteComposerClipboard,
@@ -14,7 +15,6 @@ import {
 import type { DraftComposerImageAttachment } from "../lib/composerImages";
 import { scopedThreadKey } from "../lib/scopedEntities";
 import { buildThreadFeed, type QueuedThreadMessage } from "../lib/threadActivity";
-import { uuidv4 } from "../lib/uuid";
 import { appAtomRegistry } from "../state/atom-registry";
 import { getEnvironmentClient } from "./environment-session-registry";
 import type { ConnectedEnvironmentSummary } from "../state/remote-runtime-types";
@@ -356,15 +356,15 @@ export function useThreadComposerState() {
       return;
     }
 
-    const createdAt = new Date().toISOString();
+    const metadata = makeQueuedMessageMetadata();
     enqueueQueuedMessage({
       environmentId: selectedThreadShell.environmentId,
       threadId: selectedThreadShell.id,
-      messageId: MessageId.make(uuidv4()),
-      commandId: CommandId.make(uuidv4()),
+      messageId: MessageId.make(metadata.messageId),
+      commandId: CommandId.make(metadata.commandId),
       text,
       attachments,
-      createdAt,
+      createdAt: metadata.createdAt,
     });
     clearDraft(threadKey);
   }, [draftAttachmentsByThreadKey, draftMessageByThreadKey, selectedThreadShell]);