Skip to content

Commit e246cef

Browse files
committed
refactor(daemon): consolidate device conflict resolution helper (callstack#4228)
1 parent 679a96a commit e246cef

3 files changed

Lines changed: 40 additions & 45 deletions

File tree

‎packages/daemon/src/server/request-execution-scope.ts‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,9 @@ import {
2626
} from '../core/context.ts';
2727
import { assertSessionSelectorMatches } from '../core/session-selector.ts';
2828
import {
29-
isImplicitSessionScopeConflict,
3029
resolveCallerScopeRoot,
3130
resolveEffectiveSessionName,
3231
} from '../sessions/session-routing.ts';
33-
import {
34-
buildDeviceInUseBySessionError,
35-
buildForeignWorkspaceSessionConflict,
36-
} from '../core/session-recovery-hints.ts';
3732
import { deriveWebSessionIdentity } from '../core/session-tenant-scope.ts';
3833
import {
3934
assertRequestLeaseAdmissionPreflight,
@@ -56,7 +51,7 @@ import {
5651
} from './request-binding.ts';
5752
import {
5853
beginOpenDeviceWait,
59-
findSessionHoldingDevice,
54+
findSessionDeviceConflict,
6055
readOpenWaitBudgetMs,
6156
} from '../sessions/open-device-contention-wait.ts';
6257
import {
@@ -614,15 +609,13 @@ function createRequestDeviceAccess(params: {
614609
assertDaemonPolicyAdmitsDevice(daemonPolicy, device);
615610
}
616611
if (claimPolicy === 'require-owner' && !params.sessionStore.get(params.sessionName)) {
617-
const inUse = findSessionHoldingDevice(
618-
params.sessionStore,
619-
device.id,
620-
params.sessionName,
621-
);
622-
if (inUse) {
623-
const refusal = isImplicitSessionScopeConflict(params.req, inUse.session)
624-
? buildForeignWorkspaceSessionConflict(inUse, device)
625-
: buildDeviceInUseBySessionError(inUse, device);
612+
const refusal = findSessionDeviceConflict({
613+
req: params.req,
614+
device,
615+
sessionStore: params.sessionStore,
616+
sessionName: params.sessionName,
617+
});
618+
if (refusal) {
626619
throw new AppError(
627620
refusal.error.code,
628621
refusal.error.message,

‎packages/daemon/src/sessions/open-device-contention-wait.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@ import { readOptionalInteger } from '@agent-device/contracts/command';
33
import { emitRequestProgress, throwIfRequestCanceled } from '@agent-device/host-kit/request';
44
import { Deadline, sleep } from '@agent-device/host-kit/retry';
55
import { AppError } from '@agent-device/kernel/errors';
6+
import type { DeviceInfo } from '@agent-device/contracts/device';
67
import type { DaemonRequest } from '../core/daemon-request.ts';
8+
import type { DaemonFailureResponse } from '../core/daemon-response.ts';
79
import type { SessionStore } from '../core/session-store.ts';
810
import type { SessionRecoveryOptions } from '../core/session-recovery-hints.ts';
11+
import { isImplicitSessionScopeConflict } from './session-routing.ts';
12+
import {
13+
buildDeviceInUseBySessionError,
14+
buildForeignWorkspaceSessionConflict,
15+
} from '../core/session-recovery-hints.ts';
916

1017
/**
1118
* How often a waiting open re-checks its device. Contention ends when another session closes or
@@ -129,6 +136,28 @@ export function findSessionHoldingDevice(
129136
return inUse;
130137
}
131138

139+
/**
140+
* Resolves the device conflict refusal when another session already holds the target device.
141+
* Used by both session open and request-execution scope to enforce owner claims consistently.
142+
*/
143+
export function findSessionDeviceConflict(params: {
144+
req: DaemonRequest;
145+
device: DeviceInfo;
146+
sessionStore: SessionStore;
147+
sessionName?: string;
148+
}): DaemonFailureResponse | undefined {
149+
const { req, device, sessionStore, sessionName } = params;
150+
const inUse = sessionName
151+
? findSessionHoldingDevice(sessionStore, device.id, sessionName)
152+
: sessionStore.findByDevice(device.id);
153+
if (!inUse) return undefined;
154+
const attempt = describeOpenWaitForRefusal(req);
155+
if (isImplicitSessionScopeConflict(req, inUse.session)) {
156+
return buildForeignWorkspaceSessionConflict(inUse, device, attempt);
157+
}
158+
return buildDeviceInUseBySessionError(inUse, device, attempt);
159+
}
160+
132161
type LockedAttempt<Outcome> = { ran: true; outcome: Outcome } | { ran: false };
133162

134163
function createOpenDeviceWait(params: {

‎packages/daemon/src/sessions/session-lifecycle/internal/session-open-execution.ts‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,8 @@ import {
5050
prepareOpenCommandDetails,
5151
type ResolvedOpenRuntimeHintPlan,
5252
} from './session-open-prepare.ts';
53-
import {
54-
buildDeviceInUseBySessionError,
55-
buildForeignWorkspaceSessionConflict,
56-
} from '../../../core/session-recovery-hints.ts';
57-
import { describeOpenWaitForRefusal } from '../../open-device-contention-wait.ts';
58-
import { isImplicitSessionScopeConflict, resolvePublicSessionName } from '../../session-routing.ts';
53+
import { findSessionDeviceConflict } from '../../open-device-contention-wait.ts';
54+
import { resolvePublicSessionName } from '../../session-routing.ts';
5955
import { applicationLifecycleExecutionFromRequest } from '../../application-lifecycle-execution.ts';
6056
import {
6157
abandonDeviceClaim,
@@ -72,7 +68,6 @@ import { buildDeviceClaimConflictError } from '../../../resources/device/device-
7268
import { deviceClaimRuleForOwner } from '../../../resources/device/device-claim-rule.ts';
7369
import {
7470
errorResponse,
75-
type DaemonFailureResponse,
7671
type DaemonResponse,
7772
} from '@agent-device/kernel/contracts';
7873

@@ -438,28 +433,6 @@ async function prepareOpenDispatchSession(params: {
438433
return { type: 'session', ref: sessionStore.refresh(ref) };
439434
}
440435

441-
/**
442-
* The refusal an open gets when another session already holds the device, or a device that
443-
* overlaps it. The wait an expired `--wait` budget spent is carried into the recovery text, because
444-
* a caller that waited is not helped by being told to wait.
445-
*/
446-
function findNewSessionDeviceConflict(params: {
447-
req: DaemonRequest;
448-
device: DeviceInfo;
449-
sessionStore: SessionStore;
450-
}): DaemonFailureResponse | undefined {
451-
const { req, device, sessionStore } = params;
452-
const inUse = sessionStore.findByDevice(device.id);
453-
if (!inUse) return undefined;
454-
// The wait the caller paid for belongs to `open` alone: an interaction that hits the same busy
455-
// device cannot wait for it, and would be sent off with a flag its own command rejects.
456-
const attempt = describeOpenWaitForRefusal(req);
457-
if (isImplicitSessionScopeConflict(req, inUse.session)) {
458-
return buildForeignWorkspaceSessionConflict(inUse, device, attempt);
459-
}
460-
return buildDeviceInUseBySessionError(inUse, device, attempt);
461-
}
462-
463436
async function acquireDeviceClaimForOwner(params: {
464437
host: HostEnvironment;
465438
req: DaemonRequest;
@@ -529,7 +502,7 @@ export async function openNewSessionWithDeviceClaim(params: {
529502
platformServices,
530503
} = params;
531504
requireOpenSessionAdmission(sessionStore, sessionName, undefined);
532-
const conflict = findNewSessionDeviceConflict({ req, device, sessionStore });
505+
const conflict = findSessionDeviceConflict({ req, device, sessionStore });
533506
if (conflict) return { type: 'response', response: conflict };
534507

535508
const ownerClaim = await acquireDeviceClaimForOwner({

0 commit comments

Comments
 (0)