fix: isolate session destinations for device builds

Author: cameroncooke

src/mcp/tools/device/build_device.ts

@@ -228,6 +228,7 @@ export const handler = createSessionAwareTool<BuildDeviceParams>({
   internalSchema: toInternalSchema<BuildDeviceParams>(buildDeviceSchema),
   logicFunction: buildDeviceLogic,
   getExecutor: getDefaultCommandExecutor,
+  clearSessionDeviceIdUnlessPrepared: true,
   requirements: [
     { allOf: ['scheme'], message: 'scheme is required' },
     { oneOf: ['projectPath', 'workspacePath'], message: 'Provide a project or workspace' },

src/utils/typed-tool-factory.ts

@@ -170,13 +170,15 @@ export function createSessionAwareTool<TParams>(opts: {
   getExecutor: () => CommandExecutor;
   requirements?: SessionRequirement[];
   exclusivePairs?: readonly ExclusiveParameterGroup[];
+  clearSessionDeviceIdUnlessPrepared?: boolean;
 }): ToolHandler {
   return createSessionAwareHandler({
     internalSchema: opts.internalSchema,
     logicFunction: opts.logicFunction,
     getContext: opts.getExecutor,
     requirements: opts.requirements,
     exclusivePairs: opts.exclusivePairs,
+    clearSessionDeviceIdUnlessPrepared: opts.clearSessionDeviceIdUnlessPrepared,
   });
 }
 
@@ -186,6 +188,7 @@ export function createSessionAwareToolWithContext<TParams, TContext>(opts: {
   getContext: () => TContext;
   requirements?: SessionRequirement[];
   exclusivePairs?: readonly ExclusiveParameterGroup[];
+  clearSessionDeviceIdUnlessPrepared?: boolean;
 }): ToolHandler {
   return createSessionAwareHandler(opts);
 }
@@ -196,13 +199,15 @@ function createSessionAwareHandler<TParams, TContext>(opts: {
   getContext: () => TContext;
   requirements?: SessionRequirement[];
   exclusivePairs?: readonly ExclusiveParameterGroup[];
+  clearSessionDeviceIdUnlessPrepared?: boolean;
 }): ToolHandler {
   const {
     internalSchema,
     logicFunction,
     getContext,
     requirements = [],
     exclusivePairs = [],
+    clearSessionDeviceIdUnlessPrepared = false,
   } = opts;
 
   const impl = async (
@@ -236,7 +241,10 @@ function createSessionAwareHandler<TParams, TContext>(opts: {
       }
 
       const sessionDefaults = filterSessionDefaultsForSchema(sessionStore.getAll(), internalSchema);
-      if (sanitizedArgs.buildForTesting === true && sanitizedArgs.deviceId === undefined) {
+      if (
+        sanitizedArgs.deviceId === undefined &&
+        (sanitizedArgs.buildForTesting === true || clearSessionDeviceIdUnlessPrepared)
+      ) {
         delete sessionDefaults.deviceId;
       }
       const hasExplicitPreparedSource =