Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions apps/desktop/src/main/runtime-host-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ import {
type CollaborationAccessQueryResult,
type CollaborationInvitationPrepareResult,
type CollaborationPrincipalRevokeResult,
type CollaborationTurnRequestDecideResult,
type CollaborationTurnRequestQueryResult,
type SessionCollaborationGrantKind,
type SessionTurnAccessRequest,
type SessionTurnRequestIntent,
type SessionConfigurationPatch,
type SessionAssistantStreamIdentity,
type SessionContinuitySnapshot,
Expand Down Expand Up @@ -296,6 +300,24 @@ export class DesktopRuntimeHostClient {
return this.request('collaboration.principal.revoke', { principalId });
}

createCollaborationTurnRequest(intent: SessionTurnRequestIntent): Promise<SessionTurnAccessRequest> {
return this.request('collaboration.turn-request.create', { intent });
}

queryCollaborationTurnRequests(sessionId: string): Promise<CollaborationTurnRequestQueryResult> {
return this.request('collaboration.turn-request.query', { sessionId });
}

decideCollaborationTurnRequest(
requestId: string,
decision: 'approve' | 'reject',
): Promise<CollaborationTurnRequestDecideResult> {
return this.request('collaboration.turn-request.decide', {
requestId,
decision,
});
}

subscribeConfigurationChanges(listener: (revision: number) => void): () => void {
this.#assertOpen();
return this.connection.subscribeConfigurationChanges(listener);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,8 @@ describe('Runtime Host operator commands', () => {
'access.credential.rotation.prepare',
'access.credential.rotation.revoke',
'access.principal.revoke',
'collaboration.turn-request.acknowledge',
'collaboration.turn-request.create',
'host.upgrade.prepare',
'hosted.execution.cancel',
'hosted.execution.start',
Expand Down
42 changes: 42 additions & 0 deletions packages/runtime-host/src/__tests__/root-turn-coordinator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,48 @@ test('turn.start durably applies one exact per-Turn orchestration override', asy
}
});

test('turn.start durably binds a Guest request approval to the admitted Turn', async () => {
const fixture = await createFailureFixture({
registerBackend: (backends) =>
backends.register('ai-sdk', (context) => new FakeBackend(context)),
});
const input = {
sessionId: fixture.sessionId,
turnId: 'turn-collaboration-request',
content: { text: 'Run the exact approved request.' },
};
const authorization = {
kind: 'session_turn_access_request' as const,
requestId: 'request-1',
principalId: 'session_guest:guest-1',
grantId: 'grant-1',
approvedAt: 1_788_000_000_000,
approvedBy: 'local_owner',
};
try {
const started = await fixture.interactiveTurns.handlers['turn.start'](input, {
...operationContext(fixture.hostEpoch, fixture.acquireResidency),
principal: authorization.principalId,
turnAdmissionAuthorization: authorization,
});
assertStartedTurn(started);
assert.deepEqual(
(await fixture.stores.agentRunStore.readRootTurnAdmission(fixture.sessionId, input.turnId))
?.authorization,
authorization,
);

const conflictingRetry = await fixture.interactiveTurns.handlers['turn.start'](
input,
operationContext(fixture.hostEpoch, fixture.acquireResidency),
);
assert.equal(conflictingRetry.ok, false);
if (!conflictingRetry.ok) assert.equal(conflictingRetry.error.code, 'operation_conflict');
} finally {
await fixture.dispose();
}
});

test('turn.start resolves explicit Skills once before durable admission and replays the result', async () => {
let preparationCount = 0;
let blocked = false;
Expand Down
Loading