@gmickel/gno 2.7.0 → 2.8.0

package/src/serve/public/components/sessions/SourcesPanel.tsx

@@ -394,8 +394,12 @@ export function SourcesPanel({
   const [notice, setNotice] = useState<{ text: string } | null>(null);
   const noticeRef = useRef<HTMLParagraphElement>(null);
   useFocusOnChange(notice, noticeRef);
+  // Bumped when the Discover button's run finishes: focus moves to its outcome.
+  const [discoveredCount, setDiscoveredCount] = useState(0);
+  const discoveryRef = useRef<HTMLDivElement>(null);
+  useFocusOnChange(discoveredCount, discoveryRef);
 
-  const discover = async () => {
+  const discover = async (focusOutcome = false) => {
     setDiscovering(true);
     const result = await sessionsApi<SessionsDiscovery>(
       "/api/sessions/discover"
@@ -403,6 +407,7 @@ export function SourcesPanel({
     setDiscovering(false);
     setDiscoverError(result.error);
     setDiscovery(result.data);
+    if (focusOutcome) setDiscoveredCount((count) => count + 1);
   };
 
   const registered = async (sourceId: string, collection: string) => {
@@ -425,7 +430,7 @@ export function SourcesPanel({
         {localClient && (
           <Button
             disabled={discovering}
-            onClick={() => void discover()}
+            onClick={() => void discover(true)}
             size="sm"
             variant="outline"
           >
@@ -473,67 +478,79 @@ export function SourcesPanel({
         </p>
       )}
 
-      {discoverError && (
-        <p className="break-words text-destructive text-sm" role="alert">
-          {discoverError}
-        </p>
-      )}
-      {discovery && (
-        <div className="space-y-3 rounded-lg border border-dashed border-border/70 p-4">
-          <h3 className="font-medium">Discovered on this machine</h3>
-          <p className="text-muted-foreground text-xs">
-            Preview only: discovery reads nothing into the archive. Register a
-            source to permit manual imports from it.
-          </p>
-          {discovery.candidates.length === 0 && (
-            <p className="text-muted-foreground text-sm">
-              No supported session stores were found.
+      {(discoverError || discovery) && (
+        <div
+          aria-label="Discovery results"
+          className={`space-y-3 ${FOCUS_RING}`}
+          ref={discoveryRef}
+          role="region"
+          tabIndex={-1}
+        >
+          {discoverError && (
+            <p className="break-words text-destructive text-sm" role="alert">
+              {discoverError}
             </p>
           )}
-          <ul className="space-y-4">
-            {discovery.candidates.map((candidate) => (
-              <li
-                className="min-w-0 space-y-2"
-                key={`${candidate.harness}:${candidate.path}`}
-              >
-                <div className="flex flex-wrap items-center gap-2">
-                  <Badge variant="secondary">
-                    {SESSION_HARNESS_LABELS[candidate.harness]}
-                  </Badge>
-                  <span className="min-w-0 break-all font-mono text-xs">
-                    {candidate.path}
-                  </span>
-                </div>
-                <p className="text-muted-foreground text-xs">
-                  {candidate.units}
-                  {candidate.truncated ? "+" : ""} units ·{" "}
-                  {formatBytes(candidate.bytes)}
-                  {candidate.formatVersions.length > 0 &&
-                    ` · format ${candidate.formatVersions.join(", ")}`}
+          {discovery && (
+            <div className="space-y-3 rounded-lg border border-dashed border-border/70 p-4">
+              <h3 className="font-medium">Discovered on this machine</h3>
+              <p className="text-muted-foreground text-xs">
+                Preview only: discovery reads nothing into the archive. Register
+                a source to permit manual imports from it.
+              </p>
+              {discovery.candidates.length === 0 && (
+                <p className="text-muted-foreground text-sm">
+                  No supported session stores were found.
                 </p>
-                {candidate.registeredAs ? (
-                  <p className="text-sm">
-                    Registered as{" "}
-                    <span className="font-mono">{candidate.registeredAs}</span>
-                  </p>
-                ) : (
-                  <RegisterForm
-                    candidate={candidate}
-                    archiveCollections={archiveCollections}
-                    onRegistered={registered}
-                  />
-                )}
-              </li>
-            ))}
-          </ul>
-          {discovery.warnings.map((warning) => (
-            <p
-              className="text-amber-800 text-xs dark:text-amber-200"
-              key={warning}
-            >
-              {warning}
-            </p>
-          ))}
+              )}
+              <ul className="space-y-4">
+                {discovery.candidates.map((candidate) => (
+                  <li
+                    className="min-w-0 space-y-2"
+                    key={`${candidate.harness}:${candidate.path}`}
+                  >
+                    <div className="flex flex-wrap items-center gap-2">
+                      <Badge variant="secondary">
+                        {SESSION_HARNESS_LABELS[candidate.harness]}
+                      </Badge>
+                      <span className="min-w-0 break-all font-mono text-xs">
+                        {candidate.path}
+                      </span>
+                    </div>
+                    <p className="text-muted-foreground text-xs">
+                      {candidate.units}
+                      {candidate.truncated ? "+" : ""} units ·{" "}
+                      {formatBytes(candidate.bytes)}
+                      {candidate.formatVersions.length > 0 &&
+                        ` · format ${candidate.formatVersions.join(", ")}`}
+                    </p>
+                    {candidate.registeredAs ? (
+                      <p className="text-sm">
+                        Registered as{" "}
+                        <span className="font-mono">
+                          {candidate.registeredAs}
+                        </span>
+                      </p>
+                    ) : (
+                      <RegisterForm
+                        candidate={candidate}
+                        archiveCollections={archiveCollections}
+                        onRegistered={registered}
+                      />
+                    )}
+                  </li>
+                ))}
+              </ul>
+              {discovery.warnings.map((warning) => (
+                <p
+                  className="text-amber-800 text-xs dark:text-amber-200"
+                  key={warning}
+                >
+                  {warning}
+                </p>
+              ))}
+            </div>
+          )}
         </div>
       )}
     </section>

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

@@ -801,12 +801,14 @@ export default function Dashboard({ navigate }: PageProps) {
                         <div className="truncate font-medium text-lg transition-colors group-hover:text-primary">
                           {collection.name}
                         </div>
-                        <div
-                          className="truncate font-mono text-muted-foreground text-sm"
-                          title={collection.path}
-                        >
-                          {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 shrink-0 items-center gap-3 text-right">

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

@@ -83,6 +83,8 @@ interface GraphLink {
     resolution:
       | "exact-title"
       | "exact-path"
+      | "exact-name"
+      | "tie-break"
       | "path-fallback"
       | "ambiguous-fallback"
       | "similarity";

package/src/serve/resident-runtime.ts

@@ -377,6 +377,13 @@ export async function startResidentRuntime(
     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;
 

package/src/serve/routes/changes.ts

@@ -79,7 +79,12 @@ export async function handleImpact(
 ): Promise<Response> {
   const ref = url.searchParams.get("ref")?.trim();
   if (!ref) return errorResponse("VALIDATION", "ref is required");
-  const input: KnowledgeImpactInput = {};
+  const collections = url.searchParams
+    .getAll("collection")
+    .map((value) => value.trim())
+    .filter(Boolean);
+  const input: KnowledgeImpactInput =
+    collections.length > 0 ? { collections } : {};
   for (const [queryName, inputName] of [
     ["maxDepth", "maxDepth"],
     ["maxNodes", "maxNodes"],

package/src/serve/routes/links.ts

@@ -34,6 +34,8 @@ export interface LinkResponse {
     resolvedUri?: string;
     /** Resolved target title (if found) */
     resolvedTitle?: string;
+    /** Collection of the resolved target (may differ from the source's) */
+    resolvedCollection?: string;
   }>;
   meta: {
     docid: string;
@@ -49,6 +51,8 @@ export interface BacklinkResponse {
     sourceDocid: string;
     sourceUri: string;
     sourceTitle?: string;
+    /** Collection of the linking document */
+    sourceCollection?: string;
     linkText?: string;
     startLine: number;
     startCol: number;
@@ -189,6 +193,11 @@ export async function handleDocLinks(
       targetRefNorm: l.targetRefNorm,
       targetCollection: l.targetCollection || doc.collection,
       linkType: l.linkType,
+      source: {
+        collection: doc.collection,
+        relPath: doc.relPath,
+        explicit: Boolean(l.targetCollection),
+      },
     }))
   );
   const resolutionAvailable = resolvedResult.ok;
@@ -217,6 +226,9 @@ export async function handleDocLinks(
             resolvedDocid: resolved.docid,
             resolvedUri: resolved.uri,
             resolvedTitle: resolved.title ?? undefined,
+            ...(resolved.collection && {
+              resolvedCollection: resolved.collection,
+            }),
           }),
         }),
       };
@@ -273,6 +285,7 @@ export async function handleDocBacklinks(
     backlinks: backlinks.map((b) => ({
       sourceDocid: b.sourceDocid,
       sourceUri: b.sourceDocUri,
+      ...(b.sourceCollection && { sourceCollection: b.sourceCollection }),
       ...(b.sourceDocTitle && { sourceTitle: b.sourceDocTitle }),
       ...(b.linkText && { linkText: b.linkText }),
       startLine: b.startLine,

package/src/serve/routes/sessions.ts

@@ -16,7 +16,6 @@ import type { SqliteAdapter } from "../../store/sqlite/adapter";
 import type { RequestPeerServer } from "../request-locality";
 import type { ContextHolder } from "./api";
 
-import { getIndexDbPath } from "../../app/constants";
 import { getConfigPaths, loadConfig } from "../../config";
 import { withContentTypeRules } from "../../ingestion";
 import {
@@ -28,8 +27,14 @@ import {
   runAutomationProfile,
   setAutomationProfile,
 } from "../../sessions/automation";
-import { assertSessionBinding } from "../../sessions/binding";
 import { SessionSourceSchema, watchedCollections } from "../../sessions/config";
+import {
+  adoptServedConfig,
+  assertInstanceBinding as assertConfigBinding,
+  readInstanceConfig,
+  refreshServedConfig,
+  type ServedSessionsConfig,
+} from "../../sessions/config-refresh";
 import { importInChildProcess } from "../../sessions/import-child";
 import { SessionsService } from "../../sessions/service";
 import {
@@ -42,6 +47,7 @@ import {
   type SessionHarness,
   type SessionImportReceipt,
   remoteSafeSessionsError,
+  SessionsError,
   type SessionsErrorCode,
   SESSIONS_VALIDATION_CODES,
 } from "../../sessions/types";
@@ -185,15 +191,11 @@ function instanceIdentity(ctxHolder: ContextHolder): {
 }
 
 /** Refuse an archive config opened against a different index (and vice versa). */
-async function assertInstanceBinding(ctxHolder: ContextHolder): Promise<void> {
-  const { configPath, indexName } = instanceIdentity(ctxHolder);
-  if (!ctxHolder.config.sessions) return;
-  await assertSessionBinding({
-    config: ctxHolder.config,
-    configPath,
-    indexName,
-    dbPath: getIndexDbPath(indexName),
-  });
+function assertInstanceBinding(
+  ctxHolder: ContextHolder,
+  config: Config = ctxHolder.config
+): Promise<void> {
+  return assertConfigBinding(instanceIdentity(ctxHolder), config);
 }
 
 /** Service over the instance's own config/index pair, binding checked. */
@@ -211,44 +213,72 @@ async function archiveService(
   });
 }
 
+/** This instance's served config, as the shared config refresh sees it. */
+function servedConfig(
+  ctxHolder: ContextHolder,
+  store: SqliteAdapter
+): ServedSessionsConfig {
+  return {
+    ...instanceIdentity(ctxHolder),
+    store,
+    config: ctxHolder.config,
+    setConfig: (config) => {
+      ctxHolder.config = config;
+      ctxHolder.current = { ...ctxHolder.current, config };
+      ctxHolder.watchService?.updateCollections(
+        watchedCollections(config),
+        withContentTypeRules({}, config)
+      );
+    },
+    invalidateEgressPolicy: async () => {
+      await ctxHolder.invalidateEgressPolicy?.();
+    },
+    markContentMutation: () => ctxHolder.markContentMutation?.(),
+    markIndexMutation: () => ctxHolder.markIndexMutation?.(),
+  };
+}
+
 /**
  * Adopt a config the sessions service already persisted: project collections
  * and contexts into the open store, swap the in-memory context, and refresh
- * the watcher, egress policy and mutation generations (same sequence as the
- * config-sync route helpers).
+ * the watcher, egress policy and mutation generations.
  */
-async function adoptConfig(
+function adoptConfig(
   ctxHolder: ContextHolder,
   store: SqliteAdapter,
   config: Config
 ): Promise<void> {
-  const collections = await store.syncCollections(config.collections);
-  if (!collections.ok) {
-    throw new Error(
-      `Config saved but collection sync failed: ${collections.error.message}`
-    );
-  }
-  const contexts = await store.syncContexts(config.contexts ?? []);
-  if (!contexts.ok) {
-    throw new Error(
-      `Config saved but context sync failed: ${contexts.error.message}`
-    );
-  }
-  ctxHolder.config = config;
-  ctxHolder.current = { ...ctxHolder.current, config };
-  ctxHolder.watchService?.updateCollections(
-    watchedCollections(config),
-    withContentTypeRules({}, config)
-  );
-  await ctxHolder.invalidateEgressPolicy?.();
-  ctxHolder.markContentMutation?.();
-  ctxHolder.markIndexMutation?.();
+  return adoptServedConfig(servedConfig(ctxHolder, store), config);
+}
+
+/** Read this instance's config file, binding checked (see readInstanceConfig). */
+function readConfigFile(ctxHolder: ContextHolder): Promise<Config> {
+  return readInstanceConfig(instanceIdentity(ctxHolder));
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Handlers
 // ─────────────────────────────────────────────────────────────────────────────
 
+/**
+ * Adopt the config file when it changed underneath the running server, for
+ * example after `gno sessions source add/remove` on the same pair. Runs
+ * before the status read is admitted: adopting new collections moves the
+ * authorization epoch, which would void a read already in flight. Returns an
+ * error response, or null when the served config is current.
+ */
+export async function refreshSessionsConfig(
+  ctxHolder: ContextHolder,
+  store: SqliteAdapter
+): Promise<Response | null> {
+  try {
+    await refreshServedConfig(servedConfig(ctxHolder, store));
+    return null;
+  } catch (error) {
+    return sessionsErrorResponse(error);
+  }
+}
+
 /** GET /api/sessions/status */
 export async function handleSessionsStatus(
   ctxHolder: ContextHolder
@@ -427,8 +457,22 @@ export async function handleSessionsRemoveSource(
   try {
     const { configPath } = instanceIdentity(ctxHolder);
     await assertInstanceBinding(ctxHolder);
-    const config = await removeSessionSource({ configPath, id });
-    await adoptConfig(ctxHolder, store, config);
+    const config = await removeSessionSource({ configPath, id }).catch(
+      (error: unknown) => {
+        // Already unregistered (for example from the CLI): the goal holds.
+        if (
+          error instanceof SessionsError &&
+          error.code === "SESSIONS_UNKNOWN_SOURCE"
+        ) {
+          return readConfigFile(ctxHolder);
+        }
+        throw error;
+      }
+    );
+    // A no-op remove leaves the served config current; adopting it anyway
+    // would reset the egress policy under concurrent reads.
+    if (!Bun.deepEquals(config, ctxHolder.config))
+      await adoptConfig(ctxHolder, store, config);
   } catch (error) {
     return sessionsErrorResponse(error);
   }

package/src/serve/server.ts

@@ -116,6 +116,7 @@ import {
   handleSessionsInit,
   handleSessionsRemoveSource,
   handleSessionsStatus,
+  refreshSessionsConfig,
 } from "./routes/sessions";
 
 /** `/api/sessions/automation/:id[/...]` path parameter. */
@@ -861,9 +862,10 @@ export async function startServer(
         "/api/sessions/status": {
           GET: async (req: Request) =>
             withSecurityHeaders(
-              await handleResidentRead(runtime as ResidentRuntime, req, () =>
-                handleSessionsStatus(ctxHolder)
-              ),
+              (await refreshSessionsConfig(ctxHolder, store)) ??
+                (await handleResidentRead(runtime as ResidentRuntime, req, () =>
+                  handleSessionsStatus(ctxHolder)
+                )),
               isDev
             ),
         },

package/src/serve/status-model.ts

@@ -18,9 +18,13 @@ export type HealthActionKind =
 
 export type OnboardingStepStatus = "complete" | "current" | "upcoming";
 
+/**
+ * Host path fields below (`path`, `configPath`, `dbPath`) reach same-host
+ * callers only; a remote caller's response omits them.
+ */
 export interface StatusCollection {
   name: string;
-  path: string;
+  path?: string;
   documentCount: number;
   chunkCount: number;
   embeddedCount: number;
@@ -28,7 +32,7 @@ export interface StatusCollection {
 
 export interface SuggestedCollection {
   label: string;
-  path: string;
+  path?: string;
   reason: string;
 }
 
@@ -167,7 +171,7 @@ export interface BootstrapState {
     summary: string;
   };
   cache: {
-    path: string;
+    path?: string;
     totalSizeBytes: number;
     totalSizeLabel: string;
   };
@@ -183,7 +187,7 @@ export interface BootstrapState {
       role: "embed" | "rerank" | "expand" | "gen";
       uri: string;
       cached: boolean;
-      path: string | null;
+      path?: string | null;
       sizeBytes: number | null;
       statusLabel: string;
     }>;
@@ -194,8 +198,8 @@ export interface AppStatusResponse {
   chunking?: ChunkingStatus;
   resident: ResidentStatus;
   indexName: string;
-  configPath: string;
-  dbPath: string;
+  configPath?: string;
+  dbPath?: string;
   collections: StatusCollection[];
   totalDocuments: number;
   totalChunks: number;

package/src/serve/status.ts

@@ -95,11 +95,6 @@ function summarizeCount(
   return `${count} ${count === 1 ? singular : plural}`;
 }
 
-function toDisplayPath(path: string): string {
-  const home = homedir();
-  return path.startsWith(home) ? `~${path.slice(home.length)}` : path;
-}
-
 function extractEstimatedFootprint(name: string): string | null {
   const match = name.match(SIZE_REGEX);
   return match ? match[0] : null;
@@ -432,11 +427,11 @@ async function buildDiskCheck(
       title: "Disk",
       status: "warn",
       summary: "Disk space could not be inspected",
-      detail: `GNO could not read filesystem capacity near ${toDisplayPath(getModelsCachePath())}.`,
+      detail: "GNO could not read filesystem capacity for the model cache.",
     };
   }
 
-  const summary = `${formatBytes(snapshot.freeBytes)} free near ${toDisplayPath(snapshot.path)}`;
+  const summary = `${formatBytes(snapshot.freeBytes)} free for the model cache`;
 
   if (snapshot.freeBytes < DISK_ERROR_BYTES) {
     return {