Skip to content

Commit 23b833f

Browse files
committed
fix: persist canonical daemon claim state directory
1 parent 9c01643 commit 23b833f

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎src/daemon/__tests__/request-router-open.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { ensureDeviceReady } from '../device-ready.ts';
2424
import type { DeviceInfo } from '@agent-device/kernel/device';
2525
import { AppError } from '@agent-device/kernel/errors';
2626
import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
27+
import { inspectDeviceClaims } from '../device-claim-inspection.ts';
2728

2829
const mockDispatch = vi.mocked(dispatchCommand);
2930
const mockResolveTargetDevice = vi.mocked(getResolveTargetDeviceMock());
@@ -121,6 +122,9 @@ test('open returns and creates the session state directory', async () => {
121122
expect(fs.existsSync(String(response.data?.sessionStateDir))).toBe(true);
122123
expect(fs.existsSync(String(response.data?.eventLogPath))).toBe(true);
123124
}
125+
expect(inspectDeviceClaims({ udid: device.id })[0]?.claim?.stateDir).toBe(
126+
sessionStore.resolveDaemonStateDir(),
127+
);
124128
});
125129

126130
test('fresh open uses app-aware device selection for advisory locking and dispatch', async () => {

‎src/daemon/handlers/session-open.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import path from 'node:path';
21
import { dispatchCommand, resolveTargetDevice } from '../../core/dispatch.ts';
32
import {
43
abortAuthoringOnSecondOpen,
@@ -557,18 +556,18 @@ async function acquireLocalDeviceClaim(params: {
557556
req: DaemonRequest;
558557
device: DeviceInfo;
559558
sessionName: string;
560-
logPath: string;
559+
sessionStore: SessionStore;
561560
reconcileOrphanedDeviceClaim: DeviceClaimReconciler;
562561
}): Promise<DeviceClaimAcquireResult | { status: 'not-required' }> {
563-
const { req, device, sessionName, logPath, reconcileOrphanedDeviceClaim } = params;
562+
const { req, device, sessionName, sessionStore, reconcileOrphanedDeviceClaim } = params;
564563
if (!isLocalDeviceClaimTarget(req.meta, isActiveProviderDevice(device))) {
565564
return { status: 'not-required' };
566565
}
567566
return await acquireDeviceClaim({
568567
device,
569568
session: sessionName,
570569
workspace: req.meta?.cwd ?? process.cwd(),
571-
stateDir: path.dirname(logPath),
570+
stateDir: sessionStore.resolveDaemonStateDir(),
572571
reconcileOrphanedDeviceClaim,
573572
});
574573
}
@@ -600,7 +599,7 @@ async function openNewSessionWithDeviceClaim(params: {
600599
req,
601600
device,
602601
sessionName,
603-
logPath,
602+
sessionStore,
604603
reconcileOrphanedDeviceClaim,
605604
});
606605
if (localClaim.status === 'conflict') {

0 commit comments

Comments
 (0)