@gmickel/gno 2.6.0 → 2.7.1

package/src/serve/public/hooks/use-api.ts

@@ -1,5 +1,7 @@
 import { useCallback, useState } from "react";
 
+import { writeOutcomeUnknown } from "../lib/request-intent";
+
 interface ApiState<T> {
   data: T | null;
   loading: boolean;
@@ -86,6 +88,11 @@ export async function apiFetch<T>(
   error: string | null;
   /** `error.details` of the JSON error envelope, when the server sent one. */
   details?: Record<string, unknown>;
+  /**
+   * A write may or may not have committed: no readable response, a server
+   * error, or the request is still pending under its request ID.
+   */
+  outcomeUnknown?: true;
 }> {
   try {
     const res = await fetch(endpoint, {
@@ -96,17 +103,24 @@ export async function apiFetch<T>(
     const { json, parseError } = await parseJsonSafe(res);
 
     if (parseError) {
-      return { data: null, error: parseError };
+      return { data: null, error: parseError, outcomeUnknown: true };
     }
 
     if (!res.ok) {
       const apiError = json as {
-        error?: { message?: string; details?: Record<string, unknown> };
+        error?: {
+          code?: string;
+          message?: string;
+          details?: Record<string, unknown>;
+        };
       };
       return {
         data: null,
         error: apiError.error?.message || `Request failed: ${res.status}`,
         details: apiError.error?.details,
+        ...(writeOutcomeUnknown(res.status, apiError.error?.code)
+          ? { outcomeUnknown: true as const }
+          : {}),
       };
     }
 
@@ -115,6 +129,7 @@ export async function apiFetch<T>(
     return {
       data: null,
       error: err instanceof Error ? err.message : "Network error",
+      outcomeUnknown: true,
     };
   }
 }

package/src/serve/public/lib/request-intent.ts

@@ -67,3 +67,11 @@ export function clearRequestIntent(
     // Nothing persisted to clear.
   }
 }
+
+/**
+ * Whether a failed write's HTTP answer leaves its commit unknown: a server
+ * error, or the request ID's earlier attempt is still in progress.
+ */
+export function writeOutcomeUnknown(status: number, code?: string): boolean {
+  return status >= 500 || code === "REQUEST_PENDING";
+}

package/src/serve/public/{components/sessions → lib}/snippet.tsx

@@ -14,10 +14,9 @@ export function unescapeMarkdown(text: string): string {
 /**
  * Render a search snippet: FTS `<mark>` highlights become real <mark>
  * elements, everything else stays React text (never parsed as HTML).
- * Mirrors the Search page renderer, plus Markdown-escape removal because
- * archived turns are indexed as escaped Markdown.
+ * Markdown backslash escapes are dropped because indexed text keeps them.
  */
-export function renderSessionSnippet(snippet: string): ReactNode[] {
+export function renderSnippet(snippet: string): ReactNode[] {
   const parts: ReactNode[] = [];
   let remaining = snippet;
   let key = 0;

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

@@ -76,7 +76,8 @@ interface PageProps {
 interface CollectionStats {
   activePresetId?: string;
   name: string;
-  path: string;
+  /** Host path; omitted for remote callers. */
+  path?: string;
   documentCount: number;
   chunkCount: number;
   embeddedCount: number;
@@ -262,18 +263,20 @@ function CollectionCard({
           </DropdownMenu>
         </div>
 
-        <TooltipProvider>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <p className="truncate font-mono text-muted-foreground text-xs">
-                {truncatePath(collection.path)}
-              </p>
-            </TooltipTrigger>
-            <TooltipContent className="max-w-xs break-all">
-              <p className="font-mono text-xs">{collection.path}</p>
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
+        {collection.path && (
+          <TooltipProvider>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <p className="truncate font-mono text-muted-foreground text-xs">
+                  {truncatePath(collection.path)}
+                </p>
+              </TooltipTrigger>
+              <TooltipContent className="max-w-xs break-all">
+                <p className="font-mono text-xs">{collection.path}</p>
+              </TooltipContent>
+            </Tooltip>
+          </TooltipProvider>
+        )}
       </CardHeader>
 
       <CardContent className="pt-2">

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

@@ -30,7 +30,8 @@ interface ConnectorStatus {
   target: string;
   scope: "user" | "project";
   installed: boolean;
-  path: string;
+  /** Host path; omitted for remote callers. */
+  path?: string;
   summary: string;
   nextAction: string;
   mode: {
@@ -234,9 +235,11 @@ export default function Connectors({ navigate }: PageProps) {
                       <span className="font-medium">Scope:</span>{" "}
                       {connector.scope}
                     </div>
-                    <div className="font-mono text-muted-foreground text-xs">
-                      {connector.path}
-                    </div>
+                    {connector.path && (
+                      <div className="font-mono text-muted-foreground text-xs">
+                        {connector.path}
+                      </div>
+                    )}
                   </div>
                   {connector.error && (
                     <p className="text-destructive text-sm">

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

@@ -788,25 +788,30 @@ export default function Dashboard({ navigate }: PageProps) {
                   }
                   style={{ animationDelay: `${0.4 + index * 0.1}s` }}
                 >
-                  <CardContent className="flex items-center justify-between py-4">
-                    <div className="flex items-center gap-3">
+                  <CardContent className="flex flex-wrap items-center justify-between gap-3 py-4">
+                    <div className="flex min-w-0 flex-1 basis-48 items-center gap-3">
                       {syncing ? (
-                        <Loader2Icon className="size-4 animate-spin text-amber-500" />
+                        <Loader2Icon className="size-4 shrink-0 animate-spin text-amber-500" />
                       ) : collection.embeddedCount >= collection.chunkCount ? (
-                        <CheckCircle2Icon className="size-4 text-green-500" />
+                        <CheckCircle2Icon className="size-4 shrink-0 text-green-500" />
                       ) : (
-                        <div className="size-4 rounded-full border-2 border-amber-500" />
+                        <div className="size-4 shrink-0 rounded-full border-2 border-amber-500" />
                       )}
-                      <div>
-                        <div className="font-medium text-lg transition-colors group-hover:text-primary">
+                      <div className="min-w-0">
+                        <div className="truncate font-medium text-lg transition-colors group-hover:text-primary">
                           {collection.name}
                         </div>
-                        <div className="font-mono text-muted-foreground text-sm">
-                          {collection.path}
-                        </div>
+                        {collection.path && (
+                          <div
+                            className="truncate font-mono text-muted-foreground text-sm"
+                            title={collection.path}
+                          >
+                            {collection.path}
+                          </div>
+                        )}
                       </div>
                     </div>
-                    <div className="flex items-center gap-3 text-right">
+                    <div className="flex shrink-0 items-center gap-3 text-right">
                       <Button
                         onClick={(event) => {
                           event.stopPropagation();

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

@@ -37,6 +37,7 @@ import {
   type FileRefactorPreviewPlan,
 } from "../../../core/file-refactor-contract";
 import { extractSections } from "../../../core/sections";
+import { updateFrontmatterTags } from "../../../ingestion/frontmatter";
 import {
   CodeBlock,
   CodeBlockCopyButton,
@@ -583,11 +584,10 @@ export default function DocView({ navigate }: PageProps) {
     return buildDocAssetUrl(doc.uri, doc.relPath);
   }, [doc, isPdf]);
 
-  // Remote "Open original" target for any document that has a source file:
-  // /api/doc-asset serves any collection file inline, so this keeps the
-  // previous file:// scope (every read-only source) for remote clients.
+  // Remote "Open original" target: /api/doc-asset serves any collection file
+  // inline by URI, and remote clients never receive the host absPath.
   const sourceAssetUrl = useMemo(() => {
-    if (!doc?.source.absPath) {
+    if (!doc) {
       return null;
     }
     return buildDocAssetUrl(doc.uri, doc.relPath);
@@ -1243,10 +1243,15 @@ export default function DocView({ navigate }: PageProps) {
     }
 
     clearRequestIntent(tagIntentRef, TAG_INTENT_KEY);
-    // Update doc with new tags
+    // Mirror the committed write-back so the frontmatter tag list is current
+    // without waiting for the index to resync.
     setDoc({
       ...doc,
       tags: editedTags,
+      content:
+        data?.writeBack === "applied" && doc.content !== null
+          ? updateFrontmatterTags(doc.content, editedTags)
+          : doc.content,
       source: {
         ...doc.source,
         sourceHash: data?.version.sourceHash ?? doc.source.sourceHash,

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

@@ -207,8 +207,12 @@ export default function DocumentEditor({ navigate }: PageProps) {
   const [saveError, setSaveError] = useState<string | null>(null);
   const [creatingCopy, setCreatingCopy] = useState(false);
   const [copyError, setCopyError] = useState<string | null>(null);
-  const [externalChangeNotice, setExternalChangeNotice] = useState<
-    string | null
+  /**
+   * `outside`: the file changed under the editor. `unconfirmed`: a save's
+   * response was lost, so a change on disk may be that save's own commit.
+   */
+  const [changeNotice, setChangeNotice] = useState<
+    "outside" | "unconfirmed" | null
   >(null);
   const [historyEntries, setHistoryEntries] = useState<LocalHistoryEntry[]>([]);
   const [historyDialogOpen, setHistoryDialogOpen] = useState(false);
@@ -322,12 +326,21 @@ export default function DocumentEditor({ navigate }: PageProps) {
   // read the current revision and last committed content from refs.
   const docRef = useRef(doc);
   const committedContentRef = useRef(originalContent);
+  const draftRef = useRef(content);
   useEffect(() => {
     docRef.current = doc;
   }, [doc]);
+  useEffect(() => {
+    draftRef.current = content;
+  }, [content]);
   // One request ID per (document revision, content) save intent: retrying a
   // save whose response was lost replays it instead of reporting a conflict.
   const saveIntentRef = useRef<RequestIntent | null>(null);
+  // Content of a save that is in flight or whose response was lost: its
+  // commit is unknown, so change events are held until a response says whose
+  // change they were. Retry save re-sends exactly this content.
+  const unknownSaveRef = useRef<string | null>(null);
+  const changedWhileUnknownRef = useRef(false);
 
   /** Save `contentToSave`; resolves true once it is committed on disk. */
   const persistContent = useCallback(
@@ -341,8 +354,13 @@ export default function DocumentEditor({ navigate }: PageProps) {
 
       setSaveStatus("saving");
       setSaveError(null);
+      unknownSaveRef.current = contentToSave;
 
-      const { data, error: err } = await apiFetch<UpdateDocResponse>(
+      const {
+        data,
+        error: err,
+        outcomeUnknown,
+      } = await apiFetch<UpdateDocResponse>(
         `/api/docs/${encodeURIComponent(current.docid)}`,
         {
           method: "PUT",
@@ -363,23 +381,45 @@ export default function DocumentEditor({ navigate }: PageProps) {
       if (err) {
         setSaveStatus("error");
         setSaveError(err);
+        if (outcomeUnknown) {
+          // Never downgrade a warning about a change from elsewhere.
+          setChangeNotice((notice) =>
+            notice === "outside" ? notice : "unconfirmed"
+          );
+          return false;
+        }
+        // A definitive rejection: this save did not commit, so a change seen
+        // meanwhile came from elsewhere.
+        unknownSaveRef.current = null;
+        if (changedWhileUnknownRef.current) {
+          changedWhileUnknownRef.current = false;
+          setChangeNotice("outside");
+        } else {
+          setChangeNotice((notice) =>
+            notice === "unconfirmed" ? null : notice
+          );
+        }
         return false;
       }
 
+      unknownSaveRef.current = null;
+      changedWhileUnknownRef.current = false;
       if (data?.request?.replayed) {
         // A replay reports an earlier commit; disk may have moved on since.
-        // Clear the change notice only if the file still holds that commit.
+        // Only a read showing a different hash is evidence of another writer.
         const { data: latest } = await apiFetch<DocData>(
           `/api/doc?uri=${encodeURIComponent(current.uri)}`
         );
-        if (latest?.source.sourceHash === data.version.sourceHash) {
-          setExternalChangeNotice(null);
-        }
+        setChangeNotice(
+          latest && latest.source.sourceHash !== data.version.sourceHash
+            ? "outside"
+            : null
+        );
       } else {
         // Written now against the loaded revision: the next change event is
         // this save's own sync, and any earlier notice is stale.
         ignoreDocEventsUntilRef.current = Date.now() + 5_000;
-        setExternalChangeNotice(null);
+        setChangeNotice(null);
       }
       const previous = committedContentRef.current;
       if (previous !== contentToSave) {
@@ -589,6 +629,18 @@ export default function DocumentEditor({ navigate }: PageProps) {
     }
   }, [cancelAutosave, content, hasUnsavedChanges, persistContent]);
 
+  // Retry the unconfirmed save itself (same content, same request ID), even
+  // when the draft has since changed or returned to the loaded text; once it
+  // is confirmed, the draft as it is then is saved on top of it.
+  const retryUnconfirmedSave = useCallback(async () => {
+    const pending = unknownSaveRef.current;
+    if (pending === null) return;
+    cancelAutosave();
+    if (await persistContent(pending)) {
+      await persistContent(draftRef.current);
+    }
+  }, [cancelAutosave, persistContent]);
+
   const loadDocument = useCallback(() => {
     const uri = currentTarget.uri;
 
@@ -637,16 +689,20 @@ export default function DocumentEditor({ navigate }: PageProps) {
       return;
     }
     handledDocEventRef.current = latestDocEvent.changedAt;
+    if (unknownSaveRef.current !== null) {
+      changedWhileUnknownRef.current = true;
+      return;
+    }
     if (Date.now() < ignoreDocEventsUntilRef.current) {
       return;
     }
-    setExternalChangeNotice(
-      "This document changed on disk. Reload before continuing."
-    );
+    setChangeNotice("outside");
   }, [doc, latestDocEvent?.changedAt, latestDocEvent?.uri]);
 
   const reloadDocument = useCallback(() => {
-    setExternalChangeNotice(null);
+    unknownSaveRef.current = null;
+    changedWhileUnknownRef.current = false;
+    setChangeNotice(null);
     loadDocument();
   }, [loadDocument]);
 
@@ -1136,10 +1192,31 @@ export default function DocumentEditor({ navigate }: PageProps) {
         </p>
       )}
 
-      {externalChangeNotice && (
+      {changeNotice === "unconfirmed" && (
+        <div className="border-amber-500/30 border-b bg-amber-500/10 px-4 py-3">
+          <div className="flex flex-wrap items-center justify-between gap-3">
+            <p className="text-amber-500 text-sm">
+              The save may have completed, but its response was lost. Retry to
+              confirm it.
+            </p>
+            <Button
+              disabled={saveStatus === "saving"}
+              onClick={retryUnconfirmedSave}
+              size="sm"
+              variant="outline"
+            >
+              Retry save
+            </Button>
+          </div>
+        </div>
+      )}
+
+      {changeNotice === "outside" && (
         <div className="border-amber-500/30 border-b bg-amber-500/10 px-4 py-3">
           <div className="flex flex-wrap items-center justify-between gap-3">
-            <p className="text-amber-500 text-sm">{externalChangeNotice}</p>
+            <p className="text-amber-500 text-sm">
+              This document changed on disk. Reload before continuing.
+            </p>
             <Button onClick={reloadDocument} size="sm" variant="outline">
               Reload
             </Button>

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

@@ -50,50 +50,10 @@ import {
   fetchServerCapabilities,
   type ServerCapabilities,
 } from "../lib/server-capabilities";
+import { renderSnippet } from "../lib/snippet";
 import { cn } from "../lib/utils";
 import { AIModelSelector, TagFacets } from "./search-page-widgets";
 
-/**
- * Render snippet with <mark> tags as highlighted spans.
- * Only allows mark tags - strips all other HTML for safety.
- */
-function renderSnippet(snippet: string): React.ReactNode {
-  const parts: React.ReactNode[] = [];
-  let remaining = snippet;
-  let key = 0;
-
-  while (remaining.length > 0) {
-    const markStart = remaining.indexOf("<mark>");
-    if (markStart === -1) {
-      parts.push(remaining);
-      break;
-    }
-
-    if (markStart > 0) {
-      parts.push(remaining.slice(0, markStart));
-    }
-
-    const markEnd = remaining.indexOf("</mark>", markStart);
-    if (markEnd === -1) {
-      parts.push(remaining.slice(markStart));
-      break;
-    }
-
-    const highlighted = remaining.slice(markStart + 6, markEnd);
-    parts.push(
-      <mark
-        className="rounded bg-primary/20 px-0.5 font-medium text-primary"
-        key={key++}
-      >
-        {highlighted}
-      </mark>
-    );
-    remaining = remaining.slice(markEnd + 7);
-  }
-
-  return parts;
-}
-
 interface PageProps {
   navigate: (to: string | number) => void;
 }

package/src/serve/resident-runtime.ts

@@ -45,9 +45,11 @@ import { JobManager } from "../core/job-manager";
 import { recordContentMutation } from "../core/mutation-generations";
 import {
   shutdownDuration,
+  RESIDENT_BUSY_TIMEOUT_MS,
   SHUTDOWN_DRAIN_MS,
   SHUTDOWN_ABORT_MS,
 } from "../core/shutdown-budget";
+import { acquireCliWriteLease } from "../core/write-lease";
 import { defaultSyncService, withContentTypeRules } from "../ingestion";
 import { withOwnedInferenceScope } from "../llm/inference-scope";
 import { getActivePreset } from "../llm/registry";
@@ -60,7 +62,7 @@ import {
   disposeServerContext,
   type ServerContext,
 } from "./context";
-import { createEmbedScheduler } from "./embed-scheduler";
+import { createEmbedScheduler, embedSchedulerIssues } from "./embed-scheduler";
 import { FindingsScheduler, type FindingsPassResult } from "./findings-pass";
 import { AdmissionController, ReaderGate } from "./resident-admission";
 import { ResidentBackgroundWork } from "./resident-background-work";
@@ -189,10 +191,25 @@ export type ResidentRuntimeDeps = {
     eventBus?: DocumentEventBus | null;
     callbacks?: CollectionWatchCallbacks;
     syncOptions?: Parameters<typeof withContentTypeRules>[0];
+    acquireWriteLease?: () => Promise<(() => Promise<void>) | null>;
   }) => CollectionWatchService;
   modelManagerFactory?: (config: Config) => ModelManager;
 };
 
+/** No-wait shared writer lease for background writes; null when held elsewhere. */
+async function acquireBackgroundWriteLease(
+  dbPath: string,
+  command: string
+): Promise<(() => Promise<void>) | null> {
+  const lease = await acquireCliWriteLease({
+    dbPath,
+    waitMs: 0,
+    noWait: true,
+    command,
+  });
+  return lease.ok ? lease.release : null;
+}
+
 export async function startResidentRuntime(
   options: ResidentRuntimeOptions = {},
   deps: ResidentRuntimeDeps = {}
@@ -274,6 +291,11 @@ export async function startResidentRuntime(
   if (!syncCollections.ok) return failStartup(syncCollections.error.message);
   const syncContexts = await store.syncContexts(initialConfig.contexts ?? []);
   if (!syncContexts.ok) return failStartup(syncContexts.error.message);
+  // SQLite busy waits block this event loop; keep each one short enough that
+  // a stop signal is still handled within the stop grace.
+  store.setBusyTimeout?.(RESIDENT_BUSY_TIMEOUT_MS);
+  const leaseFor = (command: string) => () =>
+    acquireBackgroundWriteLease(dbPath, command);
 
   let ctx: ServerContext;
   try {
@@ -322,6 +344,7 @@ export async function startResidentRuntime(
     onEmbedded: () => {
       generations.index += 1;
     },
+    acquireWriteLease: leaseFor(`gno ${mode} (background embed)`),
   });
   ctxHolder.scheduler = scheduler;
   ctxHolder.current.scheduler = scheduler;
@@ -351,8 +374,16 @@ export async function startResidentRuntime(
       },
     },
     syncOptions: withContentTypeRules({}, initialConfig),
+    acquireWriteLease: leaseFor(`gno ${mode} (watch sync)`),
   });
   watchService.start();
+  // A backlog left by `--no-embed` or an earlier run gets a pass without
+  // waiting for a file change.
+  const startupStatus = await store.getStatus({
+    embedModel: getActivePreset(initialConfig).embed,
+  });
+  if (startupStatus.ok && startupStatus.value.embeddingBacklog > 0)
+    scheduler.notifySyncComplete([]);
   ctxHolder.watchService = watchService;
   ctxHolder.current.watchService = watchService;
 
@@ -590,6 +621,7 @@ export async function startResidentRuntime(
           failed: jobs.recent.filter((job) => job.status === "failed").length,
         },
         generations: { ...generations },
+        backgroundIssues: embedSchedulerIssues(scheduler.getState()),
       });
     },
     setListenerPort(port) {

package/src/serve/resident-status.ts

@@ -1,6 +1,10 @@
 /** Safe, transport-neutral resident lifecycle status projection. */
 
-import type { ResidentStatus, RuntimeMode } from "./status-model";
+import type {
+  BackgroundIssue,
+  ResidentStatus,
+  RuntimeMode,
+} from "./status-model";
 
 const EMPTY_MODELS: ResidentStatus["models"] = {
   activeLeases: 0,
@@ -50,6 +54,7 @@ export interface ResidentStatusSnapshotInput {
   models: ResidentStatus["models"];
   jobs: ResidentStatus["jobs"];
   generations: ResidentStatus["generations"];
+  backgroundIssues?: BackgroundIssue[];
   now?: number;
 }
 
@@ -72,6 +77,13 @@ export function buildResidentStatusSnapshot(
     models: { ...input.models },
     jobs: { ...input.jobs },
     generations: { ...input.generations },
+    ...(input.backgroundIssues?.length
+      ? {
+          backgroundIssues: input.backgroundIssues.map((issue) => ({
+            ...issue,
+          })),
+        }
+      : {}),
   };
 }