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
2 changes: 1 addition & 1 deletion examples/kitchen-sink/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function KitchenSinkApp() {
await session.sendAction("run", {
message: text,
mode,
});
}, { userMessage: text });
},
[flow.activeSessionId, mode, session]
);
Expand Down
61 changes: 58 additions & 3 deletions packages/react/src/hooks/useSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export type SessionView = {
sendAction: (
action: string,
input: unknown,
options?: { metadata?: Record<string, unknown> }
options?: { metadata?: Record<string, unknown>; userMessage?: string }
) => Promise<ExecuteActionResponse>;
refresh: () => Promise<void>;
};
Expand Down Expand Up @@ -449,8 +449,26 @@ export function useSession(
}
}, [sessionId, sessionClient, itemConfig.enabled, itemConfig.itemTypes, applySnapshot]);

// Debounced snapshot refresh: batches multiple rapid resource_change events
// (e.g., working memory + artifact writes in the same request) into a single
// refresh call. Fires 300ms after the last trigger.
const refreshTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const scheduleRefreshSnapshot = useCallback(() => {
if (refreshTimerRef.current !== null) {
clearTimeout(refreshTimerRef.current);
}
refreshTimerRef.current = setTimeout(() => {
refreshTimerRef.current = null;
void refreshSnapshot();
}, 300);
}, [refreshSnapshot]);

useEffect(() => {
if (sessionId === undefined) {
if (refreshTimerRef.current !== null) {
clearTimeout(refreshTimerRef.current);
refreshTimerRef.current = null;
}
itemsByIdRef.current = new Map();
sortedItemIdsRef.current = [];
deltaQueueRef.current.clear();
Expand Down Expand Up @@ -512,7 +530,7 @@ export function useSession(
async (
action: string,
input: unknown,
actionOptions?: { metadata?: Record<string, unknown> }
actionOptions?: { metadata?: Record<string, unknown>; userMessage?: string }
): Promise<ExecuteActionResponse> => {
if (sessionId === undefined) {
throw new Error("useSession.sendAction requires a sessionId");
Expand All @@ -527,6 +545,32 @@ export function useSession(

const requestId = `req_${Date.now()}_${Math.random().toString(16).slice(2)}`;

// Optimistic user message: inject immediately so the user sees their own
// message without waiting for the server round-trip. The server will emit
// the real user message item via SSE, which replaces this optimistic one.
if (actionOptions?.userMessage !== undefined && itemConfig.enabled) {
const optimisticId = `item_msg_optimistic_${requestId}`;
const optimisticItem: OutputItem = {
id: optimisticId,
type: "message",
role: "user",
status: "completed",
transient: false,
requestId,
itemIndex: -1,
provenance: { blockName: "runtime", blockInstanceId: "runtime", phase: "main" },
ts: Date.now(),
content: [{ type: "output_text", text: actionOptions.userMessage }]
} as OutputItem;

itemsByIdRef.current.set(optimisticId, optimisticItem);
const ordered = sortItemsChronologically([
...itemsByIdRef.current.values()
]);
sortedItemIdsRef.current = ordered.map((item) => item.id);
setItems(ordered);
}

try {
const postPromise = client.sendAction(action, input, {
sessionId,
Expand All @@ -549,6 +593,16 @@ export function useSession(
return;
}

// When the real server user message arrives, remove the optimistic
// placeholder so we don't show duplicates.
const serverItem = event.item as OutputItem & { role?: string };
if (serverItem.type === "message" && serverItem.role === "user") {
const optimisticId = `item_msg_optimistic_${requestId}`;
if (itemsByIdRef.current.has(optimisticId)) {
itemsByIdRef.current.delete(optimisticId);
}
}

const existing = itemsByIdRef.current.get(event.item.id);
const isNewItem = existing === undefined;
const orderChanged =
Expand All @@ -567,7 +621,7 @@ export function useSession(
}

if (event.item.type === "resource_change") {
void refreshSnapshot();
scheduleRefreshSnapshot();
}
},
onItemDone: (event) => {
Expand Down Expand Up @@ -672,6 +726,7 @@ export function useSession(
resolvedFlowKind,
baseUrl,
refreshSnapshot,
scheduleRefreshSnapshot,
scheduleContentFlush,
flushContentDeltas
]
Expand Down
55 changes: 34 additions & 21 deletions packages/server/src/context/createExecutionContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,17 @@ export async function createExecutionContext<
const sessionId = options.sessionId ?? `ephemeral_${Date.now()}_${Math.random().toString(16).slice(2)}`;
const requestId = options.requestId;

let userRecord = await stores.user.get(userId);
// Parallelize independent store lookups — user, session, project, and request
// records don't depend on each other for the initial load.
const optionsProjectId = options.projectId;
const [loadedUser, loadedSession, loadedProject, loadedRequest] = await Promise.all([
stores.user.get(userId),
stores.session.get(sessionId),
optionsProjectId !== undefined ? stores.project.get(optionsProjectId) : undefined,
stores.request.get(requestId)
]);

let userRecord = loadedUser;
if (userRecord === undefined) {
userRecord = {
id: userId,
Expand All @@ -1040,7 +1050,7 @@ export async function createExecutionContext<
await stores.user.set(userRecord.id, userRecord);
}

let sessionRecord = await stores.session.get(sessionId);
let sessionRecord = loadedSession;
if (sessionRecord === undefined) {
sessionRecord = {
id: sessionId,
Expand All @@ -1060,27 +1070,30 @@ export async function createExecutionContext<
ensureJournalDefaults(sessionRecord);
}

const projectId = options.projectId ?? sessionRecord?.projectId;
let projectRecord: ProjectRecord | undefined;
if (projectId !== undefined) {
projectRecord = await stores.project.get(projectId);
if (projectRecord === undefined) {
projectRecord = {
id: projectId,
projectId,
userId,
state: (options.projectState ?? {}) as TProjectState,
resources: normalizeScopeResources(projectResourceConfigs, undefined),
resourceContent: normalizeScopeResourceContent(projectResourceConfigs, undefined),
version: 0,
createdAt: now,
updatedAt: now
};
await stores.project.set(projectRecord.id, projectRecord);
}
// Resolve projectId: prefer options, fall back to session record.
// If session had a projectId we didn't know about at parallel-load time,
// we need a separate fetch.
const resolvedProjectId = optionsProjectId ?? sessionRecord?.projectId;
let projectRecord: ProjectRecord | undefined = loadedProject;
if (projectRecord === undefined && resolvedProjectId !== undefined && resolvedProjectId !== optionsProjectId) {
projectRecord = await stores.project.get(resolvedProjectId);
}
if (resolvedProjectId !== undefined && projectRecord === undefined) {
projectRecord = {
id: resolvedProjectId,
projectId: resolvedProjectId,
userId,
state: (options.projectState ?? {}) as TProjectState,
resources: normalizeScopeResources(projectResourceConfigs, undefined),
resourceContent: normalizeScopeResourceContent(projectResourceConfigs, undefined),
version: 0,
createdAt: now,
updatedAt: now
};
await stores.project.set(projectRecord.id, projectRecord);
}

let requestRecord = await stores.request.get(requestId);
let requestRecord = loadedRequest;
if (requestRecord === undefined) {
requestRecord = {
id: requestId,
Expand Down
59 changes: 38 additions & 21 deletions packages/server/src/execution/runAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,41 @@ export async function runActionInternal<
response.addEventObserver((event) => ttsHook!.onEvent(event));
}

// Emit initial status events early — before the potentially expensive
// createExecutionContext call. This ensures the SSE stream starts delivering
// events as fast as possible.
await response.emitRequestCreated();
await response.emitRequestStatus("in_progress");

// Parse input and emit user message early too. If parsing fails, we still
// need the execution context for proper error handling, so we defer the
// throw until after context creation.
let parsedInput: unknown;
let parseError: unknown;
try {
parsedInput = parseActionInput(action, options.input);

if (action.userMessage !== undefined) {
const text = action.userMessage(parsedInput);
const userItem: MessageItem = {
id: `item_msg_${Date.now()}_${Math.random().toString(16).slice(2)}`,
type: "message",
role: "user",
status: "completed",
transient: false,
requestId,
itemIndex: response.getItems().length,
provenance: RUNTIME_PROVENANCE,
ts: Date.now(),
content: [{ type: "output_text", text }]
};
await response.emitItemAdded(userItem);
await response.emitItemDone(userItem);
}
} catch (error) {
parseError = error;
}

const ctx = await createExecutionContext({
flow: options.flow,
actionName: options.actionName,
Expand All @@ -379,34 +414,16 @@ export async function runActionInternal<
});

await emitActionLifecycleSeam(internalSeams, "started", metadata);
await response.emitRequestCreated();
await response.emitRequestStatus("in_progress");

await runObserver(options.flow.request?.onStarted, {
requestId,
actionName: options.actionName
}, ctx, { internalSeams });

try {
const parsedInput = parseActionInput(action, options.input);

// Emit user message item when the action defines a userMessage extractor.
if (action.userMessage !== undefined) {
const text = action.userMessage(parsedInput);
const userItem: MessageItem = {
id: `item_msg_${Date.now()}_${Math.random().toString(16).slice(2)}`,
type: "message",
role: "user",
status: "completed",
transient: false,
requestId,
itemIndex: response.getItems().length,
provenance: RUNTIME_PROVENANCE,
ts: Date.now(),
content: [{ type: "output_text", text }]
};
await response.emitItemAdded(userItem);
await response.emitItemDone(userItem);
// Re-throw deferred parse error now that we have ctx for error handling.
if (parseError !== undefined) {
throw parseError;
}

// Compose middleware: global (from caller) → flow-level.
Expand Down
Loading