@open-press/core 1.1.3 → 1.2.0

package/src/openpress/workbench/Workbench.tsx

@@ -51,8 +51,9 @@ export function HtmlWorkbench({
   document,
   pages,
   style,
-  devMode,
+  workspaceMode,
   deploymentInfo,
+  pressSlug = null,
   onDocumentRefresh,
   onBackToWorkspace,
   onOpenPresentation,
@@ -61,8 +62,12 @@ export function HtmlWorkbench({
   document: ReaderDocument;
   pages: Array<HtmlPageBlock>;
   style: CSSProperties;
-  devMode: boolean;
+  workspaceMode: boolean;
   deploymentInfo: DeploymentInfo;
+  // Active Press slug — threaded down to useDeploymentWorkbench so the
+  // local PDF export endpoint can pick the right Press in multi-Press
+  // workspaces. Null when the workspace is at the gallery root.
+  pressSlug?: string | null;
   onDocumentRefresh?: () => void | Promise<void>;
   onBackToWorkspace?: () => void;
   onOpenPresentation?: (pageIndex: number) => void;
@@ -83,7 +88,7 @@ export function HtmlWorkbench({
     sourceBlocksByPath,
     projectMentionItems,
   } = useDocumentWorkbenchModel(document, displayPages);
-  const inspector = useInspector(document, { enabled: devMode });
+  const inspector = useInspector(document, { enabled: workspaceMode });
   const reader = useReaderRuntime({
     pageCount: Math.max(displayPages.length, 1),
     leftPanelBreakpoint: PUBLIC_DRAWER_BREAKPOINT,
@@ -96,7 +101,7 @@ export function HtmlWorkbench({
     pageCount: displayPages.length,
     layoutMode: pageLayoutMode,
   });
-  const deployment = useDeploymentWorkbench({ deploymentInfo });
+  const deployment = useDeploymentWorkbench({ deploymentInfo, pressSlug });
   const [inlineEditStatus, setInlineEditStatus] = useState<InlineDocumentEditStatus>({ state: "idle" });
   const [sourceEditorTarget, setSourceEditorTarget] = useState<InlineDocumentSourceTarget | null>(null);
 
@@ -117,7 +122,7 @@ export function HtmlWorkbench({
   // text cursor active would (a) show the I-beam instead of the inspector
   // crosshair, (b) allow accidental text selection that paints the whole
   // page (notably covers) with the browser ::selection color.
-  const inlineEditEnabled = devMode && !inspector.inspectorMode;
+  const inlineEditEnabled = workspaceMode && !inspector.inspectorMode;
   useInlineDocumentEditor({
     enabled: inlineEditEnabled,
     sourceContainerRef,
@@ -146,7 +151,7 @@ export function HtmlWorkbench({
   };
 
   const comments = useInspectorComments({
-    devMode,
+    workspaceMode,
     inspector,
     sourceBlockMap,
     sourceBlocksByPath,
@@ -324,13 +329,13 @@ export function HtmlWorkbench({
         />
       </div>
       <div className="openpress-workbench-toolbar__group openpress-workbench-toolbar__group--right" aria-label="工作台狀態與發布">
-        {devMode ? (
+        {workspaceMode ? (
           <SearchControl
             sourceBlocksByPath={sourceBlocksByPath}
             onSelectPage={selectWorkspacePage}
           />
         ) : null}
-        {devMode && editStatusMessage ? (
+        {workspaceMode && editStatusMessage ? (
           <span
             className="openpress-dev-edit-status openpress-dev-edit-status--toolbar"
             data-openpress-edit-status={inlineEditStatus.state}
@@ -341,7 +346,7 @@ export function HtmlWorkbench({
             <span>{editStatusMessage}</span>
           </span>
         ) : null}
-        {devMode ? (
+        {workspaceMode ? (
           <button
             type="button"
             className="openpress-workbench-toolbar-action"
@@ -359,7 +364,7 @@ export function HtmlWorkbench({
             <span className="openpress-dev-inspector-status">{inspectorSelectionLabel}</span>
           </button>
         ) : null}
-        {devMode && inspector.inspectorMode ? (
+        {workspaceMode && inspector.inspectorMode ? (
           <span
             className="openpress-dev-inspector-status"
             role="status"
@@ -391,7 +396,7 @@ export function HtmlWorkbench({
     deployment.pdfStatusMessage,
     deployment.pdfToolbarExpanded,
     deployment.status,
-    devMode,
+    workspaceMode,
     editStatusMessage,
     inlineEditStatus.state,
     inspector.inspectorMode,
@@ -418,7 +423,6 @@ export function HtmlWorkbench({
   return (
     <WorkbenchShell
       style={style}
-      devMode={devMode}
       viewMode={viewMode}
       pressType={pressType}
       presentationMode={false}
@@ -491,15 +495,14 @@ export function HtmlWorkbench({
           <PublicPage
             pages={displayPages}
             currentPageIndex={reader.currentPageIndex}
-            devMode={devMode}
             sourceContainerRef={sourceContainerRef}
             registerPage={reader.registerPage}
-            exposeSourceData={devMode}
+            exposeSourceData={workspaceMode}
             inspector={inspector}
             onInternalAnchorNavigate={selectWorkspaceAnchor}
             pageLayoutMode={pageLayoutMode}
           />
-          {devMode ? (
+          {workspaceMode ? (
             <InlineInspectorLayer
               sourceContainerRef={sourceContainerRef}
               inspector={inspector}
@@ -508,7 +511,7 @@ export function HtmlWorkbench({
               geometryVersion={`${pageViewport.scaleMode}:${pageViewport.scale}:${pageLayoutMode}`}
             />
           ) : null}
-          {devMode ? (
+          {workspaceMode ? (
             <InlineSourceEditorLayer
               target={sourceEditorTarget}
               onClose={() => setSourceEditorTarget(null)}

package/src/openpress/workbench/actions/SearchControl.tsx

@@ -1,43 +1,15 @@
 import { useCallback, useEffect, useId, useMemo, useRef, useState, type FormEvent } from "react";
 import { FileText, Loader2, Search } from "lucide-react";
 import type { SourceBlock } from "../../document-model";
+import type { SearchReport, SearchScope } from "../../shared";
 import { WorkbenchDialog } from "../dialog";
 
-type SearchScope = "content" | "all";
 type SearchStatus = "idle" | "loading" | "success" | "error";
 const SEARCH_SCOPE: SearchScope = "all";
 const LIVE_SEARCH_DEBOUNCE_MS = 280;
 
-type SearchFile = {
-  scope: string;
-  file: string;
-  path: string;
-  matchCount: number;
-};
-
-type SearchMatch = {
-  id: string;
-  scope: string;
-  file: string;
-  path: string;
-  line: number;
-  column: number;
-  index: number;
-  text: string;
-  preview: string;
-};
-
-type SearchReport = {
-  ok?: boolean;
-  kind: "search";
-  query: string;
-  scope: SearchScope;
-  caseSensitive: boolean;
-  matchCount: number;
-  files: Array<SearchFile>;
-  matches: Array<SearchMatch>;
-  message?: string;
-};
+type SearchFile = SearchReport["files"][number];
+type SearchMatch = SearchReport["matches"][number];
 
 type SearchJumpTarget = {
   blockId: string;
@@ -45,12 +17,37 @@ type SearchJumpTarget = {
   pageNumber: number;
 };
 
+export interface SearchControlSearcherArgs {
+  query: string;
+  scope: SearchScope;
+  signal: AbortSignal;
+}
+
+export type SearchControlSearcher = (args: SearchControlSearcherArgs) => Promise<SearchReport>;
+
+// Default searcher: hits the dev-only /__openpress/search endpoint.
+// Public deploys override this via the `searcher` prop with a static
+// in-browser searcher backed by /openpress/search-corpus.json.
+async function liveSearcher({ query, scope, signal }: SearchControlSearcherArgs): Promise<SearchReport> {
+  const params = new URLSearchParams();
+  params.set("q", query);
+  params.set("scope", scope);
+  const response = await fetch(`/__openpress/search?${params.toString()}`, { cache: "no-store", signal });
+  const data = (await response.json().catch(() => null)) as (Partial<SearchReport> & { message?: string }) | null;
+  if (!response.ok || data?.ok === false || !isSearchReport(data)) {
+    throw new Error(data?.message ?? "搜尋失敗。");
+  }
+  return data;
+}
+
 export function SearchControl({
   sourceBlocksByPath = {},
   onSelectPage,
+  searcher = liveSearcher,
 }: {
   sourceBlocksByPath?: Record<string, SourceBlock[]>;
   onSelectPage?: (pageIndex: number, options?: { behavior?: ScrollBehavior }) => void;
+  searcher?: SearchControlSearcher;
 }) {
   const titleId = useId();
   const [open, setOpen] = useState(false);
@@ -98,26 +95,18 @@ export function SearchControl({
     setError("");
 
     try {
-      const params = new URLSearchParams();
-      params.set("q", trimmedQuery);
-      params.set("scope", SEARCH_SCOPE);
-      const response = await fetch(`/__openpress/search?${params.toString()}`, {
-        cache: "no-store",
-        signal: controller.signal,
-      });
-      const data = await response.json().catch(() => null) as (Partial<SearchReport> & { message?: string }) | null;
+      const data = await searcher({ query: trimmedQuery, scope: SEARCH_SCOPE, signal: controller.signal });
       if (controller.signal.aborted || requestId !== searchRequestIdRef.current) return;
-      if (!response.ok || data?.ok === false || !isSearchReport(data)) {
-        throw new Error(data?.message ?? "搜尋失敗。");
-      }
+      if (!isSearchReport(data)) throw new Error("搜尋失敗。");
       setReport(data);
       setStatus("success");
     } catch (searchError) {
       if (controller.signal.aborted || requestId !== searchRequestIdRef.current) return;
+      if (searchError instanceof DOMException && searchError.name === "AbortError") return;
       setError(searchError instanceof Error ? searchError.message : String(searchError));
       setStatus("error");
     }
-  }, []);
+  }, [searcher]);
 
   useEffect(() => {
     if (!open) return undefined;

package/src/openpress/workbench/actions/useDeploymentWorkbench.ts

@@ -6,6 +6,12 @@ import { parseDeployError, workbenchPdfButtonText, workbenchPdfStatusMessage } f
 
 export interface UseDeploymentWorkbenchOptions {
   deploymentInfo: DeploymentInfo;
+  // Active Press slug — when present the local PDF export endpoint
+  // tells the CLI to export this Press (open-press pdf . --press <slug>)
+  // instead of defaulting to the first Press. Empty / null means the
+  // workspace has only one Press, or the workbench is at the gallery
+  // root, and the CLI default is correct.
+  pressSlug?: string | null;
 }
 
 export interface DeploymentWorkbench {
@@ -22,7 +28,7 @@ export interface DeploymentWorkbench {
   handleOpenWorkbenchPdf: () => void;
 }
 
-export function useDeploymentWorkbench({ deploymentInfo }: UseDeploymentWorkbenchOptions): DeploymentWorkbench {
+export function useDeploymentWorkbench({ deploymentInfo, pressSlug = null }: UseDeploymentWorkbenchOptions): DeploymentWorkbench {
   const [status, setStatus] = useState<DeployStatus>("idle");
   const [pdfActionStatus, setPdfActionStatus] = useState<PdfActionStatus>("idle");
   const [currentDeploymentInfo, setCurrentDeploymentInfo] = useState(deploymentInfo);
@@ -96,7 +102,12 @@ export function useDeploymentWorkbench({ deploymentInfo }: UseDeploymentWorkbenc
     if (pdfActionStatus === "generating") return;
     setPdfActionStatus("generating");
     try {
-      const response = await fetch("/__openpress/local-pdf-export", { method: "POST" });
+      const requestBody = pressSlug ? { press: pressSlug } : {};
+      const response = await fetch("/__openpress/local-pdf-export", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(requestBody),
+      });
       if (!response.ok) {
         const text = await response.text().catch(() => "");
         throw new Error(text || `Local PDF export failed with status ${response.status}`);
@@ -109,7 +120,7 @@ export function useDeploymentWorkbench({ deploymentInfo }: UseDeploymentWorkbenc
       console.error("OpenPress local PDF export failed", error);
       setPdfActionStatus("failed");
     }
-  }, [pdfActionStatus]);
+  }, [pdfActionStatus, pressSlug]);
 
   const handleOpenWorkbenchPdf = useCallback(() => {
     if (localDeployEnabled) {

package/src/openpress/workbench/inspector/useInspectorComments.ts

@@ -8,7 +8,7 @@ import type { InspectorState, PendingComment } from "./inspectorModel";
 import { getInlineSavedCommentForTarget, resolveInlineSavedComment } from "./inlineCommentModel";
 
 export interface UseInspectorCommentsOptions {
-  devMode: boolean;
+  workspaceMode: boolean;
   inspector: InspectorState;
   sourceBlockMap: Record<string, SourceBlock>;
   sourceBlocksByPath: Record<string, SourceBlock[]>;
@@ -36,7 +36,7 @@ export interface InspectorComments {
 }
 
 export function useInspectorComments({
-  devMode,
+  workspaceMode,
   inspector,
   sourceBlockMap,
   sourceBlocksByPath,
@@ -76,7 +76,7 @@ export function useInspectorComments({
   );
 
   const refreshPendingComments = useCallback(async () => {
-    if (!devMode) return;
+    if (!workspaceMode) return;
     setCommentsStatus("loading");
     setCommentsError("");
     try {
@@ -87,7 +87,7 @@ export function useInspectorComments({
       setCommentsStatus("failed");
       setCommentsError(error instanceof Error ? error.message : String(error));
     }
-  }, [devMode]);
+  }, [workspaceMode]);
 
   const clearPendingComment = useCallback(async (id: string) => {
     setCommentsStatus("clearing");
@@ -225,9 +225,9 @@ export function useInspectorComments({
 
   // Initial + dev-mode refresh of pending comments.
   useEffect(() => {
-    if (!devMode) return;
+    if (!workspaceMode) return;
     void refreshPendingComments();
-  }, [devMode, refreshPendingComments]);
+  }, [workspaceMode, refreshPendingComments]);
 
   return {
     pendingComments,

package/src/openpress/workbench/shell/WorkbenchShell.tsx

@@ -6,6 +6,7 @@ type WorkbenchShellContextValue = {
   rightPanelOpen: boolean;
   onToggleLeftPanel: () => void;
   onToggleRightPanel: () => void;
+  withRightPanel: boolean;
 };
 
 const WorkbenchShellContext = createContext<WorkbenchShellContextValue | null>(null);
@@ -18,7 +19,6 @@ function useWorkbenchShell() {
 
 function WorkbenchShellRoot({
   style,
-  devMode,
   viewMode,
   pressType = "pages",
   presentationMode = false,
@@ -28,10 +28,11 @@ function WorkbenchShellRoot({
   rightPanelOpen,
   onToggleLeftPanel,
   onToggleRightPanel,
+  withRightPanel = true,
+  publicViewer = false,
   children,
 }: {
   style: CSSProperties;
-  devMode: boolean;
   viewMode: string;
   pressType?: string;
   presentationMode?: boolean;
@@ -41,20 +42,42 @@ function WorkbenchShellRoot({
   rightPanelOpen: boolean;
   onToggleLeftPanel: () => void;
   onToggleRightPanel: () => void;
+  // When false the toolbar omits the right-panel toggle button and the
+  // shell grid runs without a right column. Used by the public viewer
+  // where the right panel currently has no content (comments + project
+  // entry are workbench-only).
+  withRightPanel?: boolean;
+  // Marks the outer <main> with `data-openpress-public-viewer` so CSS
+  // and external integrations can target the public reading surface.
+  publicViewer?: boolean;
   children: ReactNode;
 }) {
-  const scrimOpen = leftPanelOpen || rightPanelOpen;
-  const handleScrimClick = rightPanelOpen ? onToggleRightPanel : onToggleLeftPanel;
+  const effectiveRightOpen = withRightPanel ? rightPanelOpen : false;
+  const scrimOpen = leftPanelOpen || effectiveRightOpen;
+  const handleScrimClick = effectiveRightOpen ? onToggleRightPanel : onToggleLeftPanel;
   const shellClassName = [
     "reader-app openpress-reader-app openpress-public-viewer openpress-dev-public-viewer openpress-workbench-shell is-ready",
     leftPanelOpen ? "" : "is-closed-left",
-    rightPanelOpen ? "" : "is-closed-right",
+    effectiveRightOpen ? "" : "is-closed-right",
+    withRightPanel ? "" : "openpress-workbench-shell--no-right-panel",
     presentationMode ? "is-presentation-mode" : "",
   ].filter(Boolean).join(" ");
 
   return (
-    <WorkbenchShellContext.Provider value={{ leftPanelOpen, rightPanelOpen, onToggleLeftPanel, onToggleRightPanel }}>
-      <main className="openpress-workbench" style={style} data-dev-mode={devMode ? "true" : "false"}>
+    <WorkbenchShellContext.Provider
+      value={{
+        leftPanelOpen,
+        rightPanelOpen: effectiveRightOpen,
+        onToggleLeftPanel,
+        onToggleRightPanel,
+        withRightPanel,
+      }}
+    >
+      <main
+        className="openpress-workbench"
+        style={style}
+        data-openpress-public-viewer={publicViewer ? "true" : undefined}
+      >
         <div
           className={shellClassName}
           data-openpress-react-runtime="true"
@@ -82,6 +105,7 @@ export function WorkbenchToolbar({ children }: { children: ReactNode }) {
     rightPanelOpen,
     onToggleLeftPanel,
     onToggleRightPanel,
+    withRightPanel,
   } = useWorkbenchShell();
   const LeftIcon = leftPanelOpen ? PanelLeftClose : PanelLeftOpen;
   const RightIcon = rightPanelOpen ? PanelRightClose : PanelRightOpen;
@@ -109,17 +133,19 @@ export function WorkbenchToolbar({ children }: { children: ReactNode }) {
       <div className="openpress-workbench-toolbar__content">
         {children}
       </div>
-      <button
-        type="button"
-        className="openpress-workbench-toolbar-panel-toggle"
-        data-openpress-toggle-right-panel
-        data-openpress-panel-open={rightPanelOpen ? "true" : "false"}
-        aria-label={rightLabel}
-        title={rightLabel}
-        onClick={onToggleRightPanel}
-      >
-        <RightIcon aria-hidden="true" />
-      </button>
+      {withRightPanel ? (
+        <button
+          type="button"
+          className="openpress-workbench-toolbar-panel-toggle"
+          data-openpress-toggle-right-panel
+          data-openpress-panel-open={rightPanelOpen ? "true" : "false"}
+          aria-label={rightLabel}
+          title={rightLabel}
+          onClick={onToggleRightPanel}
+        >
+          <RightIcon aria-hidden="true" />
+        </button>
+      ) : null}
     </header>
   );
 }

package/vite.config.ts

@@ -233,13 +233,18 @@ async function handleLocalPdfExportRequest(req: IncomingMessage, res: ServerResp
     return;
   }
 
-  const result = await runLocalPdfExport();
-  const exists = await fileExists(openpressConfig.paths.pdf);
+  const body = await readJsonRequestBody(req);
+  const slug = normalizePressSlug(body?.press);
+  const result = await runLocalPdfExport(slug);
+  const pdfPath = pressPdfAbsolutePath(slug);
+  const exists = await fileExists(pdfPath);
+  const cliArgs = slug ? ["pdf", ".", "--press", slug] : ["pdf", "."];
+  const pdfUrl = `/__openpress/local-pdf-file?${slug ? `press=${encodeURIComponent(slug)}&` : ""}ts=${Date.now()}`;
   writeJson(res, result.code === 0 && exists ? 200 : 500, {
     ok: result.code === 0 && exists,
     code: result.code,
-    pdf: `/__openpress/local-pdf-file?ts=${Date.now()}`,
-    command: openpressCliCommand(["pdf", "."]),
+    pdf: pdfUrl,
+    command: openpressCliCommand(cliArgs),
     stdout: result.stdout,
     stderr: result.stderr,
   });
@@ -251,11 +256,15 @@ async function handleLocalPdfFileRequest(req: IncomingMessage, res: ServerRespon
     return;
   }
 
+  const requestUrl = new URL(req.url ?? "/", "http://localhost");
+  const slug = normalizePressSlug(requestUrl.searchParams.get("press"));
+  const pdfPath = pressPdfAbsolutePath(slug);
+  const filename = pressFilename(openpressConfig.pdf.filename, slug);
   try {
-    const body = await fs.readFile(openpressConfig.paths.pdf);
+    const body = await fs.readFile(pdfPath);
     res.writeHead(200, {
       "Content-Type": "application/pdf",
-      "Content-Disposition": `inline; filename="${openpressConfig.pdf.filename}"`,
+      "Content-Disposition": `inline; filename="${filename}"`,
       "Cache-Control": "no-store",
     });
     res.end(body);
@@ -264,6 +273,37 @@ async function handleLocalPdfFileRequest(req: IncomingMessage, res: ServerRespon
   }
 }
 
+function normalizePressSlug(value: unknown): string {
+  if (typeof value !== "string") return "";
+  return value.trim().replace(/^\/+|\/+$/g, "");
+}
+
+function pressFilename(baseFilename: string, slug: string): string {
+  if (!slug) return baseFilename;
+  const ext = path.extname(baseFilename);
+  const stem = ext ? baseFilename.slice(0, -ext.length) : baseFilename;
+  return `${stem}-${slug}${ext}`;
+}
+
+function pressPdfAbsolutePath(slug: string): string {
+  return path.join(openpressConfig.outputDir, pressFilename(openpressConfig.pdf.filename, slug));
+}
+
+async function readJsonRequestBody(req: IncomingMessage): Promise<{ press?: unknown } | null> {
+  try {
+    const chunks: Buffer[] = [];
+    for await (const chunk of req) {
+      chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : (chunk as Buffer));
+    }
+    if (chunks.length === 0) return null;
+    const text = Buffer.concat(chunks).toString("utf8");
+    if (!text.trim()) return null;
+    return JSON.parse(text);
+  } catch {
+    return null;
+  }
+}
+
 async function handleLocalStatusRequest(req: IncomingMessage, res: ServerResponse) {
   if (req.method !== "GET") {
     writeJson(res, 405, { ok: false, message: "Status endpoint requires GET." });
@@ -355,9 +395,11 @@ async function handleLocalDeployRequest(req: IncomingMessage, res: ServerRespons
   });
 }
 
-function runLocalPdfExport() {
+function runLocalPdfExport(slug = "") {
+  const args = [openpressCliPath, "pdf", "."];
+  if (slug) args.push("--press", slug);
   return new Promise<{ code: number; stdout: string; stderr: string }>((resolve) => {
-    const child = spawn("node", [openpressCliPath, "pdf", "."], {
+    const child = spawn("node", args, {
       cwd: workspaceRoot,
       shell: false,
     });