@bolt-foundry/gambit 0.8.5 → 0.8.6-rc.1

package/esm/src/server_session_store.js

@@ -115,12 +115,46 @@ const safeStringify = (value, space) => {
     }, space);
 };
 export const createSessionStore = (deps) => {
-    const { sessionsRoot, ensureDir, randomId, logger, enrichStateWithSession, workspaceStateSchemaVersion, workspaceSchemaError, } = deps;
+    const { sessionsRoot, randomId, logger, enrichStateWithSession, workspaceStateSchemaVersion, workspaceSchemaError, } = deps;
     const sessionStateCache = new Map();
     const sessionWriteQueues = new Map();
     const sessionWriteActive = new Set();
     const sessionOffsetById = new Map();
     const buildProjectionCache = new Map();
+    const buildProjectionRefreshInFlight = new Map();
+    const drainSessionWriteQueue = async (sessionId) => {
+        let shouldContinueDrain = false;
+        try {
+            const queue = sessionWriteQueues.get(sessionId);
+            if (!queue)
+                return;
+            while (queue.length) {
+                const next = queue.shift();
+                if (!next)
+                    continue;
+                try {
+                    await next();
+                }
+                catch (err) {
+                    logger.warn(`[sim] session write failed: ${err instanceof Error ? err.message : err}`);
+                }
+            }
+        }
+        finally {
+            sessionWriteActive.delete(sessionId);
+            const queue = sessionWriteQueues.get(sessionId);
+            if (queue && queue.length > 0) {
+                sessionWriteActive.add(sessionId);
+                shouldContinueDrain = true;
+            }
+            else {
+                sessionWriteQueues.delete(sessionId);
+            }
+        }
+        if (shouldContinueDrain) {
+            void drainSessionWriteQueue(sessionId);
+        }
+    };
     const enqueueSessionWrite = (sessionId, task) => {
         const queue = sessionWriteQueues.get(sessionId) ?? [];
         queue.push(task);
@@ -128,18 +162,7 @@ export const createSessionStore = (deps) => {
         if (sessionWriteActive.has(sessionId))
             return;
         sessionWriteActive.add(sessionId);
-        while (queue.length) {
-            const next = queue.shift();
-            if (!next)
-                continue;
-            try {
-                next();
-            }
-            catch (err) {
-                logger.warn(`[sim] session write failed: ${err instanceof Error ? err.message : err}`);
-            }
-        }
-        sessionWriteActive.delete(sessionId);
+        void drainSessionWriteQueue(sessionId);
     };
     const mergeSessionState = (current, next) => {
         if (!current)
@@ -224,72 +247,82 @@ export const createSessionStore = (deps) => {
             },
         };
     };
+    const parseEnvelopeRecords = (text) => {
+        const records = [];
+        let maxOffset = -1;
+        for (const line of text.split("\n")) {
+            if (!line.trim())
+                continue;
+            const parsed = JSON.parse(line);
+            const offset = parseFiniteInteger(parsed.offset) ??
+                parseFiniteInteger(parsed._gambit?.offset);
+            if (offset === undefined)
+                continue;
+            const envelopeType = typeof parsed.type === "string" ? parsed.type : "";
+            const nestedData = parsed.data;
+            const payload = isWorkspaceEventDomain(envelopeType) &&
+                nestedData && typeof nestedData === "object" &&
+                !Array.isArray(nestedData)
+                ? nestedData
+                : parsed;
+            const payloadType = typeof payload.type === "string" ? payload.type : "";
+            if (!payloadType)
+                continue;
+            const meta = parsed._gambit &&
+                typeof parsed._gambit === "object" &&
+                !Array.isArray(parsed._gambit)
+                ? parsed._gambit
+                : null;
+            const domain = (() => {
+                const explicit = meta?.domain;
+                if (explicit === "build" || explicit === "test" ||
+                    explicit === "grade" || explicit === "session") {
+                    return explicit;
+                }
+                if (isWorkspaceEventDomain(envelopeType)) {
+                    return envelopeType;
+                }
+                return inferWorkspaceDomain(payloadType);
+            })();
+            if (!domain)
+                continue;
+            const createdAt = typeof parsed.createdAt === "string"
+                ? parsed.createdAt
+                : typeof parsed.created_at === "string"
+                    ? parsed.created_at
+                    : typeof payload.createdAt === "string"
+                        ? payload.createdAt
+                        : typeof payload.created_at === "string"
+                            ? payload.created_at
+                            : typeof meta?.created_at === "string"
+                                ? meta.created_at
+                                : new Date(0).toISOString();
+            const envelope = {
+                offset,
+                type: domain,
+                createdAt,
+                data: payload,
+            };
+            records.push(envelope);
+            if (offset > maxOffset) {
+                maxOffset = offset;
+            }
+        }
+        return { records, maxOffset };
+    };
     const readEnvelopeRecords = (eventsPath) => {
         try {
             const text = dntShim.Deno.readTextFileSync(eventsPath);
-            const records = [];
-            let maxOffset = -1;
-            for (const line of text.split("\n")) {
-                if (!line.trim())
-                    continue;
-                const parsed = JSON.parse(line);
-                const offset = parseFiniteInteger(parsed.offset) ??
-                    parseFiniteInteger(parsed._gambit?.offset);
-                if (offset === undefined)
-                    continue;
-                const envelopeType = typeof parsed.type === "string" ? parsed.type : "";
-                const nestedData = parsed.data;
-                const payload = isWorkspaceEventDomain(envelopeType) &&
-                    nestedData && typeof nestedData === "object" &&
-                    !Array.isArray(nestedData)
-                    ? nestedData
-                    : parsed;
-                const payloadType = typeof payload.type === "string"
-                    ? payload.type
-                    : "";
-                if (!payloadType)
-                    continue;
-                const meta = parsed._gambit &&
-                    typeof parsed._gambit === "object" &&
-                    !Array.isArray(parsed._gambit)
-                    ? parsed._gambit
-                    : null;
-                const domain = (() => {
-                    const explicit = meta?.domain;
-                    if (explicit === "build" || explicit === "test" ||
-                        explicit === "grade" || explicit === "session") {
-                        return explicit;
-                    }
-                    if (isWorkspaceEventDomain(envelopeType)) {
-                        return envelopeType;
-                    }
-                    return inferWorkspaceDomain(payloadType);
-                })();
-                if (!domain)
-                    continue;
-                const createdAt = typeof parsed.createdAt === "string"
-                    ? parsed.createdAt
-                    : typeof parsed.created_at === "string"
-                        ? parsed.created_at
-                        : typeof payload.createdAt === "string"
-                            ? payload.createdAt
-                            : typeof payload.created_at === "string"
-                                ? payload.created_at
-                                : typeof meta?.created_at === "string"
-                                    ? meta.created_at
-                                    : new Date(0).toISOString();
-                const envelope = {
-                    offset,
-                    type: domain,
-                    createdAt,
-                    data: payload,
-                };
-                records.push(envelope);
-                if (offset > maxOffset) {
-                    maxOffset = offset;
-                }
-            }
-            return { records, maxOffset };
+            return parseEnvelopeRecords(text);
+        }
+        catch {
+            return { records: [], maxOffset: -1 };
+        }
+    };
+    const readEnvelopeRecordsAsync = async (eventsPath) => {
+        try {
+            const text = await dntShim.Deno.readTextFile(eventsPath);
+            return parseEnvelopeRecords(text);
         }
         catch {
             return { records: [], maxOffset: -1 };
@@ -447,18 +480,26 @@ export const createSessionStore = (deps) => {
         delete snapshot.traces;
         return snapshot;
     };
-    const writeJsonAtomic = (filePath, payload) => {
+    const ensureDirAsync = async (dir) => {
+        try {
+            await dntShim.Deno.mkdir(dir, { recursive: true });
+        }
+        catch {
+            // ignore
+        }
+    };
+    const writeJsonAtomic = async (filePath, payload) => {
         const dir = path.dirname(filePath);
-        ensureDir(dir);
+        await ensureDirAsync(dir);
         const tmpPath = path.join(dir, `.tmp-${path.basename(filePath)}-${randomId("tmp")}`);
-        dntShim.Deno.writeTextFileSync(tmpPath, safeStringify(payload, 2));
-        dntShim.Deno.renameSync(tmpPath, filePath);
+        await dntShim.Deno.writeTextFile(tmpPath, safeStringify(payload, 2));
+        await dntShim.Deno.rename(tmpPath, filePath);
     };
-    const appendJsonl = (filePath, payload) => {
+    const appendJsonl = async (filePath, payload) => {
         const dir = path.dirname(filePath);
-        ensureDir(dir);
+        await ensureDirAsync(dir);
         const line = safeStringify(payload);
-        dntShim.Deno.writeTextFileSync(filePath, `${line}\n`, { append: true });
+        await dntShim.Deno.writeTextFile(filePath, `${line}\n`, { append: true });
     };
     const readBuildProjection = (workspaceId) => {
         const cached = buildProjectionCache.get(workspaceId);
@@ -520,7 +561,17 @@ export const createSessionStore = (deps) => {
             if (payloadType === "buildBotStatus" ||
                 payloadType === "gambit.build.status") {
                 const run = normalizeBuildProjectionRun(workspaceId, envelope.data.run);
+                const existingTraces = Array.isArray(state.run.traces)
+                    ? state.run.traces
+                    : [];
+                const nextTraces = Array.isArray(run.traces) ? run.traces : [];
                 state.run = run;
+                if (nextTraces.length === 0 && existingTraces.length > 0) {
+                    state.run = {
+                        ...state.run,
+                        traces: existingTraces,
+                    };
+                }
                 const buildStateSnapshot = envelope.data.state;
                 if (buildStateSnapshot && typeof buildStateSnapshot === "object") {
                     state.state = buildStateSnapshot;
@@ -542,21 +593,21 @@ export const createSessionStore = (deps) => {
         }
         return state;
     };
-    const rebuildBuildProjectionFromEvents = (workspaceId, eventsPath) => {
-        const { records } = readEnvelopeRecords(eventsPath);
+    const rebuildBuildProjectionFromEvents = async (workspaceId, eventsPath) => {
+        const { records } = await readEnvelopeRecordsAsync(eventsPath);
         if (records.length > 0) {
             ensureMonotonicOffsets(records, eventsPath);
         }
         const projection = replayBuildProjection(workspaceId, records);
         const buildPath = path.join(sessionsRoot, workspaceId, "build_state.json");
-        writeJsonAtomic(buildPath, projection);
+        await writeJsonAtomic(buildPath, projection);
         buildProjectionCache.set(workspaceId, projection);
     };
-    const updateSnapshotBoundary = (sessionId, statePath, offset) => {
-        if (!statePath || !existsSync(statePath))
+    const updateSnapshotBoundary = async (sessionId, statePath, offset) => {
+        if (!statePath)
             return;
         try {
-            const text = dntShim.Deno.readTextFileSync(statePath);
+            const text = await dntShim.Deno.readTextFile(statePath);
             const parsed = JSON.parse(text);
             const parsedMeta = parsed.meta && typeof parsed.meta === "object"
                 ? parsed.meta
@@ -571,7 +622,7 @@ export const createSessionStore = (deps) => {
             parsedMeta.sessionUpdatedAt = new Date().toISOString();
             upsertScenarioRunSummary(parsedMeta);
             const nextState = { ...parsed, meta: parsedMeta };
-            writeJsonAtomic(statePath, nextState);
+            await writeJsonAtomic(statePath, nextState);
             sessionStateCache.set(sessionId, nextState);
         }
         catch {
@@ -620,9 +671,9 @@ export const createSessionStore = (deps) => {
             type: eventType,
             data: normalizedData,
         };
-        enqueueSessionWrite(sessionId, () => {
+        enqueueSessionWrite(sessionId, async () => {
             const offset = nextSessionOffsetCandidate(sessionId, state);
-            appendJsonl(eventsPath, toCanonicalEventRecord({
+            await appendJsonl(eventsPath, toCanonicalEventRecord({
                 eventType,
                 offset,
                 createdAt,
@@ -633,9 +684,9 @@ export const createSessionStore = (deps) => {
                 state.meta.lastAppliedOffset = offset;
                 state.meta.lastAppliedEventSeq = offset;
             }
-            updateSnapshotBoundary(sessionId, statePath, offset);
+            await updateSnapshotBoundary(sessionId, statePath, offset);
             if (eventType === "build") {
-                rebuildBuildProjectionFromEvents(sessionId, eventsPath);
+                await rebuildBuildProjectionFromEvents(sessionId, eventsPath);
             }
         });
         return envelope;
@@ -708,13 +759,24 @@ export const createSessionStore = (deps) => {
             const statePath = typeof snapshot.meta?.sessionStatePath === "string"
                 ? snapshot.meta.sessionStatePath
                 : path.join(dir, "state.json");
-            enqueueSessionWrite(sessionId, () => {
+            enqueueSessionWrite(sessionId, async () => {
                 try {
-                    ensureDir(dir);
-                    const firstWrite = !existsSync(eventsPath);
+                    await ensureDirAsync(dir);
+                    let firstWrite = false;
+                    try {
+                        await dntShim.Deno.stat(eventsPath);
+                    }
+                    catch (err) {
+                        if (err instanceof dntShim.Deno.errors.NotFound) {
+                            firstWrite = true;
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
                     if (firstWrite) {
                         const startOffset = nextSessionOffsetCandidate(sessionId, snapshot);
-                        appendJsonl(eventsPath, toCanonicalEventRecord({
+                        await appendJsonl(eventsPath, toCanonicalEventRecord({
                             eventType: "session",
                             offset: startOffset,
                             createdAt: new Date().toISOString(),
@@ -741,7 +803,7 @@ export const createSessionStore = (deps) => {
                             lastAppliedEventSeq: snapshotOffset,
                         },
                     };
-                    appendJsonl(eventsPath, toCanonicalEventRecord({
+                    await appendJsonl(eventsPath, toCanonicalEventRecord({
                         eventType: "session",
                         offset: snapshotOffset,
                         createdAt: new Date().toISOString(),
@@ -756,8 +818,8 @@ export const createSessionStore = (deps) => {
                     // Advance in-memory offset immediately after append so a later
                     // snapshot write failure cannot cause duplicate offsets on retry.
                     sessionOffsetById.set(sessionId, snapshotOffset);
-                    writeJsonAtomic(statePath, snapshotToWrite);
-                    rebuildBuildProjectionFromEvents(sessionId, eventsPath);
+                    await writeJsonAtomic(statePath, snapshotToWrite);
+                    await rebuildBuildProjectionFromEvents(sessionId, eventsPath);
                 }
                 catch (err) {
                     logger.warn(`[sim] failed to persist session state: ${err instanceof Error ? err.message : err}`);
@@ -767,6 +829,20 @@ export const createSessionStore = (deps) => {
         return merged;
     };
     const readSessionStateStrict = (sessionId, opts) => {
+        const cached = sessionStateCache.get(sessionId);
+        if (cached) {
+            if (!opts?.withTraces)
+                return cached;
+            const cachedTraces = Array.isArray(cached.traces) ? cached.traces : [];
+            if (cachedTraces.length > 0)
+                return cached;
+            const loadedTraces = loadSessionTraces(cached);
+            if (loadedTraces.length === 0)
+                return cached;
+            const withTraces = { ...cached, traces: loadedTraces };
+            sessionStateCache.set(sessionId, withTraces);
+            return withTraces;
+        }
         const dir = path.join(sessionsRoot, sessionId);
         const filePath = path.join(dir, "state.json");
         const text = dntShim.Deno.readTextFileSync(filePath);
@@ -853,10 +929,27 @@ export const createSessionStore = (deps) => {
         const eventsPath = typeof state.meta?.sessionEventsPath === "string"
             ? state.meta.sessionEventsPath
             : path.join(sessionsRoot, workspaceId, "events.jsonl");
+        const projection = readBuildProjection(workspaceId);
         if (existsSync(eventsPath)) {
-            rebuildBuildProjectionFromEvents(workspaceId, eventsPath);
+            const targetOffset = parseFiniteInteger(state.meta
+                ?.lastAppliedOffset) ??
+                parseFiniteInteger(state.meta
+                    ?.lastAppliedEventSeq) ??
+                -1;
+            if (projection.lastAppliedOffset < targetOffset) {
+                if (!buildProjectionRefreshInFlight.has(workspaceId)) {
+                    const task = rebuildBuildProjectionFromEvents(workspaceId, eventsPath)
+                        .catch((err) => {
+                        logger.warn(`[sim] failed to refresh build projection for ${workspaceId}: ${err instanceof Error ? err.message : err}`);
+                    })
+                        .finally(() => {
+                        buildProjectionRefreshInFlight.delete(workspaceId);
+                    });
+                    buildProjectionRefreshInFlight.set(workspaceId, task);
+                }
+            }
         }
-        return readBuildProjection(workspaceId);
+        return projection;
     };
     return {
         parseFiniteInteger,

package/esm/src/server_types.d.ts

@@ -37,6 +37,7 @@ export type SchemaDescription = {
 export type GradingRunRecord = {
     id: string;
     workspaceId?: string;
+    scenarioRunId?: string;
     gradingRunId?: string;
     graderId: string;
     graderPath: string;

package/esm/src/server_types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server_types.d.ts","sourceRoot":"","sources":["../../src/src/server_types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server_types.d.ts","sourceRoot":"","sources":["../../src/src/server_types.ts"],"names":[],"mappings":"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"}

package/esm/src/server_ui_routes.d.ts

@@ -1,6 +1,5 @@
 type HandleUiRoutesDeps = {
     url: URL;
-    req: Request;
     workspaceRouteBase: string;
     activeWorkspaceId: string | null;
     activeWorkspaceOnboarding: boolean;
@@ -14,19 +13,12 @@ type HandleUiRoutesDeps = {
     simulatorReactHtml: (deckPath: string, deckLabel?: string, opts?: {
         workspaceId?: string | null;
         onboarding?: boolean;
-    }) => string;
+        currentPath?: string;
+    }) => Promise<string>;
     toDeckLabel: (deckPath: string) => string;
     readReactBundle: () => Promise<Uint8Array | null>;
     shouldAdvertiseSourceMap: () => boolean;
     readReactBundleSourceMap: () => Promise<Uint8Array | null>;
-    listSessions: () => unknown;
-    createWorkspaceSession: () => Promise<{
-        id: string;
-        rootDeckPath: string;
-        rootDir: string;
-        createdAt: string;
-    }>;
-    workspaceStateSchemaVersion: string;
 };
 export declare const handleUiRoutes: (deps: HandleUiRoutesDeps) => Promise<Response | null>;
 export {};

package/esm/src/server_ui_routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server_ui_routes.d.ts","sourceRoot":"","sources":["../../src/src/server_ui_routes.ts"],"names":[],"mappings":"AAMA,KAAK,kBAAkB,GAAG;IACxB,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,OAAO,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,yBAAyB,EAAE,OAAO,CAAC;IACnC,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uBAAuB,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,GAAG,SAAS,CAAC;IAC1D,qBAAqB,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,mBAAmB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,kBAAkB,EAAE,CAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,KACzD,MAAM,CAAC;IACZ,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C,eAAe,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAClD,wBAAwB,EAAE,MAAM,OAAO,CAAC;IACxC,wBAAwB,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAC3D,YAAY,EAAE,MAAM,OAAO,CAAC;IAC5B,sBAAsB,EAAE,MAAM,OAAO,CAAC;QACpC,EAAE,EAAE,MAAM,CAAC;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC,CAAC;IACH,2BAA2B,EAAE,MAAM,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,MAAM,kBAAkB,KACvB,OAAO,CAAC,QAAQ,GAAG,IAAI,CA2MzB,CAAC"}
+{"version":3,"file":"server_ui_routes.d.ts","sourceRoot":"","sources":["../../src/src/server_ui_routes.ts"],"names":[],"mappings":"AAAA,KAAK,kBAAkB,GAAG;IACxB,GAAG,EAAE,GAAG,CAAC;IACT,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,yBAAyB,EAAE,OAAO,CAAC;IACnC,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uBAAuB,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,GAAG,SAAS,CAAC;IAC1D,qBAAqB,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,mBAAmB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,kBAAkB,EAAE,CAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,KACE,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C,eAAe,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAClD,wBAAwB,EAAE,MAAM,OAAO,CAAC;IACxC,wBAAwB,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;CAC5D,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,MAAM,kBAAkB,KACvB,OAAO,CAAC,QAAQ,GAAG,IAAI,CA8IzB,CAAC"}

package/esm/src/server_ui_routes.js

@@ -1,8 +1,8 @@
-import * as dntShim from "../_dnt.shims.js";
-import { WORKSPACE_API_BASE, WORKSPACES_API_BASE, } from "./workspace_contract.js";
 export const handleUiRoutes = async (deps) => {
-    const { url, req, workspaceRouteBase, activeWorkspaceId, activeWorkspaceOnboarding, resolvedDeckPath, deckLabel, getWorkspaceIdFromQuery, activateWorkspaceDeck, schemaPromise, deckLoadPromise, canServeReactBundle, simulatorReactHtml, toDeckLabel, readReactBundle, shouldAdvertiseSourceMap, readReactBundleSourceMap, listSessions, createWorkspaceSession, workspaceStateSchemaVersion, } = deps;
+    const { url, workspaceRouteBase, activeWorkspaceId, activeWorkspaceOnboarding, resolvedDeckPath, deckLabel, getWorkspaceIdFromQuery, activateWorkspaceDeck, schemaPromise, deckLoadPromise, canServeReactBundle, simulatorReactHtml, toDeckLabel, readReactBundle, shouldAdvertiseSourceMap, readReactBundleSourceMap, } = deps;
     if (url.pathname === "/" ||
+        url.pathname === "/isograph" ||
+        url.pathname.startsWith("/isograph/") ||
         url.pathname === workspaceRouteBase ||
         url.pathname.startsWith(`${workspaceRouteBase}/`) ||
         url.pathname.startsWith("/simulate") ||
@@ -19,9 +19,10 @@ export const handleUiRoutes = async (deps) => {
         }
         await deckLoadPromise.catch(() => null);
         const resolvedLabel = deckLabel ?? toDeckLabel(resolvedDeckPath);
-        return new Response(simulatorReactHtml(resolvedDeckPath, resolvedLabel, {
+        return new Response(await simulatorReactHtml(resolvedDeckPath, resolvedLabel, {
             workspaceId: activeWorkspaceId ?? null,
             onboarding: activeWorkspaceOnboarding,
+            currentPath: url.pathname,
         }), {
             headers: { "content-type": "text/html; charset=utf-8" },
         });
@@ -52,28 +53,6 @@ export const handleUiRoutes = async (deps) => {
             headers: { "content-type": "application/json; charset=utf-8" },
         });
     }
-    if (url.pathname === "/api/deck-source") {
-        if (req.method !== "GET") {
-            return new Response("Method not allowed", { status: 405 });
-        }
-        try {
-            const content = await dntShim.Deno.readTextFile(resolvedDeckPath);
-            return new Response(JSON.stringify({
-                path: resolvedDeckPath,
-                content,
-            }), { headers: { "content-type": "application/json; charset=utf-8" } });
-        }
-        catch (err) {
-            const message = err instanceof Error ? err.message : String(err);
-            return new Response(JSON.stringify({
-                path: resolvedDeckPath,
-                error: message,
-            }), {
-                status: 500,
-                headers: { "content-type": "application/json; charset=utf-8" },
-            });
-        }
-    }
     if (url.pathname === "/ui/bundle.js") {
         const data = await readReactBundle();
         if (!data) {
@@ -86,6 +65,7 @@ export const handleUiRoutes = async (deps) => {
             if (shouldAdvertiseSourceMap()) {
                 headers.set("SourceMap", "/ui/bundle.js.map");
             }
+            // this predates the lint rule
             return new Response(data, { headers });
         }
         catch (err) {
@@ -98,6 +78,7 @@ export const handleUiRoutes = async (deps) => {
             return new Response("Source map missing. Run `deno task bundle:sim:sourcemap` (or start with `--bundle --sourcemap`).", { status: 404 });
         }
         try {
+            // this predates the lint rule
             return new Response(data, {
                 headers: {
                     "content-type": "application/json; charset=utf-8",
@@ -108,32 +89,5 @@ export const handleUiRoutes = async (deps) => {
             return new Response(`Failed to read source map: ${err instanceof Error ? err.message : String(err)}`, { status: 500 });
         }
     }
-    if (url.pathname === WORKSPACES_API_BASE) {
-        const workspaces = listSessions();
-        return new Response(JSON.stringify({ workspaces }), {
-            headers: { "content-type": "application/json; charset=utf-8" },
-        });
-    }
-    if (url.pathname === `${WORKSPACE_API_BASE}/new`) {
-        if (req.method !== "POST") {
-            return new Response("Method not allowed", { status: 405 });
-        }
-        try {
-            const workspace = await createWorkspaceSession();
-            await activateWorkspaceDeck(workspace.id);
-            return new Response(JSON.stringify({
-                workspaceId: workspace.id,
-                deckPath: workspace.rootDeckPath,
-                workspaceDir: workspace.rootDir,
-                createdAt: workspace.createdAt,
-                workspaceSchemaVersion: workspaceStateSchemaVersion,
-            }), { headers: { "content-type": "application/json" } });
-        }
-        catch (err) {
-            return new Response(JSON.stringify({
-                error: err instanceof Error ? err.message : String(err),
-            }), { status: 500, headers: { "content-type": "application/json" } });
-        }
-    }
     return null;
 };