Skip to content

Commit 62d6af6

Browse files
committed
fix: share optional recording for alert and settings actions
1 parent 8039c90 commit 62d6af6

6 files changed

Lines changed: 55 additions & 20 deletions

File tree

‎packages/platform-apple/src/launch-confirmation.test.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,3 +430,16 @@ test('a confirmed persistent prompt reports its observed outcome without an acce
430430
data: { reason: 'alert-still-present' },
431431
});
432432
});
433+
434+
test('a matching launch title with other buttons is left unanswered on the first read', async () => {
435+
const { port: device, acceptAlert } = port(async () => ({
436+
...CONFIRMATION,
437+
items: ['Cancel', 'Continue'],
438+
}));
439+
await expect(answerLaunchConfirmation(device)).resolves.toMatchObject({
440+
outcome: 'unanswered',
441+
reason: 'alert-unrecognized',
442+
});
443+
expect(device.readAlert).toHaveBeenCalledOnce();
444+
expect(acceptAlert).not.toHaveBeenCalled();
445+
});

‎src/daemon/handlers/__tests__/session-clipboard.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,20 @@ for (const action of ['read', 'write'] as const) {
241241
expect(spies.writeClipboard).not.toHaveBeenCalled();
242242
});
243243
}
244+
245+
test('clipboard read succeeds without journaling after its admitted lifetime ends', async () => {
246+
const spies = harness({ read: available, write: available });
247+
const input = request(['read']);
248+
const retired = input.sessionStore.lookup(input.sessionName)!;
249+
const successor = makeSession(input.sessionName, androidDevice);
250+
spies.readClipboard.mockImplementationOnce(async () => {
251+
input.sessionStore.retire(retired);
252+
input.sessionStore.publish(input.sessionName, successor);
253+
return 'copied text';
254+
});
255+
const response = await handleSessionClipboardCommand({ ...input, ...spies });
256+
expect(response?.ok).toBe(true);
257+
expect(spies.readClipboard).toHaveBeenCalledOnce();
258+
expect(retired.session.actions).toEqual([]);
259+
expect(successor.actions).toEqual([]);
260+
});

‎src/daemon/handlers/__tests__/snapshot-alert.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,23 @@ test('alert dismiss retries a typed absence whatever the message says', async ()
118118
expect(response?.ok).toBe(true);
119119
expect(calls).toBe(3);
120120
});
121+
122+
for (const action of ['accept', 'dismiss']) {
123+
test(`alert ${action} succeeds without journaling after its admitted lifetime ends`, async () => {
124+
const store = makeSessionStore();
125+
const name = 'ios-alert-retirement';
126+
const retired = store.publish(name, makeSession(name));
127+
let successor: SessionState | undefined;
128+
mockRunnerCommand.mockImplementationOnce(async () => {
129+
store.retire(retired);
130+
successor = makeSession(name);
131+
store.publish(name, successor);
132+
return { [action === 'accept' ? 'accepted' : 'dismissed']: true };
133+
});
134+
const response = await handleSnapshotCommands(name, store, [action]);
135+
expect(response?.ok).toBe(true);
136+
expect(mockRunnerCommand).toHaveBeenCalledOnce();
137+
expect(retired.session.actions).toEqual([]);
138+
expect(successor?.actions).toEqual([]);
139+
});
140+
}

‎src/daemon/handlers/snapshot-alert.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { contextFromFlags } from '../context.ts';
1515
import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
1616
import type { SessionRef, SessionState } from '../session-state.ts';
1717
import { SessionStore } from '../session-store.ts';
18-
import { recordIfSession } from '../snapshot-session.ts';
18+
import { recordSessionAction } from '../session-action-recorder.ts';
1919
import { parseTimeout } from '@agent-device/command-registry/parse-timeout';
2020
import { resolveRefFrameEffect } from '../daemon-command-registry.ts';
2121
import { expireRefFrame } from '../ref-frame.ts';
@@ -147,7 +147,7 @@ export async function handleAlertCommand(
147147
...alertTarget(session),
148148
execution: runtimeExecutionFromContext(context),
149149
});
150-
recordIfSession(sessionStore, ref, req, data);
150+
recordSessionAction(sessionStore, ref, req, req.command, data);
151151
return { ok: true, data };
152152
}
153153

‎src/daemon/handlers/snapshot-settings.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { contextFromFlags } from '../context.ts';
2727
import { SessionStore } from '../session-store.ts';
2828
import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
2929
import type { SessionRef, SessionState } from '../session-state.ts';
30-
import { recordIfSession } from '../snapshot-session.ts';
30+
import { recordSessionAction } from '../session-action-recorder.ts';
3131
import { expireRefFrame } from '../ref-frame.ts';
3232
import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
3333
import { readLocationCoordinate } from '@agent-device/kernel/location-coordinates';
@@ -252,7 +252,7 @@ async function executeSettingsRead(
252252
...payload,
253253
...successText(describeSettingRead(payload)),
254254
};
255-
recordIfSession(sessionStore, ref, req, data);
255+
recordSessionAction(sessionStore, ref, req, req.command, data);
256256
return { ok: true, data };
257257
}
258258

@@ -297,7 +297,7 @@ async function executeSettingsWrite(
297297
),
298298
describeSettingWrite(setting, state, appBundleId),
299299
);
300-
recordIfSession(sessionStore, ref, req, data);
300+
recordSessionAction(sessionStore, ref, req, req.command, data);
301301
return { ok: true, data };
302302
}
303303

‎src/daemon/snapshot-session.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,6 @@ export async function withSessionlessRunnerCleanup<T>(
3939
}
4040
}
4141

42-
export function recordIfSession(
43-
sessionStore: SessionStore,
44-
ref: SessionRef | undefined,
45-
req: DaemonRequest,
46-
result: Record<string, unknown>,
47-
): void {
48-
if (!ref) return;
49-
sessionStore.recordAction(ref, {
50-
command: req.command,
51-
positionals: req.positionals ?? [],
52-
flags: req.flags ?? {},
53-
result,
54-
});
55-
}
56-
5742
export function createSnapshotSession(params: {
5843
sessionName: string;
5944
sessionScope: SessionScope;

0 commit comments

Comments
 (0)