Skip to content

fix: set ended_at on session completion + filter completed sessions from threadKey lookup (by Wren) #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
conoremclaughlin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: set ended_at on session completion + filter completed sessions from threadKey lookup (by Wren) #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 64 additions & 0 deletions packages/api/src/mcp/tools/memory-handlers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,70 @@ describe('handleUpdateSessionPhase', () => {
expect(parsed.message).toContain('workingDir updated');
});

it('should set endedAt when status is completed', async () => {
mockDataComposer.repositories.memory.getActiveSession.mockResolvedValue(mockSession);
mockDataComposer.repositories.memory.updateSession.mockResolvedValue({
...mockSession,
status: 'completed',
lifecycle: 'completed',
endedAt: new Date(),
});

await handleUpdateSessionPhase(
{ email: 'test@test.com', phase: 'complete', status: 'completed' },
mockDataComposer as never
);

expect(mockDataComposer.repositories.memory.updateSession).toHaveBeenCalledWith(
'session-123',
expect.objectContaining({
endedAt: expect.any(Date),
status: 'completed',
lifecycle: 'completed',
})
);
});

it('should set endedAt when lifecycle is explicitly completed', async () => {
mockDataComposer.repositories.memory.getActiveSession.mockResolvedValue(mockSession);
mockDataComposer.repositories.memory.updateSession.mockResolvedValue({
...mockSession,
lifecycle: 'completed',
endedAt: new Date(),
});

await handleUpdateSessionPhase(
{ email: 'test@test.com', phase: 'complete', lifecycle: 'completed' },
mockDataComposer as never
);

expect(mockDataComposer.repositories.memory.updateSession).toHaveBeenCalledWith(
'session-123',
expect.objectContaining({
endedAt: expect.any(Date),
lifecycle: 'completed',
})
);
});

it('should NOT set endedAt for non-completed status', async () => {
mockDataComposer.repositories.memory.getActiveSession.mockResolvedValue(mockSession);
mockDataComposer.repositories.memory.updateSession.mockResolvedValue({
...mockSession,
status: 'active',
});

await handleUpdateSessionPhase(
{ email: 'test@test.com', phase: 'implementing', status: 'active' },
mockDataComposer as never
);

expect(mockDataComposer.repositories.memory.updateSession).toHaveBeenCalledWith(
'session-123',
expect.not.objectContaining({ endedAt: expect.anything() })
);
});

it('should include session info in response', async () => {
const sessionWithWorkspace = {
...mockSession,
Expand Down
4 changes: 4 additions & 0 deletions packages/api/src/mcp/tools/memory-handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,7 @@ export async function handleUpdateSessionPhase(args: unknown, dataComposer: Data
context?: string;
workingDir?: string;
cliAttached?: boolean;
endedAt?: Date | null;
} = {};

// Map runtime: prefix phases to lifecycle (backward compat for old callers)
Expand Down Expand Up @@ -1442,6 +1443,9 @@ export async function handleUpdateSessionPhase(args: unknown, dataComposer: Data
if (params.status !== undefined) {
updates.status = params.status;
}
if (params.status === 'completed' || updates.lifecycle === 'completed') {
updates.endedAt = new Date();
}
if (params.backendSessionId !== undefined) {
updates.backendSessionId = params.backendSessionId;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/services/sessions/session-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
.eq('agent_id', agentId)
.eq('thread_key', threadKey)
.is('ended_at', null)
.neq('lifecycle', 'failed')
.not('lifecycle', 'in', '(completed,cancelled,failed)')

Check failure on line 205 in packages/api/src/services/sessions/session-repository.ts

View workflow job for this annotation

GitHub Actions / Unit Tests

src/services/sessions/per-sender-isolation.test.ts > Per-Sender Session Isolation > SessionRepository.findByThreadKey with contactId > should include contact_id filter in thread key lookup 

TypeError: this.supabase.from(...).select(...).eq(...).eq(...).eq(...).is(...).not is not a function
 ❯ SessionRepository.findByThreadKey src/services/sessions/session-repository.ts:205:8
 ❯ src/services/sessions/per-sender-isolation.test.ts:204:18
.order('started_at', { ascending: false })
.limit(1);

Expand Down
Loading