Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: keep universe drafts bound to their loaded record

Adam Eivy1dc965888cb5
diff --git a/client/src/components/universeBuilder/UniverseBuilderPage.jsx b/client/src/components/universeBuilder/UniverseBuilderPage.jsx
index 3960c46732..efc0c12315 100644
--- a/client/src/components/universeBuilder/UniverseBuilderPage.jsx
+++ b/client/src/components/universeBuilder/UniverseBuilderPage.jsx
@@ -141,6 +141,9 @@ export default function UniverseBuilder() {
handleCreateNamed,
handleDelete,
handleSave,
+ draftReady,
+ draftReadError,
+ retryDraft,
imageCfg,
imageModels,
loading,
@@ -453,6 +456,22 @@ export default function UniverseBuilder() {
if (status === 'failed') toast.error('Render failed');
}, []);
+ // A URL change revokes the outgoing draft before the selection effect runs.
+ // Keep all editing/render actions unavailable until this record has loaded.
+ if (!draftReady) {
+ return (
+ <section className="p-4 space-y-3">
+ <Link to="/universes" className="text-port-accent">All Universes</Link>
+ {draftReadError ? (
+ <div role="alert">
+ <p>{draftReadError}</p>
+ <button onClick={retryDraft} className="text-port-accent">Retry loading universe</button>
+ </div>
+ ) : <p role="status">Loading universe…</p>}
+ </section>
+ );
+ }
+
return (
<div className="flex flex-col h-full">
<section className="flex-1 flex flex-col gap-3 p-4 min-h-0 overflow-y-auto">
diff --git a/client/src/components/universeBuilder/UniverseBuilderPage.test.jsx b/client/src/components/universeBuilder/UniverseBuilderPage.test.jsx
index 6cac02e233..b5e9332f44 100644
--- a/client/src/components/universeBuilder/UniverseBuilderPage.test.jsx
+++ b/client/src/components/universeBuilder/UniverseBuilderPage.test.jsx
@@ -93,6 +93,9 @@ beforeEach(() => {
availableLoras: [],
clearPendingCanonAdditions: fn(),
draft,
+ draftReady: true,
+ draftReadError: null,
+ retryDraft: fn(),
draftRef: { current: draft },
effectiveDefaultMode: null,
flushDraftIfDirty: vi.fn().mockResolvedValue(true),
@@ -159,6 +162,28 @@ beforeEach(() => {
});
});
+describe('UniverseBuilderPage draft admission', () => {
+ it('hides draft actions while loading and exposes an inline retry on failure', () => {
+ const draft = hookMocks.useUniverseDraft({ selectedId: 'u1' });
+ const retryDraft = vi.fn();
+ hookMocks.useUniverseDraft.mockReturnValue({ ...draft, draftReady: false, draftReadError: null, retryDraft });
+ const view = () => <MemoryRouter initialEntries={['/universes/u1']}>
+ <Routes><Route path="/universes/:universeId" element={<UniverseBuilderPage />} /></Routes>
+ </MemoryRouter>;
+ const { rerender } = render(view());
+ expect(screen.getByRole('status')).toHaveTextContent('Loading universe');
+ expect(screen.queryByRole('button', { name: /^Save$/ })).not.toBeInTheDocument();
+ hookMocks.useUniverseDraft.mockReturnValue({ ...draft, draftReady: false, draftReadError: 'World unavailable', retryDraft });
+ rerender(view());
+ expect(screen.getByRole('alert')).toHaveTextContent('World unavailable');
+ fireEvent.click(screen.getByRole('button', { name: 'Retry loading universe' }));
+ expect(retryDraft).toHaveBeenCalledTimes(1);
+ hookMocks.useUniverseDraft.mockReturnValue({ ...draft, draftReady: true });
+ rerender(view());
+ expect(screen.getByRole('button', { name: /^Save$/ })).toBeEnabled();
+ });
+});
+
describe('UniverseBuilderPage Markdown export', () => {
it('does not download a response after navigating to another universe', async () => {
let resolveExport;
diff --git a/client/src/hooks/useUniverseDraft.js b/client/src/hooks/useUniverseDraft.js
index 46f42e9e24..c3741542a1 100644
--- a/client/src/hooks/useUniverseDraft.js
+++ b/client/src/hooks/useUniverseDraft.js
@@ -89,6 +89,8 @@ const emptyPendingCanon = () => ({ characters: [], places: [], objects: [] });
export const RUNS_STATUS = { LOADING: 'loading', READY: 'ready', ERROR: 'error' };
export default function useUniverseDraft({ selectedId, goToWorld }) {
+ const visitRef = useRef({ id: selectedId });
+ if (visitRef.current.id !== selectedId) visitRef.current = { id: selectedId };
const [universes, setWorlds] = useState([]);
const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false);
@@ -107,6 +109,12 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
// pin rather than the whole settings blob so the memo below has a stable dep.
const [targetPin, setTargetPin] = useState(null);
const [draft, setDraft] = useState(createEmptyUniverseDraft);
+ const [draftRead, setDraftRead] = useState({ id: null, status: 'idle', error: null });
+ const [draftReadAttempt, setDraftReadAttempt] = useState(0);
+ const draftReady = selectedId ? (draftRead.id === selectedId
+ && draftRead.status === 'ready' && draft.id === selectedId) : !draft.id;
+ const draftReadError = draftRead.id === selectedId ? draftRead.error : null;
+ const retryDraft = useCallback(() => setDraftReadAttempt(attempt => attempt + 1), []);
const [runs, setRuns] = useState([]);
// History read state, bound to the universe it was requested for. A failed
// read must not look like an empty history, so it is tracked apart from `runs`.
@@ -230,6 +238,7 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
useEffect(() => {
setPendingDeleteId(null);
+ setSaving(false);
setCanonDirty(false);
clearPendingCanonAdditions();
if (!selectedId) {
@@ -239,7 +248,10 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
return undefined;
}
let cancelled = false;
- getUniverse(selectedId).catch(() => null).then(async (fetched) => {
+ let readError = null;
+ const failedRead = error => { readError = error.message || 'Unable to load universe'; return null; };
+ setDraftRead({ id: selectedId, status: 'loading', error: null });
+ getUniverse(selectedId, { silent: true }).catch(failedRead).then(async (fetched) => {
if (cancelled) return;
// This body predates a mutation we already have confirmed — re-read rather
// than apply it. The second read is issued after that mutation's response,
@@ -249,7 +261,7 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
// failure, keep the draft as the mutation left it rather than applying the
// body we just judged stale.
const universe = (fetched && universeIsStale(selectedId, fetched.updatedAt))
- ? await getUniverse(selectedId).catch(() => null)
+ ? await getUniverse(selectedId, { silent: true }).catch(failedRead)
: fetched;
if (cancelled) return;
if (universe) {
@@ -272,10 +284,13 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
};
setDraft(hydrated);
markDraftSaved(hydrated);
+ setDraftRead({ id: selectedId, status: 'ready', error: null });
+ } else {
+ setDraftRead({ id: selectedId, status: 'error', error: readError || 'Universe not found' });
}
});
return () => { cancelled = true; };
- }, [selectedId, universeIsStale, noteUniverseUpdated]);
+ }, [selectedId, universeIsStale, noteUniverseUpdated, draftReadAttempt]);
// Run history loads independently of the draft so Retry never re-hydrates
// (and so never clobbers) unsaved edits. Results are dropped unless they
@@ -305,6 +320,9 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
}, [selectedId, loadRuns]);
const handleSave = async () => {
+ if (!draftReady || saving || selectedIdRef.current !== selectedId) return null;
+ const visit = visitRef.current;
+ const isCurrentVisit = () => mountedRef.current && visitRef.current === visit;
if (!draft.name?.trim()) {
toast.error('Name is required');
return null;
@@ -338,6 +356,7 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
if (needsCanonInPayload) {
if (selectedId) {
const fresh = await getUniverse(selectedId, { silent: true }).catch(() => null);
+ if (!isCurrentVisit()) return null;
if (!fresh) {
setSaving(false);
toast.error('Save failed: could not fetch latest canon — please try again');
@@ -362,6 +381,13 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
const result = selectedId
? await updateUniverse(selectedId, payload, { silent: true }).catch((error) => { toast.error(`Save failed: ${error.message}`); return null; })
: await createUniverse(payload, { silent: true }).catch((error) => { toast.error(`Save failed: ${error.message}`); return null; });
+ // Persisted writes still update the list/watermark, but only their original
+ // visit may settle its draft or navigate after a create (including A→B→A).
+ if (result) {
+ noteUniverseUpdated(result.id, result.updatedAt);
+ setWorlds(previous => upsertByIdPrepend(previous, result));
+ }
+ if (!isCurrentVisit()) return result;
setSaving(false);
if (!result) return null;
if (needsCanonInPayload) {
@@ -386,13 +412,7 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
categories: adoptServerCategoryIds(d.categories, result.categories),
}));
}
- // Watermark this save so a re-hydration GET it raced (navigate away and back
- // mid-save) re-reads instead of showing the pre-save record — the same guard
- // the style-reference mutators get, which is why it keys on the server's
- // clock rather than on anything style-reference-specific.
- noteUniverseUpdated(result.id, result.updatedAt);
toast.success(selectedId ? 'World updated' : 'World created');
- setWorlds((previous) => upsertByIdPrepend(previous, result));
if (result.id !== selectedId) goToWorld(result.id);
return result;
};
@@ -767,6 +787,9 @@ export default function useUniverseDraft({ selectedId, goToWorld }) {
defaultMode,
draft,
draftRef,
+ draftReady,
+ draftReadError,
+ retryDraft,
effectiveDefaultMode,
flushDraftIfDirty,
handleCanonChange,
diff --git a/client/src/hooks/useUniverseDraft.test.jsx b/client/src/hooks/useUniverseDraft.test.jsx
index 339c714cf6..5118f05726 100644
--- a/client/src/hooks/useUniverseDraft.test.jsx
+++ b/client/src/hooks/useUniverseDraft.test.jsx
@@ -147,6 +147,40 @@ const renderSelectable = () => {
};
describe('useUniverseDraft', () => {
+ it('refuses saving an outgoing draft while the selected universe is loading or failed, then retries', async () => {
+ const { result, rerender } = renderSelectable();
+ await waitFor(() => expect(result.current.draft.id).toBe('u1'));
+ let failRead;
+ apiMocks.getUniverse.mockImplementationOnce(() => new Promise((_resolve, reject) => { failRead = reject; }));
+ rerender({ selectedId: 'u2' });
+ await act(async () => { await result.current.handleSave(); });
+ expect(apiMocks.updateUniverse).not.toHaveBeenCalled();
+ await act(async () => failRead(new Error('World unavailable')));
+ expect(result.current.draftReadError).toBe('World unavailable');
+ await act(async () => { await result.current.handleSave(); });
+ expect(apiMocks.updateUniverse).not.toHaveBeenCalled();
+ apiMocks.getUniverse.mockResolvedValueOnce(universeTwo);
+ act(() => result.current.retryDraft());
+ await waitFor(() => expect(result.current.draftReady).toBe(true));
+ await act(async () => { await result.current.handleSave(); });
+ expect(apiMocks.updateUniverse).toHaveBeenCalledWith('u2', expect.objectContaining({ name: 'Second Universe' }), { silent: true });
+ });
+
+ it('does not rebaseline the new universe when an earlier save completes', async () => {
+ const { result, rerender } = renderSelectable();
+ await waitFor(() => expect(result.current.draftReady).toBe(true));
+ let finishSave;
+ apiMocks.updateUniverse.mockImplementationOnce(() => new Promise(resolve => { finishSave = resolve; }));
+ let pendingSave;
+ act(() => { pendingSave = result.current.handleSave(); });
+ apiMocks.getUniverse.mockResolvedValueOnce(universeTwo);
+ rerender({ selectedId: 'u2' });
+ await waitFor(() => expect(result.current.draft.id).toBe('u2'));
+ await act(async () => { finishSave({ ...universe, updatedAt: tickServerClock() }); await pendingSave; });
+ expect(result.current.draft.name).toBe('Second Universe');
+ expect(result.current.isDraftDirty()).toBe(false);
+ });
+
it('hydrates the selected universe and its run history', async () => {
const { result } = renderDraft();
await waitFor(() => expect(result.current.loading).toBe(false));