fix: carry remote-config run id for install-from-source (#375)

* fix: carry remote-config run id for install-from-source

* test: reuse CLI capture helper in remote-config regression

Author: thymikee

src/__tests__/cli-config.test.ts

@@ -27,6 +27,7 @@ async function runCliCapture(
   options?: {
     cwd?: string;
     env?: Record<string, string | undefined>;
+    sendToDaemon?: (req: Omit<DaemonRequest, 'token'>) => Promise<DaemonResponse>;
   },
 ): Promise<RunResult> {
   let stdout = '';
@@ -61,10 +62,12 @@ async function runCliCapture(
     return true;
   }) as typeof process.stderr.write;
 
-  const sendToDaemon = async (req: Omit<DaemonRequest, 'token'>): Promise<DaemonResponse> => {
-    calls.push(req);
-    return { ok: true, data: {} };
-  };
+  const sendToDaemon =
+    options?.sendToDaemon ??
+    (async (req: Omit<DaemonRequest, 'token'>): Promise<DaemonResponse> => {
+      calls.push(req);
+      return { ok: true, data: {} };
+    });
 
   try {
     await runCli(argv, { sendToDaemon });
@@ -265,6 +268,65 @@ test('remote config defaults override generic config and env for remote workflow
   fs.rmSync(root, { recursive: true, force: true });
 });
 
+test('install-from-source forwards remote-config run id with explicit lease binding', async () => {
+  const { root, home, project } = makeTempWorkspace();
+  const remoteConfig = path.join(project, 'agent-device.remote.json');
+  fs.writeFileSync(
+    remoteConfig,
+    JSON.stringify({
+      daemonBaseUrl: 'http://remote-mac.example.test:9124/agent-device',
+      tenant: 'micha-pierzcha-a',
+      sessionIsolation: 'tenant',
+      runId: 'demo-run-001',
+      platform: 'android',
+    }),
+    'utf8',
+  );
+
+  const calls: Array<Omit<DaemonRequest, 'token'>> = [];
+  const result = await runCliCapture(
+    [
+      'install-from-source',
+      'https://example.com/app.apk',
+      '--remote-config',
+      remoteConfig,
+      '--lease-id',
+      'lease-demo-001',
+      '--json',
+    ],
+    {
+      cwd: project,
+      env: { HOME: home },
+      sendToDaemon: async (req) => {
+        calls.push(req);
+        return {
+          ok: true,
+          data: {
+            launchTarget: 'com.example.demo',
+            packageName: 'com.example.demo',
+          },
+        };
+      },
+    },
+  );
+
+  assert.equal(result.code, null);
+  assert.equal(result.stderr, '');
+  const payload = JSON.parse(result.stdout);
+  assert.equal(payload.success, true);
+  assert.equal(payload.data.launchTarget, 'com.example.demo');
+  assert.equal(calls.length, 1);
+  assert.equal(calls[0]?.meta?.tenantId, 'micha-pierzcha-a');
+  assert.equal(calls[0]?.meta?.runId, 'demo-run-001');
+  assert.equal(calls[0]?.meta?.leaseId, 'lease-demo-001');
+  assert.equal(calls[0]?.flags?.tenant, 'micha-pierzcha-a');
+  assert.equal(calls[0]?.flags?.runId, 'demo-run-001');
+  assert.equal(calls[0]?.flags?.leaseId, 'lease-demo-001');
+  assert.deepEqual(calls[0]?.positionals, []);
+
+  fs.rmSync(root, { recursive: true, force: true });
+});
+
 test('missing explicit remote config path returns parse error before daemon dispatch', async () => {
   const { root, home, project } = makeTempWorkspace();
 

src/utils/remote-config.ts

@@ -1,16 +1,27 @@
 import type { CliFlags } from './command-schema.ts';
-import { REMOTE_OPEN_PROFILE_KEYS, type RemoteConfigProfile } from '../remote-config-schema.ts';
+import {
+  REMOTE_CONFIG_FIELD_SPECS,
+  REMOTE_OPEN_PROFILE_KEYS,
+  type RemoteConfigProfile,
+} from '../remote-config-schema.ts';
 import { resolveRemoteConfigProfile } from '../remote-config-core.ts';
 
-// This subset is intentional: only the flags used by remote-config-backed CLI defaults belong here.
+// Remote config can supply defaults for any supported CLI flag that exists in the profile schema.
+// Command validation later strips unsupported defaults for the active command.
+const REMOTE_CONFIG_DEFAULT_FLAG_KEYS = REMOTE_CONFIG_FIELD_SPECS.map(
+  (spec) => spec.key,
+) as readonly (keyof RemoteConfigProfile)[];
+
+// This subset is still intentional: open preserves extra remote-config defaults after command
+// parsing so it can prepare remote Metro without exposing every Metro flag as an open CLI option.
 export const REMOTE_OPEN_FLAG_KEYS = [
   'remoteConfig',
   ...REMOTE_OPEN_PROFILE_KEYS,
 ] as const satisfies readonly (keyof CliFlags)[];
 
 function profileToCliFlags(profile: RemoteConfigProfile): Partial<CliFlags> {
   const flags: Partial<CliFlags> = {};
-  for (const key of REMOTE_OPEN_PROFILE_KEYS) {
+  for (const key of REMOTE_CONFIG_DEFAULT_FLAG_KEYS) {
     const value = profile[key];
     if (value !== undefined) {
       (flags as Record<string, unknown>)[key] = value;