@gmickel/gno 1.46.0 → 2.1.0

package/src/serve/public/globals.css

@@ -568,3 +568,38 @@ mark {
     animation: none;
   }
 }
+
+/* Keep the review and actions inside the viewport, including short windows and
+   mobile keyboards. Only the form body scrolls; the close/export controls stay put. */
+.publish-export-dialog {
+  display: flex;
+  flex-direction: column;
+  width: min(36rem, calc(100vw - 2rem));
+  max-width: 36rem;
+  max-height: calc(100dvh - 2rem);
+  gap: 0;
+  overflow: hidden;
+  padding: 0;
+}
+
+.publish-export-dialog-header {
+  flex-shrink: 0;
+  padding: 1.25rem 2.5rem 1rem 1.5rem;
+  overflow-wrap: anywhere;
+}
+
+.publish-export-dialog-body {
+  display: flex;
+  min-height: 0;
+  flex-direction: column;
+  gap: 1rem;
+  overflow-y: auto;
+  overscroll-behavior: contain;
+  padding: 0.25rem 1.5rem 1.25rem;
+}
+
+.publish-export-dialog-footer {
+  flex-shrink: 0;
+  border-top: 1px solid hsl(var(--border));
+  padding: 1rem 1.5rem;
+}

package/src/serve/public/lib/publish-export.ts

@@ -1,4 +1,7 @@
-import type { PublishArtifact } from "../../../publish/artifact";
+import type {
+  PublishArtifact,
+  PublishVisibility,
+} from "../../../publish/artifact";
 
 export interface PublishExportResponse {
   artifact: PublishArtifact;
@@ -19,3 +22,80 @@ export function downloadPublishArtifactFile(
   anchor.click();
   URL.revokeObjectURL(href);
 }
+
+/**
+ * Local help metadata, checked against gno.sh src/lib/server/{billing,entitlements}.ts
+ * on 2026-09-05. Keep in sync when hosted plan capabilities change. These labels
+ * explain availability; only the hosted entitlement service authorizes publishing.
+ */
+export const PUBLISH_ACCESS_OPTIONS: ReadonlyArray<{
+  value: PublishVisibility;
+  label: string;
+  audience: string;
+  availability: string;
+}> = [
+  {
+    value: "public",
+    label: "Public",
+    audience:
+      "Anyone can read, discover, and download the published content, including search engines and agents.",
+    availability: "Free and paid plans",
+  },
+  {
+    value: "secret-link",
+    label: "Secret link",
+    audience:
+      "Anyone with the link can read and forward it. Readers do not need an invitation.",
+    availability: "Paid plans with private publishing",
+  },
+  {
+    value: "invite-only",
+    label: "Invite only",
+    audience:
+      "Personal shares start with owner access only. Choose recipients or the intended organization audience in Studio before publishing.",
+    availability: "Paid plans with private publishing",
+  },
+  {
+    value: "encrypted",
+    label: "Encrypted",
+    audience:
+      "Anyone with both the link and passphrase can decrypt the content in their browser. Share the passphrase separately.",
+    availability: "Paid plans with encrypted publishing",
+  },
+];
+
+export function buildPublishExportRequest(input: {
+  target: string;
+  visibility: string | null;
+  passphrase: string;
+  passphraseConfirmation: string;
+  audienceConfirmed: boolean;
+}): {
+  target: string;
+  visibility: PublishVisibility;
+  encryptionPassphrase?: string;
+} {
+  const option = PUBLISH_ACCESS_OPTIONS.find(
+    ({ value }) => value === input.visibility
+  );
+  if (!option) {
+    throw new Error("Choose who can read this export.");
+  }
+  if (!input.audienceConfirmed) {
+    throw new Error("Review and confirm the audience before exporting.");
+  }
+  if (option.value === "encrypted") {
+    if (!input.passphrase.trim()) {
+      throw new Error("Enter a passphrase for the encrypted export.");
+    }
+    if (input.passphrase !== input.passphraseConfirmation) {
+      throw new Error("The passphrases do not match.");
+    }
+    return {
+      target: input.target,
+      visibility: option.value,
+      encryptionPassphrase: input.passphrase,
+    };
+  }
+  return { target: input.target, visibility: option.value };
+}

package/src/serve/public/lib/shiki-language-ids.ts

@@ -3,9 +3,13 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "1c",
   "1c-query",
   "abap",
+  "actionscript",
   "actionscript-3",
   "ada",
   "adoc",
+  "ahk",
+  "ahk1",
+  "ahk2",
   "angular-html",
   "angular-ts",
   "apache",
@@ -13,6 +17,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "apl",
   "applescript",
   "ara",
+  "as3",
   "asciidoc",
   "asm",
   "astro",
@@ -37,6 +42,8 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "cadence",
   "cairo",
   "cdc",
+  "chapel",
+  "chpl",
   "cjs",
   "clarity",
   "clj",
@@ -151,6 +158,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "jsx",
   "julia",
   "just",
+  "justfile",
   "kdl",
   "kotlin",
   "kql",
@@ -197,6 +205,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "nginx",
   "nim",
   "nix",
+  "nsis",
   "nu",
   "nushell",
   "objc",
@@ -205,6 +214,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "ocaml",
   "odin",
   "openscad",
+  "org",
   "pascal",
   "perl",
   "perl6",
@@ -228,6 +238,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "pug",
   "puppet",
   "purescript",
+  "pwsh",
   "py",
   "python",
   "ql",
@@ -239,6 +250,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "raku",
   "razor",
   "rb",
+  "rbs",
   "reg",
   "regex",
   "regexp",
@@ -249,6 +261,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "rs",
   "rst",
   "ruby",
+  "ruby-signature",
   "rust",
   "sas",
   "sass",
@@ -264,6 +277,7 @@ export const BUNDLED_LANGUAGE_IDS: ReadonlySet<string> = new Set([
   "shellscript",
   "shellsession",
   "smalltalk",
+  "smithy",
   "solidity",
   "soy",
   "sparql",

package/src/serve/public/pages/Collections.tsx

@@ -37,6 +37,7 @@ import {
 } from "../components/CollectionModelDialog";
 import { CollectionsEmptyState } from "../components/CollectionsEmptyState";
 import { IndexingProgress } from "../components/IndexingProgress";
+import { PublishExportDialog } from "../components/PublishExportDialog";
 import { Badge } from "../components/ui/badge";
 import { Button } from "../components/ui/button";
 import {
@@ -67,10 +68,6 @@ import {
   TooltipTrigger,
 } from "../components/ui/tooltip";
 import { apiFetch } from "../hooks/use-api";
-import {
-  downloadPublishArtifactFile,
-  type PublishExportResponse,
-} from "../lib/publish-export";
 
 interface PageProps {
   navigate: (to: string | number) => void;
@@ -129,7 +126,6 @@ interface CollectionCardProps {
   onModelSettings: () => void;
   onReindex: () => void;
   onRemove: () => void;
-  isExporting: boolean;
   isReindexing: boolean;
 }
 
@@ -161,7 +157,6 @@ function CollectionCard({
   onModelSettings,
   onReindex,
   onRemove,
-  isExporting,
   isReindexing,
 }: CollectionCardProps) {
   const embedPercent =
@@ -227,17 +222,13 @@ function CollectionCard({
                 Embedding cleanup
               </DropdownMenuItem>
               <DropdownMenuItem
-                disabled={actionsDisabled || isExporting}
+                disabled={actionsDisabled}
                 onClick={(event) => {
                   event.stopPropagation();
                   onExport();
                 }}
               >
-                {isExporting ? (
-                  <Loader2Icon className="mr-2 size-4 animate-spin" />
-                ) : (
-                  <Share2Icon className="mr-2 size-4" />
-                )}
+                <Share2Icon className="mr-2 size-4" />
                 Export for gno.sh
               </DropdownMenuItem>
               <DropdownMenuSeparator />
@@ -361,8 +352,7 @@ export default function Collections({ navigate }: PageProps) {
   const [syncJobId, setSyncJobId] = useState<string | null>(null);
   const [syncTarget, setSyncTarget] = useState<SyncTarget>(null);
   const [syncError, setSyncError] = useState<string | null>(null);
-  const [exportError, setExportError] = useState<string | null>(null);
-  const [exportingCollectionName, setExportingCollectionName] = useState<
+  const [exportCollectionName, setExportCollectionName] = useState<
     string | null
   >(null);
   const [removeDialog, setRemoveDialog] = useState<CollectionStats | null>(
@@ -499,30 +489,6 @@ export default function Collections({ navigate }: PageProps) {
     await loadCollections();
   };
 
-  const handleExport = async (name: string) => {
-    setExportError(null);
-    setExportingCollectionName(name);
-
-    const { data, error: err } = await apiFetch<PublishExportResponse>(
-      "/api/publish/export",
-      {
-        body: JSON.stringify({ target: name }),
-        method: "POST",
-      }
-    );
-
-    setExportingCollectionName(null);
-
-    if (err) {
-      setExportError(err);
-      return;
-    }
-
-    if (data) {
-      downloadPublishArtifactFile(data);
-    }
-  };
-
   // Loading state
   if (loading) {
     return (
@@ -643,12 +609,13 @@ export default function Collections({ navigate }: PageProps) {
           </Card>
         )}
 
-        {exportError && (
-          <Card className="mx-auto mb-6 max-w-3xl border-destructive bg-destructive/10">
-            <CardContent className="py-4">
-              <p className="text-destructive text-sm">{exportError}</p>
-            </CardContent>
-          </Card>
+        {exportCollectionName !== null && (
+          <PublishExportDialog
+            key={exportCollectionName}
+            onClose={() => setExportCollectionName(null)}
+            target={exportCollectionName}
+            title={exportCollectionName}
+          />
         )}
 
         {/* Error */}
@@ -687,7 +654,6 @@ export default function Collections({ navigate }: PageProps) {
               <CollectionCard
                 actionsDisabled={Boolean(syncJobId)}
                 collection={collection}
-                isExporting={exportingCollectionName === collection.name}
                 isReindexing={
                   Boolean(syncJobId) &&
                   syncTarget?.kind === "collection" &&
@@ -704,7 +670,7 @@ export default function Collections({ navigate }: PageProps) {
                   setEmbeddingCleanupNote(null);
                 }}
                 onExport={() => {
-                  void handleExport(collection.name);
+                  setExportCollectionName(collection.name);
                 }}
                 onModelSettings={() => setModelDialogCollection(collection)}
                 onReindex={() => void handleReindex(collection.name)}

package/src/serve/public/pages/DocView.tsx

@@ -47,6 +47,7 @@ import {
   OutgoingLinksPanel,
   type OutgoingLink,
 } from "../components/OutgoingLinksPanel";
+import { PublishExportDialog } from "../components/PublishExportDialog";
 import { RefactorImpactPreview } from "../components/RefactorImpactPreview";
 import { RelatedNotesSidebar } from "../components/RelatedNotesSidebar";
 import { TagInput } from "../components/TagInput";
@@ -81,10 +82,6 @@ import {
   isPdfDocument,
 } from "../lib/doc-asset-url";
 import { waitForDocumentAvailability } from "../lib/document-availability";
-import {
-  downloadPublishArtifactFile,
-  type PublishExportResponse,
-} from "../lib/publish-export";
 import {
   buildReadableSectionUrl,
   createCitationSectionUrl,
@@ -411,11 +408,7 @@ export default function DocView({ navigate }: PageProps) {
   const [externalChangeNotice, setExternalChangeNotice] = useState<
     string | null
   >(null);
-  const [exportingPublishArtifact, setExportingPublishArtifact] =
-    useState(false);
-  const [publishExportError, setPublishExportError] = useState<string | null>(
-    null
-  );
+  const [publishExportOpen, setPublishExportOpen] = useState(false);
 
   // Tag editing state
   const [editingTags, setEditingTags] = useState(false);
@@ -879,32 +872,6 @@ export default function DocView({ navigate }: PageProps) {
     }
   }, [doc, navigate]);
 
-  const handlePublishExport = useCallback(async () => {
-    if (!doc) {
-      return;
-    }
-
-    setPublishExportError(null);
-    setExportingPublishArtifact(true);
-    const { data, error: err } = await apiFetch<PublishExportResponse>(
-      "/api/publish/export",
-      {
-        body: JSON.stringify({ target: doc.uri }),
-        method: "POST",
-      }
-    );
-    setExportingPublishArtifact(false);
-
-    if (err) {
-      setPublishExportError(err);
-      return;
-    }
-
-    if (data) {
-      downloadPublishArtifactFile(data);
-    }
-  }, [doc]);
-
   const handleDelete = async () => {
     if (!doc) return;
 
@@ -1784,18 +1751,13 @@ export default function DocView({ navigate }: PageProps) {
                     </Button>
                     <Button
                       className="gap-1.5"
-                      disabled={exportingPublishArtifact}
                       onClick={() => {
-                        void handlePublishExport();
+                        setPublishExportOpen(true);
                       }}
                       size="sm"
                       variant="outline"
                     >
-                      {exportingPublishArtifact ? (
-                        <Loader2Icon className="size-4 animate-spin" />
-                      ) : (
-                        <Share2Icon className="size-4" />
-                      )}
+                      <Share2Icon className="size-4" />
                       Export for gno.sh
                     </Button>
                     <Button
@@ -1847,18 +1809,13 @@ export default function DocView({ navigate }: PageProps) {
                     )}
                     <Button
                       className="gap-1.5"
-                      disabled={exportingPublishArtifact}
                       onClick={() => {
-                        void handlePublishExport();
+                        setPublishExportOpen(true);
                       }}
                       size="sm"
                       variant="outline"
                     >
-                      {exportingPublishArtifact ? (
-                        <Loader2Icon className="size-4 animate-spin" />
-                      ) : (
-                        <Share2Icon className="size-4" />
-                      )}
+                      <Share2Icon className="size-4" />
                       Export for gno.sh
                     </Button>
                     {localClient && doc.source.absPath && (
@@ -1945,11 +1902,16 @@ export default function DocView({ navigate }: PageProps) {
             </>
           )}
         </div>
-        {publishExportError && (
-          <p className="pt-2 text-destructive text-sm">{publishExportError}</p>
-        )}
       </header>
 
+      {publishExportOpen && doc && (
+        <PublishExportDialog
+          key={doc.uri}
+          onClose={() => setPublishExportOpen(false)}
+          target={doc.uri}
+          title={doc.title ?? doc.uri}
+        />
+      )}
       <div className="mx-auto flex max-w-[1800px] gap-5 px-6 xl:px-8">
         {/* Left rail — metadata + outline */}
         {doc && (

package/src/serve/resident-admission.ts

@@ -2,6 +2,8 @@
 
 import type { ResidentRequestHandle } from "./resident-runtime";
 
+import { settlesBy } from "../core/shutdown-budget";
+
 const DEFAULT_READER_LIMIT = 8;
 const DEFAULT_READER_QUEUE_LIMIT = 64;
 
@@ -63,21 +65,32 @@ export class ReaderGate {
         signal?.addEventListener("abort", entry.onAbort, { once: true });
         this.#queue.push(entry);
       });
+      // Release reserved capacity if cancellation won the handoff race.
+      if (signal?.aborted) {
+        this.#releaseSlot();
+        throw new Error("Resident request aborted");
+      }
+    } else {
+      this.#active += 1;
     }
-    if (signal?.aborted) throw new Error("Resident request aborted");
-    this.#active += 1;
     let released = false;
     return () => {
       if (released) return;
       released = true;
-      this.#active -= 1;
-      const next = this.#queue.shift();
-      if (next) {
-        next.signal?.removeEventListener("abort", next.onAbort!);
-        next.resolve();
-      }
+      this.#releaseSlot();
     };
   }
+
+  #releaseSlot(): void {
+    const next = this.#queue.shift();
+    if (next) {
+      // Transfer ownership synchronously, before any fresh acquire can run.
+      next.signal?.removeEventListener("abort", next.onAbort!);
+      next.resolve();
+    } else {
+      this.#active -= 1;
+    }
+  }
 }
 
 export class AdmissionController {
@@ -122,38 +135,25 @@ export class AdmissionController {
     deadlineMs: number,
     abortSettleMs = deadlineMs
   ): Promise<boolean> {
+    this.stop();
+    const deadline = performance.now() + deadlineMs;
+    if (await settlesBy(this.drain(), deadline)) return false;
+    this.cancel();
+    await settlesBy(this.drain(), deadline + abortSettleMs);
+    return true;
+  }
+
+  stop(): void {
     this.#accepting = false;
-    if (this.#requests.size === 0) return false;
-
-    let timeout: ReturnType<typeof setTimeout> | undefined;
-    let deadlineReached = false;
-    await Promise.race([
-      new Promise<void>((resolve) => this.#drainWaiters.add(resolve)),
-      new Promise<void>((resolve) => {
-        timeout = setTimeout(
-          () => {
-            deadlineReached = true;
-            resolve();
-          },
-          Math.max(0, deadlineMs)
-        );
-      }),
-    ]);
-    if (timeout) clearTimeout(timeout);
-
-    if (!deadlineReached) return false;
+  }
 
+  cancel(): void {
     for (const controller of this.#requests.values())
       controller.abort(new Error("Resident runtime is shutting down"));
+  }
 
-    if (this.#requests.size > 0) {
-      await Promise.race([
-        new Promise<void>((resolve) => this.#drainWaiters.add(resolve)),
-        new Promise<void>((resolve) =>
-          setTimeout(resolve, Math.max(0, abortSettleMs))
-        ),
-      ]);
-    }
-    return deadlineReached;
+  drain(): Promise<void> {
+    if (!this.#requests.size) return Promise.resolve();
+    return new Promise<void>((resolve) => this.#drainWaiters.add(resolve));
   }
 }

package/src/serve/resident-background-work.ts

@@ -1,4 +1,8 @@
 /** Tracks cancellable work that intentionally outlives its initiating request. */
+import {
+  withBackgroundInference,
+  withOwnedInferenceScope,
+} from "../llm/inference-scope";
 
 interface BackgroundWorkEntry {
   controller: AbortController;
@@ -21,19 +25,33 @@ export class ResidentBackgroundWork {
       promise: Promise.resolve(),
     };
     entry.promise = Promise.resolve()
-      .then(() => operation(controller.signal))
+      .then(() =>
+        withBackgroundInference(() =>
+          withOwnedInferenceScope({ signal: controller.signal }, () =>
+            operation(controller.signal)
+          )
+        )
+      )
       .catch(() => undefined)
       .finally(() => this.#entries.delete(entry));
     this.#entries.add(entry);
     return true;
   }
 
-  async cancelAndDrain(): Promise<void> {
+  cancel(): void {
     for (const entry of this.#entries) {
       entry.controller.abort(new Error("Resident runtime is shutting down"));
     }
+  }
+
+  async drain(): Promise<void> {
     await Promise.allSettled(
       Array.from(this.#entries, (entry) => entry.promise)
     );
   }
+
+  async cancelAndDrain(): Promise<void> {
+    this.cancel();
+    await this.drain();
+  }
 }

package/src/serve/resident-request.ts

@@ -1,6 +1,7 @@
-/** Admission, bounded-reader, and model-lease boundary for resident REST reads. */
-
 import type { ResidentRuntime } from "./resident-runtime";
+/** Admission and bounded-reader boundary for resident REST reads. */
+
+import { withInferenceScope } from "../llm/inference-scope";
 
 function unavailableResponse(): Response {
   return Response.json(
@@ -100,8 +101,9 @@ export async function handleResidentRead(
   try {
     releaseReader = await runtime.readerGate.acquire(admitted.signal);
     if (admitted.signal.aborted) return unavailableResponse();
-    const response = await runtime.withModelLease(() =>
-      Promise.resolve(operation(admitted.signal))
+    const response = await withInferenceScope(
+      { signal: admitted.signal },
+      async () => operation(admitted.signal)
     );
     if (admitted.signal.aborted) return unavailableResponse();
     if (!isAuthorizationEpochCurrent()) {
@@ -109,7 +111,11 @@ export async function handleResidentRead(
     }
     if (response.headers.get("content-type")?.includes("text/event-stream")) {
       deferredFinish = true;
-      return wrapResidentStream(response, isAuthorizationEpochCurrent, finish);
+      return wrapResidentStream(
+        response,
+        () => !admitted.signal.aborted && isAuthorizationEpochCurrent(),
+        finish
+      );
     }
     return response;
   } catch (error) {