@flowdular/sandbox 0.2.6 → 0.2.8

package/src/server/session-lock.ts

@@ -0,0 +1,26 @@
+import { resolve } from 'node:path';
+
+/* Session metadata and operator-owned attachment snapshots share one queue.
+   Failed work releases the next caller and idle sessions retain no lock. */
+const pending = new Map<string, Promise<void>>();
+
+export async function withSessionLock<T>(
+	workspaceRoot: string,
+	sessionId: string,
+	work: () => Promise<T>,
+): Promise<T> {
+	const key = `${resolve(workspaceRoot)}\0${sessionId}`;
+	const previous = pending.get(key);
+	let release!: () => void;
+	const current = new Promise<void>((done) => {
+		release = done;
+	});
+	pending.set(key, current);
+	await previous;
+	try {
+		return await work();
+	} finally {
+		release();
+		if (pending.get(key) === current) pending.delete(key);
+	}
+}

package/src/server/sessions.ts

@@ -1,3 +1,4 @@
+import { withSessionLock } from './session-lock.ts';
 import { randomUUID } from 'node:crypto';
 import {
 	access,
@@ -588,16 +589,23 @@ export async function listSessions(
 	return sessions.sort((left, right) => right.updatedAt - left.updatedAt);
 }
 
+type SessionPatch = Partial<Omit<SandboxSession, 'id' | 'createdAt'>>;
+
 export async function updateSession(
 	workspaceRoot: string,
 	sessionId: string,
-	patch: Partial<Omit<SandboxSession, 'id' | 'createdAt'>>,
+	patch:
+		| SessionPatch
+		| ((current: SandboxSession) => SessionPatch | Promise<SessionPatch>),
 ): Promise<SandboxSession> {
-	const current = await readSession(workspaceRoot, sessionId);
-	return writeSession(workspaceRoot, {
-		...current,
-		...patch,
-		updatedAt: Date.now(),
+	return withSessionLock(workspaceRoot, sessionId, async () => {
+		const current = await readSession(workspaceRoot, sessionId);
+		const updates = typeof patch === 'function' ? await patch(current) : patch;
+		return writeSession(workspaceRoot, {
+			...current,
+			...updates,
+			updatedAt: Date.now(),
+		});
 	});
 }
 

package/src/server/turns.ts

@@ -1,3 +1,4 @@
+import { materializeSdkReference } from './sdk-reference.ts';
 import { spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import {
@@ -28,7 +29,10 @@ import {
 	moduleReviewRevision,
 	recordAutoReview,
 } from './auto-review.ts';
-import { attachmentInstruction } from './attachments.ts';
+import {
+	attachmentInstruction,
+	materializeAttachments,
+} from './attachments.ts';
 import { captureCheckpoint } from './checkpoints.ts';
 import { guardAgentPaths } from './path-guard.ts';
 import type { SandboxConfiguration } from './config.ts';
@@ -535,7 +539,7 @@ export async function* runTurn(
 	context: TurnContext,
 	input: TurnInput,
 ): AsyncGenerator<ChatEntry, TurnOutcome> {
-	const session = await readSession(context.workspaceRoot, input.sessionId);
+	let session = await readSession(context.workspaceRoot, input.sessionId);
 	const paths = sessionPaths(
 		context.workspaceRoot,
 		session.id,
@@ -576,6 +580,14 @@ export async function* runTurn(
 	const driverId = input.driver ?? session.driver;
 	const driver = await context.registry.resolve(driverId);
 
+	session = {
+		...session,
+		attachments: await materializeAttachments(context.workspaceRoot, session),
+	};
+	const hasSdk = await materializeSdkReference(
+		context.workspaceRoot,
+		paths.workspace,
+	);
 	const attachmentNote = attachmentInstruction(session.attachments);
 
 	yield await appendChatEntry(context.workspaceRoot, session, {
@@ -671,6 +683,11 @@ export async function* runTurn(
 							)}. This turn is yours in modules/${active.directory} only; another specialist takes the turn for the others. Each module is a project of this pnpm workspace, so a draft that imports another draft resolves the session copy.`,
 					]
 				: []),
+			...(hasSdk
+				? [
+						'Read the actual installed SDK under reference/sdk/packages and reference/sdk/modules. Its package.json maps public exports. These are readable copies inside the workspace; do not follow external SDK symlinks. Search only the API needed for the current task.',
+					]
+				: []),
 			'reference/ is read-only. Consult only the code and references needed for this task; do not preload its catalog.',
 			'Other module.json files under modules/ describe the dependency graph. Only the draft module directories have sources you may change.',
 			...(active.kind === 'edit'
@@ -685,6 +702,7 @@ export async function* runTurn(
 		driverId === 'claude-code' ? 'CLAUDE.md' : 'AGENTS.md',
 		role.name,
 		skill,
+		hasSdk,
 	);
 
 	const history = historyFrom(await readChat(context.workspaceRoot, session));

package/src/styles.css

@@ -683,13 +683,16 @@
 	color: var(--danger);
 }
 
-.chat__auto {
+.chat-settings {
 	display: inline-flex;
-	align-items: center;
-	gap: 6px;
-	font-size: var(--text-sm);
-	color: var(--ink-3);
-	white-space: nowrap;
+}
+
+.chat-settings__panel {
+	position: fixed;
+	z-index: 20;
+	width: min(320px, calc(100vw - 32px));
+	max-height: calc(100dvh - 32px);
+	overflow-y: auto;
 }
 
 .chat__selection {
@@ -1571,3 +1574,102 @@
 	font-size: var(--text-md);
 	color: var(--ink-3);
 }
+
+@keyframes chat-activity-spin {
+	to {
+		transform: rotate(360deg);
+	}
+}
+.chat__event--active > svg {
+	animation: chat-activity-spin 1.5s linear infinite;
+}
+@media (prefers-reduced-motion: reduce) {
+	.chat__event--active > svg {
+		animation: none;
+	}
+}
+
+/* Compact operation summaries with the original details available on demand. */
+.chat-tool {
+	min-width: 0;
+	color: var(--ink-2);
+	font-size: var(--text-sm);
+}
+.chat-tool__summary {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	min-width: 0;
+	padding: 6px 0;
+	cursor: pointer;
+	list-style: none;
+}
+.chat-tool__summary::-webkit-details-marker {
+	display: none;
+}
+.chat-tool__summary:focus-visible {
+	outline: 2px solid var(--focus);
+	outline-offset: 2px;
+}
+.chat-tool__summary > svg {
+	flex-shrink: 0;
+}
+.chat-tool__action {
+	flex-shrink: 0;
+}
+.chat-tool__target {
+	min-width: 0;
+	flex: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-family: var(--font-mono);
+}
+.chat-tool__status,
+.chat-tool__duration {
+	color: var(--ink-3);
+	flex-shrink: 0;
+	font-variant-numeric: tabular-nums;
+}
+.chat-tool--failed .chat-tool__status,
+.chat-tool--failed .chat-tool__summary > svg:first-child {
+	color: var(--danger);
+}
+.chat-tool[open] .chat-tool__summary > svg:last-child {
+	transform: rotate(180deg);
+}
+.chat-tool__details {
+	margin: 0 0 8px 22px;
+	padding: 12px;
+	border: 1px solid var(--line);
+	border-radius: var(--r-sm);
+}
+.chat-tool__details dt {
+	color: var(--ink-3);
+	margin-bottom: 4px;
+}
+.chat-tool__details dd {
+	margin: 0 0 8px;
+	white-space: pre-wrap;
+	overflow-wrap: anywhere;
+	font-family: var(--font-mono);
+}
+.chat-tool__details dd:last-child {
+	margin-bottom: 0;
+}
+.chat-tool--running .chat-tool__summary > svg:first-child {
+	animation: chat-activity-spin 1.5s linear infinite;
+}
+@media (prefers-reduced-motion: reduce) {
+	.chat-tool--running .chat-tool__summary > svg:first-child {
+		animation: none;
+	}
+}
+@media (max-width: 600px) {
+	.chat-tool__summary {
+		flex-wrap: wrap;
+	}
+	.chat-tool__target {
+		flex-basis: calc(100% - 32px);
+	}
+}

package/vite.config.ts

@@ -9,6 +9,7 @@ import { defineConfig } from 'vite';
 import { sandboxDirectory } from './src/server/config.ts';
 import { findFlowdularWorkspace } from './src/server/workspace-root.ts';
 import { resolvePreviewModules } from './src/server/preview-modules.ts';
+import { isolatePreviewHotUpdates } from './src/server/preview-hot-updates.ts';
 import type { SandboxSession } from './src/server/sessions.ts';
 
 Object.assign(process.env, flowdularEnvironment(process.env));
@@ -103,7 +104,10 @@ function previewModules(workspaceRoot: string): Plugin {
 
 const config = {
 	root: appRoot,
-	plugins: [previewModules(workspace.root), octane()],
+	plugins: [
+		previewModules(workspace.root),
+		...isolatePreviewHotUpdates(octane(), workspace.root),
+	],
 	resolve: {
 		/* Draft module code is loaded from a session workspace outside this app.
 		   It resolves the workspace packages through the node_modules link the