From f16f62e484d19d618f2f4cf0e1073ea03fb7ce78 Mon Sep 17 00:00:00 2001
From: James Acklin <james.acklin@gmail.com>
Date: Thu, 24 Sep 2026 11:23:18 -0400
Subject: [PATCH 1/3] fix: give each workspace its own remote session name

Every worktree of a repository resolves the same project label, so remote
runs from two worktrees both named their agent-device session, tenant and
run `stim-<label>` and their EAS session the same. agent-device keeps one
local connection per session name, so the second worktree's connect took
over the first's connection.

resolveRemoteContext now suffixes the label with a random UUID, stored as
remoteLabel in the workspace state so later runs reuse it. A workspace
that already records a remote session keeps the plain label until that
session ends, because the remote agent-device session stays bound to the
name it was opened under.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../src/__tests__/device-remote.test.ts       | 48 +++++++++++++++++++
 packages/stim-cli/src/engine/device-remote.ts | 20 +++++++-
 .../stim-cli/src/workspace/workspace-state.ts |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/packages/stim-cli/src/__tests__/device-remote.test.ts b/packages/stim-cli/src/__tests__/device-remote.test.ts
index 5c47d8874..756696e55 100644
--- a/packages/stim-cli/src/__tests__/device-remote.test.ts
+++ b/packages/stim-cli/src/__tests__/device-remote.test.ts
@@ -287,6 +287,54 @@ process.stdout.write(${JSON.stringify(CREATED)});
   );
 });
 
+describe('each workspace names its own remote session', () => {
+  async function resolveEas(workspaceRoot: string) {
+    const resolved = await resolveRemoteContext({
+      root: workspaceRoot,
+      label: 'wt',
+      backend: 'eas',
+      easBin: '/bin/eas',
+      env: {},
+      lookupAgentDevice: () => '/bin/agent-device',
+    });
+    if (!('ctx' in resolved)) throw new Error(resolved.failed);
+    return resolved.ctx;
+  }
+
+  async function bootNames(workspaceRoot: string) {
+    const exec = mockExec({ outputs: { sim: CREATED } });
+    await remoteIosDeps(await resolveEas(workspaceRoot)).ensureBooted({});
+    const sim = exec.calls.find((call) => call.file === '/bin/eas' && call.args[0] === 'sim');
+    return {
+      eas: sim?.args[sim.args.indexOf('--name') + 1],
+      agentDevice: JSON.parse(readFileSync(remoteProfilePath(workspaceRoot), 'utf-8')).session,
+    };
+  }
+
+  test('two worktrees with one project label do not share an agent-device connection', async () => {
+    const other = mkdtempSync(join(tmpdir(), 'stim-remote-'));
+    try {
+      const first = await bootNames(root);
+      const second = await bootNames(other);
+      expect(first.agentDevice).not.toBe(second.agentDevice);
+      expect(first.eas).not.toBe(second.eas);
+      expect(first.eas).toMatch(/^stim-wt-[0-9a-f-]{36}$/);
+    } finally {
+      rmSync(other, { recursive: true, force: true });
+    }
+  });
+
+  test('a workspace keeps its name across runs', async () => {
+    expect((await resolveEas(root)).label).toBe((await resolveEas(root)).label);
+  });
+
+  test('a session recorded under the plain label keeps it', async () => {
+    ensureWorkspaceStorage(root);
+    writeFileSync(workspaceStateFile(root), JSON.stringify({ remoteDevice: { platform: 'ios', sessionId: 'drs_1' } }));
+    expect((await resolveEas(root)).label).toBe('wt');
+  });
+});
+
 describe('the expensive step happens after the Metro gate', () => {
   test('ensureOwnedDevice creates no session and runs no command', async () => {
     const exec = mockExec();
diff --git a/packages/stim-cli/src/engine/device-remote.ts b/packages/stim-cli/src/engine/device-remote.ts
index eb259d774..a5a02a4c8 100644
--- a/packages/stim-cli/src/engine/device-remote.ts
+++ b/packages/stim-cli/src/engine/device-remote.ts
@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto';
 import { existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from 'node:fs';
 import { dirname, resolve as resolvePath } from 'node:path';
 import { getExecutor } from '../exec.ts';
@@ -5,6 +6,7 @@ import { pidExists } from '../metro.ts';
 import { gateMetroOrigin, REMOTE_METRO_WRONG } from './metro-gate.ts';
 import { workspaceDir, workspaceLogsDir, workspaceStateFile } from '../workspace/paths.ts';
 import { clearRemoteSession, readMetroTunnel, readRemoteSession } from '../supervisor/state.ts';
+import { readWorkspaceState, updateWorkspaceState } from '../workspace/workspace-state.ts';
 import {
   acceptAlertArgs,
   closeArgs,
@@ -491,7 +493,7 @@ export async function resolveRemoteContext({
   return {
     ctx: {
       root,
-      label,
+      label: workspaceRemoteLabel(root, label),
       backend,
       platform,
       easBin: easBin ?? '',
@@ -503,6 +505,22 @@ export async function resolveRemoteContext({
   };
 }
 
+// Every worktree of a repository shares one project label, and agent-device keys
+// its local connection state by session name, so each workspace suffixes its own.
+// A session recorded without one keeps the plain label: its remote agent-device
+// session stays bound to the name it was opened under.
+function workspaceRemoteLabel(root: string, label: string): string {
+  const current = readWorkspaceState(root)?.remoteLabel;
+  if (typeof current === 'string' && current) return current;
+  if (readRemoteSession(root)) return label;
+  const state = updateWorkspaceState(root, (prev) =>
+    typeof prev.remoteLabel === 'string' && prev.remoteLabel
+      ? prev
+      : { ...prev, remoteLabel: `${label}-${randomUUID()}` },
+  );
+  return state.remoteLabel as string;
+}
+
 export function binOnPath(bin: string): boolean {
   try {
     return Boolean(getExecutor().findExecutable(bin));
diff --git a/packages/stim-cli/src/workspace/workspace-state.ts b/packages/stim-cli/src/workspace/workspace-state.ts
index 19717cb8b..d31ef7d53 100644
--- a/packages/stim-cli/src/workspace/workspace-state.ts
+++ b/packages/stim-cli/src/workspace/workspace-state.ts
@@ -9,6 +9,7 @@ export interface WorkspaceState {
   lastBuild?: Record<string, unknown>;
   launches?: Record<string, unknown>;
   remoteDevice?: Record<string, unknown>;
+  remoteLabel?: string;
   metroTunnel?: Record<string, unknown>;
   [key: string]: unknown;
 }

From 446a6d4873ec19f90966c2b78dbaa84425a54219 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Thu, 24 Sep 2026 14:48:32 -0400
Subject: [PATCH 2/3] fix: name remote sessions after the worktree like local
 devices

---
 .../src/__tests__/device-remote.test.ts       | 47 +++++--------------
 packages/stim-cli/src/commands/android.ts     |  1 -
 packages/stim-cli/src/commands/ios.ts         |  2 -
 .../stim-cli/src/commands/ios/dependencies.ts |  4 +-
 packages/stim-cli/src/engine/device-remote.ts | 26 ++--------
 .../stim-cli/src/workspace/workspace-state.ts |  1 -
 6 files changed, 18 insertions(+), 63 deletions(-)

diff --git a/packages/stim-cli/src/__tests__/device-remote.test.ts b/packages/stim-cli/src/__tests__/device-remote.test.ts
index 756696e55..f718c13ea 100644
--- a/packages/stim-cli/src/__tests__/device-remote.test.ts
+++ b/packages/stim-cli/src/__tests__/device-remote.test.ts
@@ -128,7 +128,6 @@ describe('explicit backend selection', () => {
   test('proxy requires both daemon variables with a precise remedy', async () => {
     const missingToken = await resolveRemoteContext({
       root,
-      label: 'wt',
       backend: 'proxy',
       easBin: '/bin/eas',
       env: { AGENT_DEVICE_DAEMON_BASE_URL: env.AGENT_DEVICE_DAEMON_BASE_URL },
@@ -142,7 +141,6 @@ describe('explicit backend selection', () => {
 
     const missingUrl = await resolveRemoteContext({
       root,
-      label: 'wt',
       backend: 'proxy',
       easBin: '/bin/eas',
       env: { AGENT_DEVICE_DAEMON_AUTH_TOKEN: env.AGENT_DEVICE_DAEMON_AUTH_TOKEN },
@@ -158,7 +156,6 @@ describe('explicit backend selection', () => {
   test('proxy uses only the supplied daemon and never creates an EAS session', async () => {
     const resolved = await resolveRemoteContext({
       root,
-      label: 'wt',
       backend: 'proxy',
       easBin: '/bin/eas',
       env,
@@ -180,7 +177,6 @@ describe('explicit backend selection', () => {
   test('eas requires the EAS CLI even when proxy variables are present', async () => {
     const resolved = await resolveRemoteContext({
       root,
-      label: 'wt',
       backend: 'eas',
       easBin: null,
       env,
@@ -196,7 +192,6 @@ describe('explicit backend selection', () => {
   test('eas ignores proxy variables and creates an EAS session', async () => {
     const resolved = await resolveRemoteContext({
       root,
-      label: 'wt',
       backend: 'eas',
       easBin: '/bin/eas',
       env,
@@ -258,7 +253,6 @@ process.stdout.write(${JSON.stringify(CREATED)});
 
         const resolved = await resolveRemoteContext({
           root,
-          label: 'wt',
           backend: 'eas',
           easBin,
           env: process.env,
@@ -288,22 +282,18 @@ process.stdout.write(${JSON.stringify(CREATED)});
 });
 
 describe('each workspace names its own remote session', () => {
-  async function resolveEas(workspaceRoot: string) {
+  async function bootNames(workspaceRoot: string) {
+    resetExecutor();
     const resolved = await resolveRemoteContext({
       root: workspaceRoot,
-      label: 'wt',
       backend: 'eas',
       easBin: '/bin/eas',
       env: {},
       lookupAgentDevice: () => '/bin/agent-device',
     });
     if (!('ctx' in resolved)) throw new Error(resolved.failed);
-    return resolved.ctx;
-  }
-
-  async function bootNames(workspaceRoot: string) {
     const exec = mockExec({ outputs: { sim: CREATED } });
-    await remoteIosDeps(await resolveEas(workspaceRoot)).ensureBooted({});
+    await remoteIosDeps(resolved.ctx).ensureBooted({});
     const sim = exec.calls.find((call) => call.file === '/bin/eas' && call.args[0] === 'sim');
     return {
       eas: sim?.args[sim.args.indexOf('--name') + 1],
@@ -311,27 +301,16 @@ describe('each workspace names its own remote session', () => {
     };
   }
 
-  test('two worktrees with one project label do not share an agent-device connection', async () => {
-    const other = mkdtempSync(join(tmpdir(), 'stim-remote-'));
-    try {
-      const first = await bootNames(root);
-      const second = await bootNames(other);
-      expect(first.agentDevice).not.toBe(second.agentDevice);
-      expect(first.eas).not.toBe(second.eas);
-      expect(first.eas).toMatch(/^stim-wt-[0-9a-f-]{36}$/);
-    } finally {
-      rmSync(other, { recursive: true, force: true });
-    }
-  });
-
-  test('a workspace keeps its name across runs', async () => {
-    expect((await resolveEas(root)).label).toBe((await resolveEas(root)).label);
-  });
-
-  test('a session recorded under the plain label keeps it', async () => {
-    ensureWorkspaceStorage(root);
-    writeFileSync(workspaceStateFile(root), JSON.stringify({ remoteDevice: { platform: 'ios', sessionId: 'drs_1' } }));
-    expect((await resolveEas(root)).label).toBe('wt');
+  test('two worktrees whose app directories share a name do not share a session', async () => {
+    const first = join(root, 'a', 'app');
+    const second = join(root, 'b', 'app');
+    mkdirSync(first, { recursive: true });
+    mkdirSync(second, { recursive: true });
+    const one = await bootNames(first);
+    const two = await bootNames(second);
+    expect(one.agentDevice).not.toBe(two.agentDevice);
+    expect(one.eas).not.toBe(two.eas);
+    expect(one.eas).toMatch(/^stim-app-[0-9a-f]{16}$/);
   });
 });
 
diff --git a/packages/stim-cli/src/commands/android.ts b/packages/stim-cli/src/commands/android.ts
index 0fc29d8b5..6a584fc18 100644
--- a/packages/stim-cli/src/commands/android.ts
+++ b/packages/stim-cli/src/commands/android.ts
@@ -832,7 +832,6 @@ export async function runAndroid(options: RunAndroidOptions = {} as RunAndroidOp
   if (remoteBackend) {
     const resolved = await resolveRemoteDeviceContext({
       root,
-      label,
       platform: PLATFORM,
       backend: remoteBackend,
       easBin: resolveEasBin(root)?.file ?? null,
diff --git a/packages/stim-cli/src/commands/ios.ts b/packages/stim-cli/src/commands/ios.ts
index d3ef4aded..036ff848b 100644
--- a/packages/stim-cli/src/commands/ios.ts
+++ b/packages/stim-cli/src/commands/ios.ts
@@ -473,13 +473,11 @@ async function runIos(
   const registerProject = () => d.upsertProject(root, { bundleId: d.detectBundleId(root) ?? undefined, isExpo });
   if (remoteBackend !== 'eas') registerProject();
   const proj = d.getProject(root);
-  const label = d.projectShortcut(root, proj);
 
   let remoteDevice: ReturnType<typeof d.remoteIosDeps> | null = null;
   if (remoteBackend) {
     const resolved = await d.resolveRemoteContext({
       root,
-      label,
       backend: remoteBackend,
       easBin: d.resolveEasCliBin(root)?.file ?? null,
     });
diff --git a/packages/stim-cli/src/commands/ios/dependencies.ts b/packages/stim-cli/src/commands/ios/dependencies.ts
index f28ce273b..0db45dde3 100644
--- a/packages/stim-cli/src/commands/ios/dependencies.ts
+++ b/packages/stim-cli/src/commands/ios/dependencies.ts
@@ -52,7 +52,7 @@ import {
 } from '../../engine/xcode.ts';
 import { pidExists, resolveProjectMetro } from '../../metro.ts';
 import { createNdjsonWriter } from '../../ndjson.ts';
-import { detectBundleId, detectIsExpo, findProjectRoot, projectShortcut } from '../../workspace/project.ts';
+import { detectBundleId, detectIsExpo, findProjectRoot } from '../../workspace/project.ts';
 import { resolveCacheProviderConfig, resolveSettings } from '../../workspace/settings.ts';
 import { writeWorkspaceLaunch } from '../../supervisor/state.ts';
 import { readWorkspaceState, writeWorkspaceState } from '../../workspace/workspace-state.ts';
@@ -79,7 +79,6 @@ export interface IosDeps {
   devClientScheme: typeof devClientScheme;
   getProject: typeof getProject;
   upsertProject: typeof upsertProject;
-  projectShortcut: typeof projectShortcut;
   checkDeviceCapacity: typeof checkDeviceCapacity;
   ensureOwnedDevice: typeof ensureOwnedDevice;
   listIosRuntimes: typeof listIosRuntimes;
@@ -157,7 +156,6 @@ export const DEFAULT_DEPS: IosDeps = {
   devClientScheme,
   getProject,
   upsertProject,
-  projectShortcut,
   checkDeviceCapacity,
   ensureOwnedDevice,
   listIosRuntimes,
diff --git a/packages/stim-cli/src/engine/device-remote.ts b/packages/stim-cli/src/engine/device-remote.ts
index 5c45f2e06..665937931 100644
--- a/packages/stim-cli/src/engine/device-remote.ts
+++ b/packages/stim-cli/src/engine/device-remote.ts
@@ -1,13 +1,12 @@
-import { randomUUID } from 'node:crypto';
 import { existsSync, mkdirSync, realpathSync, writeFileSync } from 'node:fs';
 import { dirname, resolve as resolvePath } from 'node:path';
 import { getExecutor } from '../exec.ts';
 import { readJsonObject } from '../json-file.ts';
 import { pidExists } from '../metro.ts';
 import { gateMetroOrigin, REMOTE_METRO_WRONG } from './metro-gate.ts';
-import { workspaceDir, workspaceLogsDir, workspaceStateFile } from '../workspace/paths.ts';
+import { workspaceDir, workspaceId, workspaceLogsDir, workspaceStateFile } from '../workspace/paths.ts';
 import { clearRemoteSession, readMetroTunnel, readRemoteSession } from '../supervisor/state.ts';
-import { readWorkspaceState, updateWorkspaceState } from '../workspace/workspace-state.ts';
+import { ownedDeviceLabel } from '../workspace/project.ts';
 import {
   acceptAlertArgs,
   closeArgs,
@@ -426,7 +425,6 @@ function remoteDeviceDeps(ctx: RemoteContext) {
 
 export async function resolveRemoteContext({
   root,
-  label,
   backend,
   platform = 'ios',
   easBin,
@@ -435,7 +433,6 @@ export async function resolveRemoteContext({
   maxDurationMinutes = null,
 }: {
   root: string;
-  label: string;
   backend: RemoteDeviceBackend;
   platform?: 'ios' | 'android';
   easBin: string | null;
@@ -494,7 +491,8 @@ export async function resolveRemoteContext({
   return {
     ctx: {
       root,
-      label: workspaceRemoteLabel(root, label),
+      // agent-device keys its local connection state by session name.
+      label: `${ownedDeviceLabel(root)}-${workspaceId(root)}`,
       backend,
       platform,
       easBin: easBin ?? '',
@@ -506,22 +504,6 @@ export async function resolveRemoteContext({
   };
 }
 
-// Every worktree of a repository shares one project label, and agent-device keys
-// its local connection state by session name, so each workspace suffixes its own.
-// A session recorded without one keeps the plain label: its remote agent-device
-// session stays bound to the name it was opened under.
-function workspaceRemoteLabel(root: string, label: string): string {
-  const current = readWorkspaceState(root)?.remoteLabel;
-  if (typeof current === 'string' && current) return current;
-  if (readRemoteSession(root)) return label;
-  const state = updateWorkspaceState(root, (prev) =>
-    typeof prev.remoteLabel === 'string' && prev.remoteLabel
-      ? prev
-      : { ...prev, remoteLabel: `${label}-${randomUUID()}` },
-  );
-  return state.remoteLabel as string;
-}
-
 export function binOnPath(bin: string): boolean {
   try {
     return Boolean(getExecutor().findExecutable(bin));
diff --git a/packages/stim-cli/src/workspace/workspace-state.ts b/packages/stim-cli/src/workspace/workspace-state.ts
index fd32dbb58..4c39c3c85 100644
--- a/packages/stim-cli/src/workspace/workspace-state.ts
+++ b/packages/stim-cli/src/workspace/workspace-state.ts
@@ -10,7 +10,6 @@ export interface WorkspaceState {
   lastBuild?: Record<string, unknown>;
   launches?: Record<string, unknown>;
   remoteDevice?: Record<string, unknown>;
-  remoteLabel?: string;
   metroTunnel?: Record<string, unknown>;
   [key: string]: unknown;
 }

From 74a28a2688db9be0284d4d70c253227c1f872340 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Thu, 24 Sep 2026 14:54:00 -0400
Subject: [PATCH 3/3] chore: name the agent-device constraint behind remote
 session names

---
 packages/stim-cli/src/engine/device-remote.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stim-cli/src/engine/device-remote.ts b/packages/stim-cli/src/engine/device-remote.ts
index 665937931..9181c34b5 100644
--- a/packages/stim-cli/src/engine/device-remote.ts
+++ b/packages/stim-cli/src/engine/device-remote.ts
@@ -491,7 +491,7 @@ export async function resolveRemoteContext({
   return {
     ctx: {
       root,
-      // agent-device keys its local connection state by session name.
+      // agent-device stores remote connection state per session name under ~/.agent-device/remote-connections/.
       label: `${ownedDeviceLabel(root)}-${workspaceId(root)}`,
       backend,
       platform,