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
16 changes: 11 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"package:cef": "bash scripts/cef/package.sh"
},
"devDependencies": {
"@agentclientprotocol/sdk": "latest",
"@agentclientprotocol/sdk": "~2.5.0",
"@lucide/svelte": "^1.0.0",
"@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.64.0",
Expand Down
92 changes: 92 additions & 0 deletions src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -8328,6 +8328,98 @@ a.session-delegate-session:hover {
gap: 0.65rem;
}

/* Context-compaction boundary: a full-width divider, deliberately unlike a turn bubble. */
.session-compaction {
display: grid;
gap: 0.4rem;
padding-block: 0.35rem;
color: var(--muted);
}

.session-compaction-rule {
height: 1px;
background: linear-gradient(90deg, transparent, var(--border-strong), transparent);
}

.session-compaction-header {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
gap: 0.5rem;
font-size: 0.76rem;
}

.session-compaction-mark {
display: inline-flex;
color: var(--accent);
}

.session-compaction-title {
font-weight: 600;
letter-spacing: 0.01em;
}

.session-compaction-title-live {
background: linear-gradient(90deg, var(--muted) 20%, var(--accent) 50%, var(--muted) 80%);
background-size: 200% 100%;
-webkit-background-clip: text;
background-clip: text;
color: transparent;
animation: state-skeleton-shimmer 1.6s ease-in-out infinite;
}

.session-compaction-detail {
font-variant-numeric: tabular-nums;
}

.session-compaction-toggle {
display: inline-flex;
align-items: center;
gap: 0.25rem;
padding: 0.1rem 0.4rem;
border: 0;
border-radius: 999px;
background: transparent;
color: inherit;
font: inherit;
cursor: pointer;
}

.session-compaction-toggle:hover,
.session-compaction-toggle:focus-visible {
background: var(--accent-dim);
color: var(--text);
}

.session-compaction-chevron-open {
transform: rotate(180deg);
}

.session-compaction-failed .session-compaction-mark,
.session-compaction-failed .session-compaction-detail {
color: var(--danger);
}

.session-compaction-cancelled .session-compaction-mark {
color: var(--muted);
}

.session-compaction-summary {
margin-inline: auto;
max-width: 46rem;
padding: 0.6rem 0.85rem;
border: 1px solid var(--border);
border-radius: 0.6rem;
font-size: 0.85rem;
color: var(--text);
}

.session-compaction-summary-live {
margin: 0;
white-space: pre-wrap;
}

.session-prompt-error {
display: grid;
grid-template-columns: 1.7rem minmax(0, 1fr);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/automations/ScheduleDialog.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ describe('ScheduleDialog', () => {
it('shows the agent reason and copies the full error details', async () => {
const writeText = vi.fn(async (_text: string) => undefined);
Object.defineProperty(navigator, 'clipboard', { value: { writeText }, configurable: true });
const { RequestError } = await import('@agentclientprotocol/sdk');
const { RequestError } = await import('@agentclientprotocol/sdk/unstable');
agentsStore.createSchedule.mockRejectedValueOnce(new RequestError(-32602, 'Invalid params', { error: 'missing field `type`' }));
vi.spyOn(console, 'error').mockImplementation(() => undefined);
await openDialog({ agentId: 'agent-1', cwd: '/home/me/projects/querymt', prompt: 'Summarise open PRs' });
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/primitives/AcpSessionList.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type { SessionInfo } from '@agentclientprotocol/sdk';
import type { SessionInfo } from '@agentclientprotocol/sdk/unstable';

export let sessions: SessionInfo[];
</script>
Expand Down
3 changes: 3 additions & 0 deletions src/lib/components/primitives/ActiveSessionView.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import { provideToolContentFetcher, type ToolContentFetcher } from '$lib/components/session/tool-content-context';
import Conversation from '$lib/components/ai-elements/conversation.svelte';
import SessionTurn from '$lib/components/session/SessionTurn.svelte';
import SessionCompactionDivider from '$lib/components/session/SessionCompactionDivider.svelte';
import SessionTurnDiffPanel from '$lib/components/session/SessionTurnDiffPanel.svelte';
import { buildSessionConversation } from '$lib/domain/session-conversation';
import { getForkTarget } from '$lib/domain/session-fork';
Expand Down Expand Up @@ -395,6 +396,8 @@
{#each windowedTurns as item (item.type === 'turn' ? item.turn.id : item.key)}
{#if item.type === 'spacer'}
<div class="session-turn-spacer" style={`height:${item.height}px`} aria-hidden="true"></div>
{:else if item.turn.compaction}
<SessionCompactionDivider compaction={item.turn.compaction} />
{:else}
{@const turn = item.turn}
{@const forkTarget = getForkTarget(turn)}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/primitives/SessionComposer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import { getModeToneIndex } from '$lib/domain/session-mode-tone';
import type { ComposerOption, ModelEntry, ModelInfo, PromptAttachment, SessionContentBlock, SessionInputDeliveryMode } from '$lib/domain/types';
import type { SendShortcut } from '$lib/stores/chat-preferences.svelte';
import type { SessionConfigOption } from '@agentclientprotocol/sdk';
import type { SessionConfigOption } from '@agentclientprotocol/sdk/unstable';

let modelPickerRef: { openPicker: () => Promise<void> } | null = null;
let fileInputElement = $state<HTMLInputElement | null>(null);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/primitives/SessionTurnSummary.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type { PromptResponse } from '@agentclientprotocol/sdk';
import type { PromptResponse } from '@agentclientprotocol/sdk/unstable';

export let sessionId: string | null;
export let response: PromptResponse | null;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/session/SessionActivityBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
if (session.runState === 'waiting-input') return plain('Input needed');
if (session.runState === 'unknown') return plain(session.activityLabel ?? 'Execution status unavailable');
if (session.dependencyLabel && !agentBusy) return plain(`Own turn idle - ${session.dependencyLabel}`);
if (session.activityLabel?.startsWith('Cancelling') || session.activityLabel?.startsWith('Finishing')) return plain(session.activityLabel);
if (session.activityLabel?.startsWith('Cancelling') || session.activityLabel?.startsWith('Finishing') || session.activityLabel?.startsWith('Compacting')) return plain(session.activityLabel);
if (session.runState === 'tool-running' && activeToolPresentation) {
const count = session.toolCalls.filter((tool) => (tool.status === 'pending' || tool.status === 'in_progress') && (!session.runId || !tool.runId || tool.runId === session.runId)).length;
return {
Expand Down
65 changes: 65 additions & 0 deletions src/lib/components/session/SessionCompactionDivider.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<script lang="ts">
import { ChevronDown, FoldVertical, LoaderCircle, TriangleAlert } from '@lucide/svelte';
import { describeCompaction } from '$lib/domain/session-compaction';
import { renderMarkdownToHtml } from '$lib/domain/markdown';
import type { SessionCompactionItem } from '$lib/domain/types';

let { compaction }: { compaction: SessionCompactionItem } = $props();

let expanded = $state(false);
const panelId = $props.id();
const presentation = $derived(describeCompaction(compaction));
const hasSummary = $derived(compaction.summary.trim().length > 0);
// Streaming summaries stay plain text until settled, like live assistant output.
const summaryHtml = $derived(
expanded && hasSummary && compaction.status !== 'in_progress' ? renderMarkdownToHtml(compaction.summary) : ''
);
</script>

<section
class={`session-compaction session-compaction-${presentation.tone}`}
data-compaction-id={compaction.id}
data-turn-id={`compaction-${compaction.id}`}
aria-label={presentation.title}
>
<div class="session-compaction-rule" role="separator" aria-hidden="true"></div>
<div class="session-compaction-header">
<span class="session-compaction-mark" aria-hidden="true">
{#if presentation.tone === 'running'}
<LoaderCircle size={14} class="animate-spin" />
{:else if presentation.tone === 'failed'}
<TriangleAlert size={14} />
{:else}
<FoldVertical size={14} />
{/if}
</span>
<span class="session-compaction-title" class:session-compaction-title-live={presentation.tone === 'running'}>
{presentation.title}
</span>
{#if presentation.detail}
<span class="session-compaction-detail">{presentation.detail}</span>
{/if}
{#if hasSummary}
<button
type="button"
class="session-compaction-toggle"
aria-expanded={expanded}
aria-controls={panelId}
onclick={() => (expanded = !expanded)}
>
{expanded ? 'Hide summary' : 'Show summary'}
<ChevronDown size={12} class={expanded ? 'session-compaction-chevron-open' : ''} aria-hidden="true" />
</button>
{/if}
</div>
<div class="session-compaction-rule" aria-hidden="true"></div>
{#if expanded && hasSummary}
<div id={panelId} class="session-compaction-summary">
{#if summaryHtml}
<div class="markdown-body">{@html summaryHtml}</div>
{:else}
<p class="session-compaction-summary-live">{compaction.summary}</p>
{/if}
</div>
{/if}
</section>
50 changes: 50 additions & 0 deletions src/lib/components/session/SessionCompactionDivider.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import '@testing-library/jest-dom/vitest';
import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
import { afterEach, describe, expect, it } from 'vitest';
import SessionCompactionDivider from './SessionCompactionDivider.svelte';
import type { SessionCompactionItem } from '$lib/domain/types';

function item(overrides: Partial<SessionCompactionItem> = {}): SessionCompactionItem {
return { id: 'c1', status: 'completed', summary: '## Goals\n\nShip it.', tokensBefore: 150_000, tokensAfter: 20_000, ...overrides };
}

afterEach(cleanup);

describe('SessionCompactionDivider', () => {
it('renders a boundary with the token drop and a collapsed, toggleable markdown summary', async () => {
const { container } = render(SessionCompactionDivider, { compaction: item() });
expect(screen.getByText('Context compacted')).toBeInTheDocument();
expect(screen.getByText('150k \u2192 20k tokens')).toBeInTheDocument();
expect(container.querySelector('.session-turn')).toBeNull();
expect(container.querySelector('.session-compaction-summary')).toBeNull();

const toggle = screen.getByRole('button', { name: /show summary/i });
expect(toggle).toHaveAttribute('aria-expanded', 'false');
await fireEvent.click(toggle);
expect(toggle).toHaveAttribute('aria-expanded', 'true');
expect(container.querySelector('.session-compaction-summary h2')?.textContent).toBe('Goals');
await fireEvent.click(toggle);
expect(container.querySelector('.session-compaction-summary')).toBeNull();
});

it('shows a live state with no toggle until summary text exists', () => {
const { container, rerender } = render(SessionCompactionDivider, {
compaction: item({ status: 'in_progress', summary: '', tokensAfter: null })
});
expect(screen.getByText('Compacting context\u2026')).toBeInTheDocument();
expect(container.querySelector('.animate-spin')).not.toBeNull();
expect(screen.queryByRole('button')).toBeNull();
return rerender({ compaction: item({ status: 'in_progress', summary: 'partial', tokensAfter: null }) }).then(() => {
expect(screen.getByRole('button', { name: /show summary/i })).toBeInTheDocument();
});
});

it('shows failure details in the failed tone', () => {
const { container } = render(SessionCompactionDivider, {
compaction: item({ status: 'failed', summary: '', error: 'provider down' })
});
expect(screen.getByText('Compaction failed')).toBeInTheDocument();
expect(screen.getByText('provider down')).toBeInTheDocument();
expect(container.querySelector('.session-compaction')).toHaveClass('session-compaction-failed');
});
});
2 changes: 1 addition & 1 deletion src/lib/components/session/SessionConfigPanel.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
getSelectConfigOptions
} from '$lib/querymt/config-options';
import type { ActiveSessionViewModel } from '$lib/domain/types';
import type { SessionConfigOption, SessionConfigSelectOption } from '@agentclientprotocol/sdk';
import type { SessionConfigOption, SessionConfigSelectOption } from '@agentclientprotocol/sdk/unstable';
import type { Component } from 'svelte';

type SelectConfigOption = SessionConfigOption & { type: 'select' };
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/session/SessionHeader.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
['submitting', 'thinking', 'streaming', 'tool-running'].includes(session.runState) ||
(!session.sessionId && ['thinking', 'cancelling'].includes(summaryStatus))
) {
return { label: session.activityLabel?.startsWith('Cancelling') ? 'Cancelling' : session.activityLabel?.startsWith('Finishing') ? 'Finishing' : session.activityLabel?.startsWith('Waiting for delegates') ? 'Waiting for delegates' : 'Working', tone: 'running', busy: true };
return { label: session.activityLabel?.startsWith('Compacting') ? 'Compacting' : session.activityLabel?.startsWith('Cancelling') ? 'Cancelling' : session.activityLabel?.startsWith('Finishing') ? 'Finishing' : session.activityLabel?.startsWith('Waiting for delegates') ? 'Waiting for delegates' : 'Working', tone: 'running', busy: true };
}
if (session.runState === 'completed' || (!session.sessionId && summaryStatus === 'completed')) {
// Same tone the session list gives a completed turn.
Expand Down
2 changes: 1 addition & 1 deletion src/lib/domain/error-details.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RequestError } from '@agentclientprotocol/sdk';
import { RequestError } from '@agentclientprotocol/sdk/unstable';
import { describe, expect, it } from 'vitest';
import { describeError } from './error-details';

Expand Down
2 changes: 1 addition & 1 deletion src/lib/domain/error-details.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RequestError } from '@agentclientprotocol/sdk';
import { RequestError } from '@agentclientprotocol/sdk/unstable';

export interface ErrorReport {
/** One line for the UI: the error message plus the agent's reason when it gave one. */
Expand Down
26 changes: 25 additions & 1 deletion src/lib/domain/inbox.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest';
import type { CreateElicitationRequest, ElicitationSchema } from '@agentclientprotocol/sdk';
import type { CreateElicitationRequest, ElicitationSchema } from '@agentclientprotocol/sdk/unstable';
import { buildElicitationResponse, describeElicitationAnswers, mapElicitationRequestToInboxItem } from './inbox';

// Fixtures carry option `description` and `_meta`, which the SDK's EnumOption type does not
Expand All @@ -15,6 +15,30 @@ function request(requestedSchema: Record<string, unknown>, querymtMeta?: Record<
}

describe('elicitation inbox mapping', () => {
it('treats forms with unsupported property types as non-submittable', () => {
const item = mapElicitationRequestToInboxItem(
request({
type: 'object',
properties: { blob: { type: 'object', title: 'Blob' }, name: { type: 'string' } },
required: ['blob']
}),
'item-1'
);

expect(item.formFields).toEqual([]);
expect(item.actions?.map((action) => action.kind)).toEqual(['decline', 'cancel']);
expect(item.detail).toContain('cannot be submitted');
});

it('refuses to build an accept response for unsupported field kinds', () => {
const fields = [
{ key: 'blob', label: 'Blob', kind: 'object', required: true, value: '' }
] as unknown as Parameters<typeof buildElicitationResponse>[1];

expect(buildElicitationResponse('accept', fields)).toBeNull();
expect(buildElicitationResponse('decline', fields)).toEqual({ action: 'decline' });
});

it('maps ACP oneOf and anyOf options', () => {
const item = mapElicitationRequestToInboxItem(
request({
Expand Down
Loading
Loading