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
21 changes: 21 additions & 0 deletions packages/sdk-typescript/src/daemon/ui/normalizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ export function normalizeDaemonEvent(
case 'settings_changed':
return normalizeSettingsChanged(event, base);

case 'settings_reloaded':
return normalizeSettingsReloaded(event, base);

case 'trust_change_requested':
return normalizeTrustChangeRequested(event, base);

Expand Down Expand Up @@ -1224,6 +1227,24 @@ function normalizeSettingsChanged(
];
}

function normalizeSettingsReloaded(
event: DaemonEvent,
base: NormalizedEventBase,
): DaemonUiEvent[] {
if (!isRecord(event.data)) {
return fallbackDebug(event, base, 'malformed settings_reloaded payload');
}
return [
{
...base,
type: 'workspace.settings.changed',
key: 'settings_reloaded',
scope: 'workspace',
value: event.data,
},
];
}

function normalizeWorkspaceInitialized(
event: DaemonEvent,
base: NormalizedEventBase,
Expand Down
27 changes: 27 additions & 0 deletions packages/sdk-typescript/test/unit/daemonUi.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2255,6 +2255,33 @@ describe('daemon UI normalizer — Wave 3/4 event coverage (PR-A)', () => {
]);
});

it('normalizes settings_reloaded as a settings refresh signal', () => {
const events = normalizeDaemonEvent(
envelopeOf('settings_reloaded', {
env: { updatedKeys: ['OPENAI_API_KEY'], removedKeys: [] },
changedKeys: ['env', 'hooks'],
childReloaded: true,
sessionsRefreshed: ['session-1'],
sessionsSkipped: [],
}),
);

expect(events).toEqual([
expect.objectContaining({
type: 'workspace.settings.changed',
key: 'settings_reloaded',
scope: 'workspace',
value: expect.objectContaining({
childReloaded: true,
sessionsRefreshed: ['session-1'],
}) as unknown,
}),
]);
expect(events).not.toContainEqual(
expect.objectContaining({ type: 'debug' }),
);
});

it('normalizes workspace_initialized actions', () => {
const events = normalizeDaemonEvent(
envelopeOf('workspace_initialized', { path: '/w', action: 'created' }),
Expand Down
55 changes: 55 additions & 0 deletions packages/webui/src/daemon/session/DaemonSessionProvider.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2064,6 +2064,61 @@ describe('DaemonSessionProvider', () => {
});
});

it('logs settings reloads without inserting daemon debug blocks', async () => {
const debug = vi.spyOn(console, 'debug').mockImplementation(() => undefined);
const session = createMockSession({
events: async function* settingsReloadEvents() {
yield {
id: 31,
v: 1,
type: 'settings_reloaded',
data: {
env: { updatedKeys: ['OPENAI_API_KEY'], removedKeys: [] },
changedKeys: ['env', 'hooks'],
childReloaded: true,
sessionsRefreshed: ['session-1'],
sessionsSkipped: [],
},
};
},
});
sdkMocks.sessions.push(session);
let signals: DaemonWorkspaceEventSignals | undefined;
let blocks: readonly DaemonTranscriptBlock[] | undefined;

function Harness() {
signals = useDaemonWorkspaceEventSignals();
blocks = useDaemonTranscriptBlocks();
return null;
}

await renderWithProvider(<Harness />, { autoConnect: true });
await act(async () => {
await flushPromises();
});

expect(signals?.settingsVersion).toBe(1);
expect(blocks).not.toContainEqual(
expect.objectContaining({
kind: 'debug',
text: expect.stringContaining(
'settings_reloaded (unrecognized daemon event)',
) as string,
}),
);
expect(debug).toHaveBeenCalledWith(
'[DaemonSessionProvider] settings reloaded:',
expect.objectContaining({
childReloaded: true,
changedKeys: ['env', 'hooks'],
env: { updatedKeys: ['OPENAI_API_KEY'], removedKeys: [] },
sessionsRefreshed: ['session-1'],
sessionsSkipped: [],
}),
);
debug.mockRestore();
Comment on lines +2095 to +2119
});

it('treats prompt abort during cancel as cancellation and keeps busy until cancel completes', async () => {
const cancel = createDeferred<void>();
const assistantChunk = createDeferred<void>();
Expand Down
48 changes: 48 additions & 0 deletions packages/webui/src/daemon/session/DaemonSessionProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1608,6 +1608,7 @@ function normalizeAndFilterEvent(
setConnection: Dispatch<SetStateAction<DaemonConnectionState>>,
behavior: { updateConnection?: boolean } = {},
): DaemonUiEvent[] {
logSettingsReloadEvent(event);
if (behavior.updateConnection !== false) {
updateConnectionFromDaemonEvent(event, setConnection);
}
Expand All @@ -1623,6 +1624,53 @@ function normalizeAndFilterEvent(
return goalStatusEvent ? [...normalized, goalStatusEvent] : normalized;
}

function logSettingsReloadEvent(event: DaemonEvent): void {
if (event.type !== 'settings_reloaded') return;
console.debug(
'[DaemonSessionProvider] settings reloaded:',
getSettingsReloadLogData(event),
);
}

function getSettingsReloadLogData(event: DaemonEvent): Record<string, unknown> {
const log: Record<string, unknown> = {};
if (event.id !== undefined) log['eventId'] = event.id;
if (!isRecord(event.data)) {
log['payload'] = 'non-object';
return log;
}

const env = getSettingsReloadEnvLog(event.data['env']);
const changedKeys = getStringArray(event.data['changedKeys']);
const sessionsRefreshed = getStringArray(event.data['sessionsRefreshed']);
const sessionsSkipped = getStringArray(event.data['sessionsSkipped']);
const childReloaded = event.data['childReloaded'];
const childError = getString(event.data, 'childError');

if (env) log['env'] = env;
if (changedKeys) log['changedKeys'] = changedKeys;
if (typeof childReloaded === 'boolean') log['childReloaded'] = childReloaded;
if (sessionsRefreshed) log['sessionsRefreshed'] = sessionsRefreshed;
if (sessionsSkipped) log['sessionsSkipped'] = sessionsSkipped;
if (childError) log['childError'] = childError;
return log;
}

function getSettingsReloadEnvLog(
value: unknown,
): { updatedKeys: string[]; removedKeys: string[] } | undefined {
if (!isRecord(value)) return undefined;
return {
updatedKeys: getStringArray(value['updatedKeys']) ?? [],
removedKeys: getStringArray(value['removedKeys']) ?? [],
};
}

function getStringArray(value: unknown): string[] | undefined {
if (!Array.isArray(value)) return undefined;
return value.filter((item): item is string => typeof item === 'string');
}

function filterDaemonUiEventsForTranscript(
sourceEvent: DaemonEvent,
events: DaemonUiEvent[],
Expand Down
Loading