@lapis-notes/api 0.1.4 → 0.2.0

package/dist/configuration.svelte.js

@@ -1,8 +1,10 @@
-import { z } from "zod";
+import { z } from "zod/v3";
 import { SettingTab } from "./settings.svelte";
 import { cloneDeep, isEqual } from "lodash-es";
 import { EventDispatcher } from "./events";
-import { dirname } from "./storage";
+import { dirname, normalizePath } from "./storage";
+import { TFile } from "./storage/fs";
+import { FileTextStateWriter } from "./file-text-state-writer";
 function isRecoverableConfigurationReadError(error) {
     let current = error;
     while (current) {
@@ -626,6 +628,9 @@ export class Configuration extends EventDispatcher {
     basePath;
     values = $state({});
     loaded = false;
+    stateBaseline = null;
+    stateWriter;
+    updateTail = Promise.resolve();
     schema = new ConfigurationSchema();
     constructor(app, basePath) {
         super();
@@ -647,49 +652,60 @@ export class Configuration extends EventDispatcher {
         return cloneDeep(pluginData[pluginId]);
     }
     async updatePluginData(pluginId, value, options = {}) {
-        const prev = this.getPluginData(pluginId);
-        const pluginData = this.getPluginDataStore(this.values);
-        const nextPluginData = {
-            ...pluginData,
-            [pluginId]: cloneDeep(value),
-        };
-        const next = { ...this.values, pluginData: nextPluginData };
-        await this.persist(next);
-        this.emit("plugin-data-updated", {
-            pluginId,
-            value: this.getPluginData(pluginId),
-            prev,
-            origin: options.origin ?? "configuration-update",
+        const captured = cloneDeep(value);
+        return this.change(() => {
+            const prev = this.getPluginData(pluginId);
+            const pluginData = {
+                ...this.getPluginDataStore(this.values),
+                [pluginId]: captured,
+            };
+            return {
+                data: { ...this.values, pluginData },
+                notify: () => this.emit("plugin-data-updated", {
+                    pluginId,
+                    value: this.getPluginData(pluginId),
+                    prev,
+                    origin: options.origin ?? "configuration-update",
+                }),
+            };
         });
     }
     async removePluginData(pluginId, options = {}) {
-        const pluginData = this.getPluginDataStore(this.values);
-        if (!Object.hasOwn(pluginData, pluginId)) {
-            return;
-        }
-        const prev = cloneDeep(pluginData[pluginId]);
-        const nextPluginData = { ...pluginData };
-        delete nextPluginData[pluginId];
-        const next = { ...this.values };
-        if (Object.keys(nextPluginData).length > 0) {
-            next.pluginData = nextPluginData;
-        }
-        else {
-            delete next.pluginData;
-        }
-        await this.persist(next);
-        this.emit("plugin-data-updated", {
-            pluginId,
-            value: undefined,
-            prev,
-            origin: options.origin ?? "configuration-update",
+        return this.change(() => {
+            const pluginData = this.getPluginDataStore(this.values);
+            if (!Object.hasOwn(pluginData, pluginId))
+                return;
+            const prev = cloneDeep(pluginData[pluginId]);
+            const nextPluginData = { ...pluginData };
+            delete nextPluginData[pluginId];
+            const next = { ...this.values };
+            if (Object.keys(nextPluginData).length)
+                next.pluginData = nextPluginData;
+            else
+                delete next.pluginData;
+            return {
+                data: next,
+                notify: () => this.emit("plugin-data-updated", {
+                    pluginId,
+                    value: undefined,
+                    prev,
+                    origin: options.origin ?? "configuration-update",
+                }),
+            };
         });
     }
     async reloadFromDisk(options = {}) {
+        if (this.stateWriter?.dirty)
+            return;
         const previousValues = cloneDeep(this.values);
-        this.values = await this.readValuesFromDisk();
+        const loaded = await this.readValuesFromDisk();
+        if (this.stateWriter &&
+            !this.stateWriter.acceptBaseline(this.stateBaseline))
+            return;
+        this.values = loaded;
         this.loaded = true;
-        await this.materializeSchemaDefaults();
+        if (options.materializeDefaults !== false)
+            await this.materializeSchemaDefaults();
         if (options.emitPluginDataEvents !== false) {
             this.emitPluginDataDiffs(previousValues, this.values, options.origin ?? "external-reload");
         }
@@ -747,38 +763,98 @@ export class Configuration extends EventDispatcher {
     async updateConfigurationOptions(changes) {
         const validated = Object.entries(changes).map(([key, value]) => ({
             key,
-            value: this.schema.validateConfigurationOption(key, value),
+            value: cloneDeep(this.schema.validateConfigurationOption(key, value)),
         }));
-        const changed = validated
-            .map(({ key, value }) => ({
-            key,
-            value,
-            prev: this.values[key],
-        }))
-            .filter(({ value, prev }) => !isEqual(value, prev));
-        if (changed.length === 0)
-            return;
-        const next = { ...this.values };
-        for (const { key, value } of changed) {
-            next[key] = cloneDeep(value);
-        }
-        await this.persist(next);
-        for (const { key, value, prev } of changed) {
-            this.emit("updated", {
+        return this.change(() => {
+            const changed = validated
+                .map(({ key, value }) => ({
                 key,
-                value: cloneDeep(value),
-                prev: cloneDeep(prev),
-            });
-        }
+                value,
+                prev: this.values[key],
+            }))
+                .filter(({ value, prev }) => !isEqual(value, prev));
+            if (changed.length === 0)
+                return;
+            const next = { ...this.values };
+            for (const { key, value } of changed) {
+                next[key] = cloneDeep(value);
+            }
+            return {
+                data: next,
+                notify: () => {
+                    for (const { key, value, prev } of changed)
+                        this.emit("updated", {
+                            key,
+                            value: cloneDeep(value),
+                            prev: cloneDeep(prev),
+                        });
+                },
+            };
+        });
     }
     async removeConfigurationOption(key) {
-        const value = this.values[key];
-        if (value !== undefined) {
+        return this.change(() => {
+            const value = this.values[key];
+            if (value === undefined)
+                return;
             const next = { ...this.values };
             delete next[key];
-            await this.persist(next);
-            this.emit("updated", { key, prev: value, value: undefined });
+            return {
+                data: next,
+                notify: () => this.emit("updated", { key, prev: value, value: undefined }),
+            };
+        });
+    }
+    getStateWriter() {
+        if (this.stateWriter)
+            return this.stateWriter;
+        const file = this.app.vault.getFileByPath(this.basePath) ??
+            new TFile(normalizePath(this.basePath), { ctime: 0, mtime: 0, size: 0 }, null);
+        this.stateWriter = new FileTextStateWriter(this.app, file, this.stateBaseline, (text) => {
+            const next = JSON.parse(text || "{}");
+            if (!next || typeof next !== "object" || Array.isArray(next))
+                throw new Error("Invalid app configuration record");
+            const previous = this.values;
+            this.values = next;
+            this.emitPluginDataDiffs(previous, next, "external-reload");
+            for (const key of new Set([
+                ...Object.keys(previous),
+                ...Object.keys(next),
+            ])) {
+                if (!isEqual(previous[key], next[key]))
+                    this.emit("updated", {
+                        key,
+                        prev: previous[key],
+                        value: next[key],
+                    });
+            }
+        });
+        return this.stateWriter;
+    }
+    change(calculate) {
+        if (this.app.vault.supportsConditionalTextWrites) {
+            return this.getStateWriter().update(() => {
+                const change = calculate();
+                if (!change)
+                    return;
+                return {
+                    contents: JSON.stringify(change.data, null, 2),
+                    onSaved: () => {
+                        this.values = change.data;
+                        change.notify?.();
+                    },
+                };
+            });
         }
+        const run = this.updateTail.then(async () => {
+            const change = calculate();
+            if (!change)
+                return;
+            await this.persist(change.data);
+            change.notify?.();
+        });
+        this.updateTail = run.catch(() => { });
+        return run;
     }
     async persist(data) {
         const file = this.app.vault.getFileByPath(this.basePath);
@@ -803,10 +879,12 @@ export class Configuration extends EventDispatcher {
     async readValuesFromDisk() {
         const file = this.app.vault.getFileByPath(this.basePath);
         if (!file) {
+            this.stateBaseline = null;
             return {};
         }
         try {
             const contents = await this.app.vault.read(file);
+            this.stateBaseline = contents;
             const data = JSON.parse(contents);
             if (typeof data === "object" && data !== null && !Array.isArray(data)) {
                 return data;
@@ -856,32 +934,29 @@ export class Configuration extends EventDispatcher {
         if (!this.loaded) {
             return;
         }
-        const next = { ...this.values };
-        let changed = false;
-        for (const [key, defaultValue] of this.schema.getDefaultEntries()) {
-            if (!(key in next) || next[key] === undefined) {
-                next[key] = cloneDeep(defaultValue);
-                changed = true;
-                continue;
-            }
-            try {
-                const validated = this.schema.validateConfigurationOption(key, next[key]);
-                if (!isEqual(validated, next[key])) {
-                    next[key] = validated;
+        return this.change(() => {
+            const next = { ...this.values };
+            let changed = false;
+            for (const [key, defaultValue] of this.schema.getDefaultEntries()) {
+                if (!(key in next) || next[key] === undefined) {
+                    next[key] = cloneDeep(defaultValue);
+                    changed = true;
+                    continue;
+                }
+                try {
+                    const validated = this.schema.validateConfigurationOption(key, next[key]);
+                    if (!isEqual(validated, next[key])) {
+                        next[key] = validated;
+                        changed = true;
+                    }
+                }
+                catch (error) {
+                    console.warn(`Invalid configuration value for ${key}; restoring default.`, error);
+                    next[key] = cloneDeep(defaultValue);
                     changed = true;
                 }
             }
-            catch (error) {
-                console.warn(`Invalid configuration value for ${key}; restoring default.`, error);
-                next[key] = cloneDeep(defaultValue);
-                changed = true;
-            }
-        }
-        if (changed) {
-            await this.persist(next);
-        }
-        else {
-            this.values = next;
-        }
+            return changed ? { data: next } : undefined;
+        });
     }
 }

package/dist/context.svelte.d.ts

@@ -1,3 +1,5 @@
+import type { IconRegistry } from "./icons/registry";
+import type { NativeTasks, NativeTasksSession } from "./native-tasks";
 import { Workspace } from "./workspace.svelte";
 import { TFile, Vault, type AppDatabase, type DataAdapter, type VaultSession } from "./storage";
 import { AppSettings } from "./settings.svelte";
@@ -6,12 +8,16 @@ import { PluginManager } from "./plugin-manager";
 import { Configuration } from "./configuration.svelte";
 import { CommandManager, Keymap, Scope, type UserEvent } from "./command.svelte";
 import { MetadataCache } from "./cache.svelte";
+import type { NativeBackgroundIndexingObserver } from "./native-background-indexing";
+import type { NativeHistoryIndex } from "./native-history-index";
+import type { NativeEditingIntents } from "./native-editing-intents";
 import type { MarkdownDirectiveRenderer, MarkdownPostProcessor, MarkdownViewMenuItemProvider } from "./markdown";
 import { type Logger } from "./logging";
 import type { Component } from "./view.svelte";
 import { MetadataTypeManager } from "./metadata.svelte";
 import type { EditorSuggest } from "./suggest";
 import { FileManager } from "./file-manager";
+import { VaultChangeService } from "./vault-changes";
 import { EmbedRegistry } from "./embed-registry";
 import type { OpenViewState } from "./workspace.svelte";
 import { LocalizationManager } from "./localization-manager.svelte";
@@ -26,6 +32,7 @@ import { DefaultPluginDistributionManager, type DefaultPluginDistributionManager
 import type { PluginDependencyResolverFactory } from "./plugin-dependency-resolver";
 import type { PluginAssetServer } from "./plugin-asset-server";
 import { SearchDocumentProviderRegistry } from "./search-document-provider";
+import { SearchResultProviderRegistry } from "./search-result-provider";
 import { DailyDocumentProviderRegistry } from "./daily-document-provider";
 import { AppToolRegistry } from "./agent-tools";
 import { MarkdownExtensionRegistry } from "./markdown-extension-registry";
@@ -55,14 +62,19 @@ export interface AppWorkspaceShellProperties {
  */
 export type AppStateProperties = {
     version: string;
-    configPath: string;
+    configPath?: string;
     adapter?: DataAdapter;
     session?: VaultSession;
+    nativeHistoryIndex?: NativeHistoryIndex;
+    nativeEditingIntents?: NativeEditingIntents;
+    nativeTasks?: NativeTasks;
     appDatabase?: AppDatabase;
     safeMode?: AppSafeModeState;
     createCommunityPluginDependencyResolver?: PluginDependencyResolverFactory;
     pluginAssetServer?: PluginAssetServer;
     pluginDistributionOptions?: AppPluginDistributionOptions;
+    /** Host restrictions apply to discovery, installation and external loading. */
+    unavailablePlugins?: DefaultPluginDistributionManagerOptions["unavailablePlugins"];
     /** Host-owned Nostr account, keychain, and remote-signer implementation. */
     nostrSignerBroker?: NostrSignerBroker;
     syncHost?: SyncHostServiceOptions;
@@ -70,8 +82,8 @@ export type AppStateProperties = {
     markdownRenderer: (markdown: string, el: HTMLElement, sourcePath: string, component: Component) => Promise<void>;
 };
 /** Renderer-safe application properties exposed to plugins and views. */
-export type AppPublicProperties = Pick<AppStateProperties, "version" | "configPath" | "workspaceShell" | "markdownRenderer">;
-export type AppPluginDistributionOptions = Omit<DefaultPluginDistributionManagerOptions, "adapter" | "appVersion" | "platform" | "workspaceTrusted" | "pluginManager">;
+export type AppPublicProperties = Pick<AppStateProperties, "version" | "configPath" | "workspaceShell" | "markdownRenderer"> & { configPath: string };
+export type AppPluginDistributionOptions = Omit<DefaultPluginDistributionManagerOptions, "adapter" | "appVersion" | "platform" | "workspaceTrusted" | "pluginManager" | "unavailablePlugins">;
 export type ExtType = Extension | ((context: Record<string, any>) => Extension);
 /**
  * Details about the last startup failure that caused safe mode to activate.
@@ -156,10 +168,13 @@ export declare class SecretStorage {
 export declare class App {
     readonly props: AppPublicProperties;
     readonly i18n: LocalizationManager;
+    readonly icons: IconRegistry;
     readonly workspace: Workspace;
     readonly vault: Vault;
     readonly appDatabase: AppDatabase;
     readonly session?: VaultSession;
+    readonly nativeHistoryIndex?: NativeHistoryIndex;
+    readonly nativeTasks?: NativeTasksSession;
     readonly safeMode: AppSafeModeState;
     plugins: PluginManager;
     scope: Scope;
@@ -169,6 +184,7 @@ export declare class App {
     readonly editorSuggest: Map<string, Set<EditorSuggest<any>>>;
     readonly configuration: Configuration;
     readonly fileManager: FileManager;
+    readonly vaultChanges: VaultChangeService;
     readonly contextKeys: ContextKeyService;
     readonly statusBar: StatusBarManager;
     readonly urls: AppUrlService;
@@ -184,8 +200,10 @@ export declare class App {
     settingsOpen: boolean;
     settingsTabId: string | null;
     metadataCache: MetadataCache;
+    get backgroundIndexing(): NativeBackgroundIndexingObserver | undefined;
     embedRegistry: EmbedRegistry;
     readonly searchDocumentProviders: SearchDocumentProviderRegistry;
+    readonly searchResultProviders: SearchResultProviderRegistry;
     readonly dailyDocumentProviders: DailyDocumentProviderRegistry;
     readonly indexProjections: import("./storage/index-projection").IndexProjectionRegistry;
     readonly agentTools: AppToolRegistry;

package/dist/context.svelte.js

@@ -1,15 +1,20 @@
+import { IconRegistry } from "./icons/registry";
+import { FILES_CONFIGURATION_SCHEMA } from "./files-configuration";
+import { DEFAULT_VAULT_EXCLUDES } from "./storage/vault-listing";
 import { Workspace } from "./workspace.svelte";
-import { getAdapterVaultId, TFile, Vault, } from "./storage";
+import { getAdapterVaultId, isNativeDesktopRuntime, appStatePath, TFile, Vault, } from "./storage";
 import { IndexProjectionRegistry } from "./storage/index-projection";
 import { AppSettings } from "./settings.svelte";
 import { NativeDesktopCommunityPluginExecutionHost, PluginManager, } from "./plugin-manager";
 import { hasNativeDesktopCapability } from "./storage/desktop-native";
 import { Configuration } from "./configuration.svelte";
 import { CommandManager, Keymap, Scope, } from "./command.svelte";
+import { NativeTasksSession } from "./native-tasks";
 import { MetadataCache } from "./cache.svelte";
 import { logging } from "./logging";
 import { MetadataTypeManager } from "./metadata.svelte";
 import { FileManager } from "./file-manager";
+import { VaultChangeService } from "./vault-changes";
 import { EmbedRegistry } from "./embed-registry";
 import { findOpenFileLeaf, leafFilePath, applyOpenViewStateToLeaf, } from "./open-file";
 import { LocalizationManager, localeManager, } from "./localization-manager.svelte";
@@ -29,6 +34,7 @@ import { resolveMetadataFieldValuesAsync } from "./configuration-option-source-p
 import { flushWorkspaceEditors } from "./sync-editor-flush";
 import { FileEditingSessionRegistry } from "./file-editing-sessions";
 import { SearchDocumentProviderRegistry } from "./search-document-provider";
+import { SearchResultProviderRegistry } from "./search-result-provider";
 import { DailyDocumentProviderRegistry } from "./daily-document-provider";
 import { AppToolRegistry } from "./agent-tools";
 import { AppSkillRegistry, AppSlashCommandRegistry } from "./agent-skills";
@@ -129,10 +135,13 @@ export class SecretStorage {
 export class App {
     props;
     i18n = localeManager;
+    icons = new IconRegistry();
     workspace;
     vault = $state();
     appDatabase;
     session;
+    nativeHistoryIndex;
+    nativeTasks;
     safeMode;
     plugins = $state();
     scope = $state(new Scope(undefined, this));
@@ -142,6 +151,7 @@ export class App {
     editorSuggest = new Map();
     configuration;
     fileManager = new FileManager(this);
+    vaultChanges = new VaultChangeService(this);
     contextKeys = new ContextKeyService();
     statusBar = new StatusBarManager();
     urls = new AppUrlService(this);
@@ -158,9 +168,13 @@ export class App {
     settingsOpen = $state(false);
     settingsTabId = $state(null);
     metadataCache = $state();
+    get backgroundIndexing() {
+        return this.metadataCache.backgroundIndexing;
+    }
     embedRegistry = new EmbedRegistry();
     configurationOptionSources = new ConfigurationOptionSourceRegistry();
     searchDocumentProviders = new SearchDocumentProviderRegistry();
+    searchResultProviders = new SearchResultProviderRegistry();
     dailyDocumentProviders = new DailyDocumentProviderRegistry();
     indexProjections = new IndexProjectionRegistry();
     agentTools = new AppToolRegistry();
@@ -169,7 +183,7 @@ export class App {
     agentResultViews = new AppResultViewRegistry();
     markdownExtensions = new MarkdownExtensionRegistry();
     markdownFileSurfaces = new MarkdownFileSurfaceRegistry();
-    fileEditingSessions = new FileEditingSessionRegistry();
+    fileEditingSessions;
     lastEvent = $state(null);
     renderContext = new RenderContext();
     secretStorage = new SecretStorage();
@@ -195,7 +209,7 @@ export class App {
     constructor(props) {
         this.props = Object.freeze({
             version: props.version,
-            configPath: props.configPath,
+            configPath: props.configPath ?? appStatePath("app.json"),
             workspaceShell: props.workspaceShell,
             markdownRenderer: props.markdownRenderer,
         });
@@ -205,6 +219,9 @@ export class App {
             throw new Error("App requires a vault adapter or vault session");
         }
         this.session = props.session;
+        this.fileEditingSessions = new FileEditingSessionRegistry(props.nativeEditingIntents ?? props.session?.nativeEditingIntents);
+        this.nativeHistoryIndex =
+            props.nativeHistoryIndex ?? props.session?.nativeHistoryIndex;
         this.safeMode = props.safeMode ?? createDefaultAppSafeModeState();
         const appDatabase = props.session?.appDatabase ?? props.appDatabase;
         if (!appDatabase) {
@@ -229,9 +246,18 @@ export class App {
         this.settings.addGroup((options) => options.setId("options").setTitle("Options"));
         this.settings.addGroup((options) => options.setId("core-plugins").setTitle("Core plugins"));
         this.settings.addGroup((options) => options.setId("community-plugins").setTitle("Community plugins"));
-        this.configuration = new Configuration(this, props.configPath);
+        this.configuration = new Configuration(this, this.props.configPath);
+        this.configuration.schema.register(FILES_CONFIGURATION_SCHEMA);
         this.workspace.bindConfiguration();
-        this.vault = new Vault(adapter);
+        this.vault = new Vault(adapter, this.fileEditingSessions, {
+            listingExclusions: () => this.configuration
+                .getConfiguration()
+                .get("files.exclude", DEFAULT_VAULT_EXCLUDES),
+        });
+        this.configuration.on("updated", ({ key }) => {
+            if (key === "files.exclude")
+                this.vault.trigger("load");
+        });
         this.#syncHost = new SyncHostService(this.appDatabase, this.vault, Date.now, {
             ...props.syncHost,
             flushOpenEditor: (path) => flushWorkspaceEditors(this.workspace, path),
@@ -239,13 +265,21 @@ export class App {
         hostSyncServices.set(this, this.#syncHost);
         this.workspaceTrust = new WorkspaceTrustService(adapter);
         this.metadataCache = new MetadataCache(this);
+        const nativeTasks = props.session?.nativeTasks ?? props.nativeTasks;
+        this.nativeTasks = nativeTasks
+            ? new NativeTasksSession(nativeTasks, () => {
+                const state = this.plugins?.plugins.get("tasks")?.state;
+                return state === "enabled" || state === "enabling";
+            })
+            : undefined;
         installVaultMaintenanceCommands(this);
-        this.plugins = new PluginManager(this, "/.obsidian/plugins", adapter, {
+        this.plugins = new PluginManager(this, "/" + appStatePath("plugins"), adapter, {
             communityPluginHost: hasNativeDesktopCapability("plugin-sidecar")
                 ? new NativeDesktopCommunityPluginExecutionHost(adapter, undefined, props.createCommunityPluginDependencyResolver)
                 : undefined,
             createCommunityPluginDependencyResolver: props.createCommunityPluginDependencyResolver,
             pluginAssetServer: props.pluginAssetServer,
+            unavailablePlugins: props.unavailablePlugins,
             createSyncHostCapabilities: (pluginId, grants) => this.#syncHost.forPlugin(pluginId, grants),
             revokeSyncHostCapabilities: (pluginId) => this.#syncHost.revokePlugin(pluginId),
         });
@@ -263,7 +297,10 @@ export class App {
             ...props.pluginDistributionOptions,
             adapter,
             appVersion: this.version,
-            platform: props.session?.runtime === "deno-desktop" ? "desktop" : "web",
+            unavailablePlugins: props.unavailablePlugins,
+            platform: isNativeDesktopRuntime(props.session?.runtime)
+                ? "desktop"
+                : "web",
             workspaceTrusted: async () => (await this.workspaceTrust.ready()).trusted,
             pluginManager: this.plugins,
         });
@@ -319,17 +356,21 @@ export class App {
                             ? view.editor
                             : undefined;
                     });
-                    openEditor?.view.dispatch({
-                        changes: [...edits]
-                            .sort((left, right) => left.from - right.from)
-                            .map((edit) => ({
-                            from: edit.from,
-                            to: edit.to,
-                            insert: edit.insert,
-                        })),
-                        userEvent: "input.complete",
-                    });
-                    await this.vault.modify(file, value);
+                    if (openEditor) {
+                        openEditor.view.dispatch({
+                            changes: [...edits]
+                                .sort((left, right) => left.from - right.from)
+                                .map((edit) => ({
+                                from: edit.from,
+                                to: edit.to,
+                                insert: edit.insert,
+                            })),
+                            userEvent: "input.complete",
+                        });
+                        await openEditor.flushChanges();
+                    }
+                    else
+                        await this.vault.modify(file, value);
                 }
             }
         }
@@ -403,16 +444,18 @@ export class App {
             const existingLeaf = findOpenFileLeaf(this.workspace, file);
             if (existingLeaf) {
                 span.setAttribute("workspace.file_already_open", true);
-                await applyOpenViewStateToLeaf(existingLeaf, openState);
                 this.workspace.activateLeaf(existingLeaf, {
                     operation: "open-existing-file",
                 });
+                await this.workspace.revealLeaf(existingLeaf);
+                await applyOpenViewStateToLeaf(existingLeaf, openState);
                 return;
             }
             const reusedRootLeaf = Boolean(this.workspace.activeRootLeaf);
             const leaf = this.workspace.getLeaf();
             span.setAttribute("workspace.reused_active_leaf", reusedRootLeaf);
-            this.workspace.activeLeaf = leaf;
+            this.workspace.activateLeaf(leaf, { operation: "open-file" });
+            await this.workspace.revealLeaf(leaf);
             if (leafFilePath(leaf) === file.path) {
                 span.setAttribute("workspace.file_already_open", true);
                 if (openState?.state) {

package/dist/diagnostics.d.ts

@@ -41,6 +41,13 @@ export interface WorkspaceDiagnosticEntry {
     resource: DiagnosticResource | null;
     diagnostic: WorkspaceDiagnostic;
 }
+/** Application-owned navigation target for a serializable diagnostic resource. */
+export interface DiagnosticLocation {
+    resource: DiagnosticResource;
+    range?: DiagnosticRange;
+    diagnostic: WorkspaceDiagnostic;
+    related?: DiagnosticRelatedInformation;
+}
 export interface DiagnosticCollectionOptions {
     label?: string;
     buildItemMenu?: (menu: Menu, entry: WorkspaceDiagnosticEntry) => void;
@@ -81,6 +88,7 @@ export declare class DiagnosticsManager {
 }
 export declare function bindRuntimePluginDiagnostics(plugins: {
     on(name: "plugin-error", listener: (id: string, message: string) => void): unknown;
+    on(name: "plugin-unloaded", listener: (id: string) => void): unknown;
     on(name: "plugin-enabled", listener: (plugin: {
         manifest: {
             id: string;

package/dist/diagnostics.js

@@ -58,9 +58,15 @@ export function bindRuntimePluginDiagnostics(plugins, diagnostics) {
             return;
         publish();
     });
+    const unloadedRef = plugins.on("plugin-unloaded", (id) => {
+        if (!pluginFailures.delete(id))
+            return;
+        publish();
+    });
     return () => {
         plugins.offref(errorRef);
         plugins.offref(enabledRef);
+        plugins.offref(unloadedRef);
     };
 }
 export function diagnosticResourceForPath(path) {