@tooee/view 0.2.2 → 0.2.3

package/dist/View.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["../src/View.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAmB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AASxF,UAAU,SAAS;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3C;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CACvD;AAED,wBAAgB,IAAI,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,SAAS,6BA0E1F"}
+{"version":3,"file":"View.d.ts","sourceRoot":"","sources":["../src/View.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAmB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AASxF,UAAU,SAAS;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,OAAO,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3C;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CACvD;AAED,wBAAgB,IAAI,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,EAAE,SAAS,6BAoE1F"}

package/dist/View.js

@@ -6,9 +6,7 @@ import { useContentLoader } from "./hooks/useContentLoader.js";
 import { MarkdownSubview, CodeSubview, TableSubview, CustomSubview, } from "./components/subviews/index.js";
 export function View({ contentProvider, actions, renderers, codeBlockRenderers }) {
     const { theme } = useTheme();
-    const [reloadTrigger, setReloadTrigger] = useState(0);
-    const reload = useCallback(() => setReloadTrigger((n) => n + 1), []);
-    const { content, streaming, error, providerMarks } = useContentLoader(contentProvider, reloadTrigger);
+    const { content, streaming, error, providerMarks, reload } = useContentLoader(contentProvider);
     const [userMarks, setUserMarks] = useState([]);
     const setMarkSet = useCallback((set) => {
         setUserMarks((prev) => {

package/dist/View.js.map

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

package/dist/content-loader-store.d.ts

@@ -0,0 +1,53 @@
+import type { MarkSet } from "@tooee/marks";
+import type { AnyContent, ContentChunk } from "./types.js";
+export type ContentLoaderStatus = "idle" | "loading" | "streaming" | "ready" | "error";
+export interface ContentLoaderContext {
+    status: ContentLoaderStatus;
+    requestId: number;
+    loadSeq: number;
+    content: AnyContent | null;
+    error: string | null;
+    providerMarks: MarkSet[];
+    title: string | undefined;
+}
+export type ContentLoaderEvents = {
+    loadStarted: {
+        marks: MarkSet[];
+        title?: string;
+    };
+    streamStarted: {
+        requestId: number;
+        format: string;
+    };
+    chunkReceived: {
+        requestId: number;
+        chunk: ContentChunk;
+    };
+    loaded: {
+        requestId: number;
+        content: AnyContent;
+    };
+    streamEnded: {
+        requestId: number;
+    };
+    loadFailed: {
+        requestId: number;
+        error: string;
+    };
+    loadCancelled: {
+        requestId: number;
+    };
+    reloadRequested: {};
+};
+export declare function isAsyncIterable(value: unknown): value is AsyncIterable<ContentChunk>;
+export declare function createEmptyContent(format: string, title?: string): AnyContent;
+export declare function applyContentChunk(current: AnyContent | null, chunk: ContentChunk, title?: string): AnyContent;
+export declare function normalizeError(error: unknown): string;
+export declare function createContentLoaderStore(): import("@xstate/store").Store<ContentLoaderContext, ContentLoaderEvents, never>;
+export declare const selectContent: (ctx: ContentLoaderContext) => AnyContent | null;
+export declare const selectStatus: (ctx: ContentLoaderContext) => ContentLoaderStatus;
+export declare const selectStreaming: (ctx: ContentLoaderContext) => boolean;
+export declare const selectError: (ctx: ContentLoaderContext) => string | null;
+export declare const selectProviderMarks: (ctx: ContentLoaderContext) => MarkSet[];
+export declare const selectLoadSeq: (ctx: ContentLoaderContext) => number;
+//# sourceMappingURL=content-loader-store.d.ts.map

package/dist/content-loader-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-loader-store.d.ts","sourceRoot":"","sources":["../src/content-loader-store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAW,YAAY,EAAgC,MAAM,YAAY,CAAA;AAEjG,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,GAAG,OAAO,CAAA;AAEtF,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,UAAU,GAAG,IAAI,CAAA;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,aAAa,EAAE,OAAO,EAAE,CAAA;IACxB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE;QAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACjD,aAAa,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IACpD,aAAa,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,CAAA;IACzD,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,CAAA;IAClD,WAAW,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAA;IAClC,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAChD,aAAa,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAA;IACpC,eAAe,EAAE,EAAE,CAAA;CACpB,CAAA;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAAC,YAAY,CAAC,CAEpF;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,CAa7E;AAaD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,UAAU,GAAG,IAAI,EAC1B,KAAK,EAAE,YAAY,EACnB,KAAK,CAAC,EAAE,MAAM,GACb,UAAU,CA0BZ;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED,wBAAgB,wBAAwB,oFAqDvC;AAED,eAAO,MAAM,aAAa,GAAI,KAAK,oBAAoB,sBAAgB,CAAA;AACvE,eAAO,MAAM,YAAY,GAAI,KAAK,oBAAoB,wBAAe,CAAA;AACrE,eAAO,MAAM,eAAe,GAAI,KAAK,oBAAoB,YAA+B,CAAA;AACxF,eAAO,MAAM,WAAW,GAAI,KAAK,oBAAoB,kBAAc,CAAA;AACnE,eAAO,MAAM,mBAAmB,GAAI,KAAK,oBAAoB,cAAsB,CAAA;AACnF,eAAO,MAAM,aAAa,GAAI,KAAK,oBAAoB,WAAgB,CAAA"}

package/dist/content-loader-store.js

@@ -0,0 +1,111 @@
+import { createStore } from "@xstate/store";
+export function isAsyncIterable(value) {
+    return value != null && typeof value === "object" && Symbol.asyncIterator in value;
+}
+export function createEmptyContent(format, title) {
+    switch (format) {
+        case "markdown":
+            return { format, markdown: "", title };
+        case "code":
+            return { format, code: "", title };
+        case "text":
+            return { format, text: "", title };
+        case "table":
+            return { format, columns: [], rows: [], title };
+        default:
+            return { format, data: undefined, title };
+    }
+}
+function ensureContentFormat(current, format, title) {
+    if (!current || current.format !== format) {
+        return createEmptyContent(format, title);
+    }
+    return current;
+}
+export function applyContentChunk(current, chunk, title) {
+    switch (chunk.type) {
+        case "replace":
+            return chunk.content;
+        case "append":
+            if (chunk.format === "markdown") {
+                const target = ensureContentFormat(current, "markdown", title);
+                return { ...target, markdown: target.markdown + chunk.data };
+            }
+            if (chunk.format === "code") {
+                const target = ensureContentFormat(current, "code", title);
+                return {
+                    ...target,
+                    code: target.code + chunk.data,
+                    language: chunk.language ?? target.language,
+                };
+            }
+            {
+                const target = ensureContentFormat(current, "text", title);
+                return { ...target, text: target.text + chunk.data };
+            }
+        case "patch":
+            return chunk.apply(current);
+        default:
+            return current ?? createEmptyContent("markdown", title);
+    }
+}
+export function normalizeError(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+export function createContentLoaderStore() {
+    return createStore({
+        context: {
+            status: "idle",
+            requestId: 0,
+            loadSeq: 0,
+            content: null,
+            error: null,
+            providerMarks: [],
+            title: undefined,
+        },
+        on: {
+            loadStarted: (ctx, event) => ({
+                ...ctx,
+                status: "loading",
+                requestId: ctx.requestId + 1,
+                error: null,
+                providerMarks: event.marks,
+                title: event.title,
+            }),
+            streamStarted: (ctx, event) => event.requestId !== ctx.requestId
+                ? ctx
+                : {
+                    ...ctx,
+                    status: "streaming",
+                    content: createEmptyContent(event.format, ctx.title),
+                },
+            chunkReceived: (ctx, event) => {
+                if (event.requestId !== ctx.requestId)
+                    return ctx;
+                if (event.chunk.type === "marks") {
+                    const markSet = event.chunk.set;
+                    const providerMarks = [
+                        ...ctx.providerMarks.filter((set) => set.namespace !== markSet.namespace),
+                        markSet,
+                    ];
+                    return { ...ctx, providerMarks };
+                }
+                return { ...ctx, content: applyContentChunk(ctx.content, event.chunk, ctx.title) };
+            },
+            loaded: (ctx, event) => event.requestId !== ctx.requestId
+                ? ctx
+                : { ...ctx, status: "ready", content: event.content },
+            streamEnded: (ctx, event) => event.requestId !== ctx.requestId ? ctx : { ...ctx, status: "ready" },
+            loadFailed: (ctx, event) => event.requestId !== ctx.requestId ? ctx : { ...ctx, status: "error", error: event.error },
+            loadCancelled: (ctx, event) => event.requestId !== ctx.requestId ? ctx : { ...ctx, requestId: ctx.requestId + 1 },
+            reloadRequested: (ctx) => ({ ...ctx, loadSeq: ctx.loadSeq + 1 }),
+        },
+    });
+}
+export const selectContent = (ctx) => ctx.content;
+export const selectStatus = (ctx) => ctx.status;
+export const selectStreaming = (ctx) => ctx.status === "streaming";
+export const selectError = (ctx) => ctx.error;
+export const selectProviderMarks = (ctx) => ctx.providerMarks;
+export const selectLoadSeq = (ctx) => ctx.loadSeq;
+//# sourceMappingURL=content-loader-store.js.map

package/dist/content-loader-store.js.map

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

package/dist/hooks/useContentLoader.d.ts

@@ -1,10 +1,10 @@
-import type { MarkSet } from "@tooee/marks";
-import type { AnyContent, ContentProvider } from "../types.js";
-export declare function useContentLoader(contentProvider: ContentProvider, reloadTrigger: number): {
-    content: AnyContent | null;
+import type { ContentProvider } from "../types.js";
+export declare function useContentLoader(contentProvider: ContentProvider): {
+    content: import("../types.js").AnyContent | null;
     streaming: boolean;
     error: string | null;
-    providerMarks: MarkSet[];
-    setProviderMarks: import("react").Dispatch<import("react").SetStateAction<MarkSet[]>>;
+    providerMarks: import("@tooee/marks").MarkSet[];
+    status: import("../content-loader-store.js").ContentLoaderStatus;
+    reload: () => void;
 };
 //# sourceMappingURL=useContentLoader.d.ts.map

package/dist/hooks/useContentLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useContentLoader.d.ts","sourceRoot":"","sources":["../../src/hooks/useContentLoader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EACV,UAAU,EAGV,eAAe,EAGhB,MAAM,aAAa,CAAA;AAgEpB,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM;;;;;;EA+EvF"}
+{"version":3,"file":"useContentLoader.d.ts","sourceRoot":"","sources":["../../src/hooks/useContentLoader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAalD,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,eAAe;;;;;;;EAwDhE"}

package/dist/hooks/useContentLoader.js

@@ -1,129 +1,55 @@
-import { useState, useEffect } from "react";
-function isAsyncIterable(value) {
-    return value != null && typeof value === "object" && Symbol.asyncIterator in value;
-}
-function createEmptyContent(format, title) {
-    switch (format) {
-        case "markdown":
-            return { format, markdown: "", title };
-        case "code":
-            return { format, code: "", title };
-        case "text":
-            return { format, text: "", title };
-        case "table":
-            return { format, columns: [], rows: [], title };
-        default:
-            return { format, data: undefined, title };
-    }
-}
-function ensureContentFormat(current, format, title) {
-    if (!current || current.format !== format) {
-        return createEmptyContent(format, title);
-    }
-    return current;
-}
-function applyContentChunk(current, chunk, title) {
-    switch (chunk.type) {
-        case "replace":
-            return chunk.content;
-        case "append":
-            if (chunk.format === "markdown") {
-                const target = ensureContentFormat(current, "markdown", title);
-                return { ...target, markdown: target.markdown + chunk.data };
-            }
-            if (chunk.format === "code") {
-                const target = ensureContentFormat(current, "code", title);
-                return {
-                    ...target,
-                    code: target.code + chunk.data,
-                    language: chunk.language ?? target.language,
-                };
-            }
-            {
-                const target = ensureContentFormat(current, "text", title);
-                return { ...target, text: target.text + chunk.data };
-            }
-        case "patch":
-            return chunk.apply(current);
-        default:
-            return current ?? createEmptyContent("markdown", title);
-    }
-}
-export function useContentLoader(contentProvider, reloadTrigger) {
-    const [content, setContent] = useState(null);
-    const [streaming, setStreaming] = useState(false);
-    const [error, setError] = useState(null);
-    const [providerMarks, setProviderMarks] = useState([]);
+import { useCallback, useEffect, useState } from "react";
+import { useSelector } from "@xstate/store-react";
+import { createContentLoaderStore, isAsyncIterable, normalizeError, selectContent, selectError, selectLoadSeq, selectProviderMarks, selectStatus, selectStreaming, } from "../content-loader-store.js";
+export function useContentLoader(contentProvider) {
+    const [store] = useState(createContentLoaderStore);
+    const loadSeq = useSelector(store, (snapshot) => selectLoadSeq(snapshot.context));
     useEffect(() => {
-        setError(null);
-        setStreaming(false);
-        // Reset provider marks on reload; initialize with static marks if provided
-        setProviderMarks(contentProvider.marks ?? []);
+        store.trigger.loadStarted({
+            marks: contentProvider.marks ?? [],
+            title: contentProvider.title,
+        });
+        const requestId = store.getSnapshot().context.requestId;
         const loaded = contentProvider.load();
         if (isAsyncIterable(loaded)) {
-            const fallbackFormat = contentProvider.format ?? "markdown";
-            const title = contentProvider.title;
-            let cancelled = false;
-            let current = createEmptyContent(fallbackFormat, title);
-            setContent(current);
-            setStreaming(true);
-            // Hold the iterator explicitly so cleanup can close it: a cleanup that
-            // only flips `cancelled` leaves a pending next() (and the provider's
-            // subprocess/file handle/network stream) alive until the next chunk.
+            store.trigger.streamStarted({
+                requestId,
+                format: contentProvider.format ?? "markdown",
+            });
             const iterator = loaded[Symbol.asyncIterator]();
             (async () => {
                 try {
                     while (true) {
                         const result = await iterator.next();
-                        if (cancelled || result.done)
+                        if (result.done)
                             break;
-                        const chunk = result.value;
-                        if (chunk.type === "marks") {
-                            // Streamed mark set: merge by replacing any existing set with same namespace
-                            setProviderMarks((prev) => {
-                                const filtered = prev.filter((s) => s.namespace !== chunk.set.namespace);
-                                return [...filtered, chunk.set];
-                            });
-                            continue;
-                        }
-                        current = applyContentChunk(current, chunk, title);
-                        setContent(current);
+                        store.trigger.chunkReceived({ requestId, chunk: result.value });
                     }
+                    store.trigger.streamEnded({ requestId });
                 }
-                catch (err) {
-                    if (!cancelled) {
-                        setError(err instanceof Error ? err.message : String(err));
-                    }
-                }
-                finally {
-                    if (!cancelled) {
-                        setStreaming(false);
-                    }
+                catch (error) {
+                    store.trigger.loadFailed({ requestId, error: normalizeError(error) });
                 }
             })();
             return () => {
-                cancelled = true;
-                // Close the iterator to release provider resources mid-stream.
+                store.trigger.loadCancelled({ requestId });
                 Promise.resolve(iterator.return?.()).catch(() => { });
             };
         }
         if (loaded instanceof Promise) {
-            let active = true;
             loaded
-                .then((value) => {
-                if (active)
-                    setContent(value);
-            })
-                .catch((err) => {
-                if (active)
-                    setError(err instanceof Error ? err.message : String(err));
-            });
-            return () => {
-                active = false;
-            };
+                .then((content) => store.trigger.loaded({ requestId, content }))
+                .catch((error) => store.trigger.loadFailed({ requestId, error: normalizeError(error) }));
+            return () => store.trigger.loadCancelled({ requestId });
         }
-        setContent(loaded);
-    }, [contentProvider, reloadTrigger]);
-    return { content, streaming, error, providerMarks, setProviderMarks };
+        store.trigger.loaded({ requestId, content: loaded });
+    }, [contentProvider, loadSeq, store]);
+    const content = useSelector(store, (snapshot) => selectContent(snapshot.context));
+    const streaming = useSelector(store, (snapshot) => selectStreaming(snapshot.context));
+    const error = useSelector(store, (snapshot) => selectError(snapshot.context));
+    const providerMarks = useSelector(store, (snapshot) => selectProviderMarks(snapshot.context));
+    const status = useSelector(store, (snapshot) => selectStatus(snapshot.context));
+    const reload = useCallback(() => store.trigger.reloadRequested({}), [store]);
+    return { content, streaming, error, providerMarks, status, reload };
 }
 //# sourceMappingURL=useContentLoader.js.map

package/dist/hooks/useContentLoader.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tooee/view",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Terminal content viewer for markdown, code, text, and tables",
   "keywords": [
     "cli",
@@ -37,15 +37,17 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@tooee/commands": "0.2.2",
-    "@tooee/config": "0.2.2",
-    "@tooee/layout": "0.2.2",
-    "@tooee/marks": "0.2.2",
-    "@tooee/overlays": "0.2.2",
-    "@tooee/renderers": "0.2.2",
-    "@tooee/search": "0.2.2",
-    "@tooee/shell": "0.2.2",
-    "@tooee/themes": "0.2.2",
+    "@tooee/commands": "0.2.3",
+    "@tooee/config": "0.2.3",
+    "@tooee/layout": "0.2.3",
+    "@tooee/marks": "0.2.3",
+    "@tooee/overlays": "0.2.3",
+    "@tooee/renderers": "0.2.3",
+    "@tooee/search": "0.2.3",
+    "@tooee/shell": "0.2.3",
+    "@tooee/themes": "0.2.3",
+    "@xstate/store": "^4",
+    "@xstate/store-react": "^2",
     "marked": "^17.0.4"
   },
   "devDependencies": {

package/src/View.tsx

@@ -25,13 +25,7 @@ interface ViewProps {
 
 export function View({ contentProvider, actions, renderers, codeBlockRenderers }: ViewProps) {
   const { theme } = useTheme()
-  const [reloadTrigger, setReloadTrigger] = useState(0)
-  const reload = useCallback(() => setReloadTrigger((n) => n + 1), [])
-
-  const { content, streaming, error, providerMarks } = useContentLoader(
-    contentProvider,
-    reloadTrigger,
-  )
+  const { content, streaming, error, providerMarks, reload } = useContentLoader(contentProvider)
 
   const [userMarks, setUserMarks] = useState<MarkSet[]>([])
 

package/src/content-loader-store.ts

@@ -0,0 +1,154 @@
+import { createStore } from "@xstate/store"
+import type { MarkSet } from "@tooee/marks"
+import type { AnyContent, Content, ContentChunk, ContentFormat, CustomContent } from "./types.js"
+
+export type ContentLoaderStatus = "idle" | "loading" | "streaming" | "ready" | "error"
+
+export interface ContentLoaderContext {
+  status: ContentLoaderStatus
+  requestId: number
+  loadSeq: number
+  content: AnyContent | null
+  error: string | null
+  providerMarks: MarkSet[]
+  title: string | undefined
+}
+
+export type ContentLoaderEvents = {
+  loadStarted: { marks: MarkSet[]; title?: string }
+  streamStarted: { requestId: number; format: string }
+  chunkReceived: { requestId: number; chunk: ContentChunk }
+  loaded: { requestId: number; content: AnyContent }
+  streamEnded: { requestId: number }
+  loadFailed: { requestId: number; error: string }
+  loadCancelled: { requestId: number }
+  reloadRequested: {}
+}
+
+export function isAsyncIterable(value: unknown): value is AsyncIterable<ContentChunk> {
+  return value != null && typeof value === "object" && Symbol.asyncIterator in value
+}
+
+export function createEmptyContent(format: string, title?: string): AnyContent {
+  switch (format) {
+    case "markdown":
+      return { format, markdown: "", title }
+    case "code":
+      return { format, code: "", title }
+    case "text":
+      return { format, text: "", title }
+    case "table":
+      return { format, columns: [], rows: [], title }
+    default:
+      return { format, data: undefined, title } as CustomContent
+  }
+}
+
+function ensureContentFormat<F extends ContentFormat>(
+  current: AnyContent | null,
+  format: F,
+  title?: string,
+): Extract<Content, { format: F }> {
+  if (!current || current.format !== format) {
+    return createEmptyContent(format, title) as Extract<Content, { format: F }>
+  }
+  return current as Extract<Content, { format: F }>
+}
+
+export function applyContentChunk(
+  current: AnyContent | null,
+  chunk: ContentChunk,
+  title?: string,
+): AnyContent {
+  switch (chunk.type) {
+    case "replace":
+      return chunk.content
+    case "append":
+      if (chunk.format === "markdown") {
+        const target = ensureContentFormat(current, "markdown", title)
+        return { ...target, markdown: target.markdown + chunk.data }
+      }
+      if (chunk.format === "code") {
+        const target = ensureContentFormat(current, "code", title)
+        return {
+          ...target,
+          code: target.code + chunk.data,
+          language: chunk.language ?? target.language,
+        }
+      }
+      {
+        const target = ensureContentFormat(current, "text", title)
+        return { ...target, text: target.text + chunk.data }
+      }
+    case "patch":
+      return chunk.apply(current)
+    default:
+      return current ?? createEmptyContent("markdown", title)
+  }
+}
+
+export function normalizeError(error: unknown): string {
+  return error instanceof Error ? error.message : String(error)
+}
+
+export function createContentLoaderStore() {
+  return createStore<ContentLoaderContext, ContentLoaderEvents>({
+    context: {
+      status: "idle",
+      requestId: 0,
+      loadSeq: 0,
+      content: null,
+      error: null,
+      providerMarks: [],
+      title: undefined,
+    },
+    on: {
+      loadStarted: (ctx, event) => ({
+        ...ctx,
+        status: "loading",
+        requestId: ctx.requestId + 1,
+        error: null,
+        providerMarks: event.marks,
+        title: event.title,
+      }),
+      streamStarted: (ctx, event) =>
+        event.requestId !== ctx.requestId
+          ? ctx
+          : {
+              ...ctx,
+              status: "streaming",
+              content: createEmptyContent(event.format, ctx.title),
+            },
+      chunkReceived: (ctx, event) => {
+        if (event.requestId !== ctx.requestId) return ctx
+        if (event.chunk.type === "marks") {
+          const markSet = event.chunk.set
+          const providerMarks = [
+            ...ctx.providerMarks.filter((set) => set.namespace !== markSet.namespace),
+            markSet,
+          ]
+          return { ...ctx, providerMarks }
+        }
+        return { ...ctx, content: applyContentChunk(ctx.content, event.chunk, ctx.title) }
+      },
+      loaded: (ctx, event) =>
+        event.requestId !== ctx.requestId
+          ? ctx
+          : { ...ctx, status: "ready", content: event.content },
+      streamEnded: (ctx, event) =>
+        event.requestId !== ctx.requestId ? ctx : { ...ctx, status: "ready" },
+      loadFailed: (ctx, event) =>
+        event.requestId !== ctx.requestId ? ctx : { ...ctx, status: "error", error: event.error },
+      loadCancelled: (ctx, event) =>
+        event.requestId !== ctx.requestId ? ctx : { ...ctx, requestId: ctx.requestId + 1 },
+      reloadRequested: (ctx) => ({ ...ctx, loadSeq: ctx.loadSeq + 1 }),
+    },
+  })
+}
+
+export const selectContent = (ctx: ContentLoaderContext) => ctx.content
+export const selectStatus = (ctx: ContentLoaderContext) => ctx.status
+export const selectStreaming = (ctx: ContentLoaderContext) => ctx.status === "streaming"
+export const selectError = (ctx: ContentLoaderContext) => ctx.error
+export const selectProviderMarks = (ctx: ContentLoaderContext) => ctx.providerMarks
+export const selectLoadSeq = (ctx: ContentLoaderContext) => ctx.loadSeq

package/src/hooks/useContentLoader.ts

@@ -1,153 +1,72 @@
-import { useState, useEffect } from "react"
-import type { MarkSet } from "@tooee/marks"
-import type {
-  AnyContent,
-  Content,
-  ContentFormat,
-  ContentProvider,
-  ContentChunk,
-  CustomContent,
-} from "../types.js"
+import { useCallback, useEffect, useState } from "react"
+import { useSelector } from "@xstate/store-react"
+import type { ContentProvider } from "../types.js"
+import {
+  createContentLoaderStore,
+  isAsyncIterable,
+  normalizeError,
+  selectContent,
+  selectError,
+  selectLoadSeq,
+  selectProviderMarks,
+  selectStatus,
+  selectStreaming,
+} from "../content-loader-store.js"
 
-function isAsyncIterable(value: unknown): value is AsyncIterable<ContentChunk> {
-  return value != null && typeof value === "object" && Symbol.asyncIterator in value
-}
-
-function createEmptyContent(format: string, title?: string): AnyContent {
-  switch (format) {
-    case "markdown":
-      return { format, markdown: "", title }
-    case "code":
-      return { format, code: "", title }
-    case "text":
-      return { format, text: "", title }
-    case "table":
-      return { format, columns: [], rows: [], title }
-    default:
-      return { format, data: undefined, title } as CustomContent
-  }
-}
-
-function ensureContentFormat<F extends ContentFormat>(
-  current: AnyContent | null,
-  format: F,
-  title?: string,
-): Extract<Content, { format: F }> {
-  if (!current || current.format !== format) {
-    return createEmptyContent(format, title) as Extract<Content, { format: F }>
-  }
-  return current as Extract<Content, { format: F }>
-}
-
-function applyContentChunk(
-  current: AnyContent | null,
-  chunk: ContentChunk,
-  title?: string,
-): AnyContent {
-  switch (chunk.type) {
-    case "replace":
-      return chunk.content
-    case "append":
-      if (chunk.format === "markdown") {
-        const target = ensureContentFormat(current, "markdown", title)
-        return { ...target, markdown: target.markdown + chunk.data }
-      }
-      if (chunk.format === "code") {
-        const target = ensureContentFormat(current, "code", title)
-        return {
-          ...target,
-          code: target.code + chunk.data,
-          language: chunk.language ?? target.language,
-        }
-      }
-      {
-        const target = ensureContentFormat(current, "text", title)
-        return { ...target, text: target.text + chunk.data }
-      }
-    case "patch":
-      return chunk.apply(current)
-    default:
-      return current ?? createEmptyContent("markdown", title)
-  }
-}
-
-export function useContentLoader(contentProvider: ContentProvider, reloadTrigger: number) {
-  const [content, setContent] = useState<AnyContent | null>(null)
-  const [streaming, setStreaming] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [providerMarks, setProviderMarks] = useState<MarkSet[]>([])
+export function useContentLoader(contentProvider: ContentProvider) {
+  const [store] = useState(createContentLoaderStore)
+  const loadSeq = useSelector(store, (snapshot) => selectLoadSeq(snapshot.context))
 
   useEffect(() => {
-    setError(null)
-    setStreaming(false)
-    // Reset provider marks on reload; initialize with static marks if provided
-    setProviderMarks(contentProvider.marks ?? [])
+    store.trigger.loadStarted({
+      marks: contentProvider.marks ?? [],
+      title: contentProvider.title,
+    })
+    const requestId = store.getSnapshot().context.requestId
     const loaded = contentProvider.load()
 
     if (isAsyncIterable(loaded)) {
-      const fallbackFormat = contentProvider.format ?? "markdown"
-      const title = contentProvider.title
-      let cancelled = false
-      let current: AnyContent | null = createEmptyContent(fallbackFormat, title)
-      setContent(current)
-      setStreaming(true)
-
-      // Hold the iterator explicitly so cleanup can close it: a cleanup that
-      // only flips `cancelled` leaves a pending next() (and the provider's
-      // subprocess/file handle/network stream) alive until the next chunk.
+      store.trigger.streamStarted({
+        requestId,
+        format: contentProvider.format ?? "markdown",
+      })
       const iterator = loaded[Symbol.asyncIterator]()
-
       ;(async () => {
         try {
           while (true) {
             const result = await iterator.next()
-            if (cancelled || result.done) break
-            const chunk = result.value
-            if (chunk.type === "marks") {
-              // Streamed mark set: merge by replacing any existing set with same namespace
-              setProviderMarks((prev) => {
-                const filtered = prev.filter((s) => s.namespace !== chunk.set.namespace)
-                return [...filtered, chunk.set]
-              })
-              continue
-            }
-            current = applyContentChunk(current, chunk, title)
-            setContent(current)
-          }
-        } catch (err) {
-          if (!cancelled) {
-            setError(err instanceof Error ? err.message : String(err))
-          }
-        } finally {
-          if (!cancelled) {
-            setStreaming(false)
+            if (result.done) break
+            store.trigger.chunkReceived({ requestId, chunk: result.value })
           }
+          store.trigger.streamEnded({ requestId })
+        } catch (error) {
+          store.trigger.loadFailed({ requestId, error: normalizeError(error) })
         }
       })()
-
       return () => {
-        cancelled = true
-        // Close the iterator to release provider resources mid-stream.
+        store.trigger.loadCancelled({ requestId })
         Promise.resolve(iterator.return?.()).catch(() => {})
       }
     }
 
     if (loaded instanceof Promise) {
-      let active = true
       loaded
-        .then((value) => {
-          if (active) setContent(value)
-        })
-        .catch((err: unknown) => {
-          if (active) setError(err instanceof Error ? err.message : String(err))
-        })
-      return () => {
-        active = false
-      }
+        .then((content) => store.trigger.loaded({ requestId, content }))
+        .catch((error: unknown) =>
+          store.trigger.loadFailed({ requestId, error: normalizeError(error) }),
+        )
+      return () => store.trigger.loadCancelled({ requestId })
     }
 
-    setContent(loaded)
-  }, [contentProvider, reloadTrigger])
+    store.trigger.loaded({ requestId, content: loaded })
+  }, [contentProvider, loadSeq, store])
+
+  const content = useSelector(store, (snapshot) => selectContent(snapshot.context))
+  const streaming = useSelector(store, (snapshot) => selectStreaming(snapshot.context))
+  const error = useSelector(store, (snapshot) => selectError(snapshot.context))
+  const providerMarks = useSelector(store, (snapshot) => selectProviderMarks(snapshot.context))
+  const status = useSelector(store, (snapshot) => selectStatus(snapshot.context))
+  const reload = useCallback(() => store.trigger.reloadRequested({}), [store])
 
-  return { content, streaming, error, providerMarks, setProviderMarks }
+  return { content, streaming, error, providerMarks, status, reload }
 }