@hydranium/client-theia 1.0.0-next.123 → 1.0.0-next.127

package/README.md

@@ -32,6 +32,21 @@ hydranium server; a non-Theia host does not need it.
   (Backend) — register only when the optional `HostMemoryDiagnosticsService` is
   bound. You bind `MemoryDiagnosticsService` to your own connected data-server
   frontend; the framework cannot, because that class is yours.
+- **`EditorDiskSync`** — keeps a dirty editor's save from applying edits its
+  file already holds, as the file does once the server saves a document the
+  editor shows unsaved. Before each save of the editor it drops the edits the
+  file holds, so the save writes only the rest, a save participant's included;
+  on each watched change of the file to the editor's text it marks the editor
+  clean. Theia otherwise keeps the editor dirty, and its next save applies the
+  editor's edits to a file that already holds them. You bind it as a
+  `FrontendApplicationContribution`.
+- **`HydraniumFileService`** — Theia's `FileService`, refusing an editor's
+  incremental save once the file's mtime has moved past the one the editor
+  read, so the editor writes its whole text instead. Theia's own check passes a
+  file of unchanged size, and the save then applies the editor's edits to a
+  file that may already hold them; `write` keeps Theia's check. The safety net
+  behind `EditorDiskSync`, for a save the sync cannot catch. You bind it with
+  `rebind(FileService).to(HydraniumFileService).inSingletonScope()`.
 - **`captureBrowserRuntime` / `formatBrowserRuntime`** — the renderer's own memory
   reading as a `BrowserRuntimeReport`, preferring the standardized
   `performance.measureUserAgentSpecificMemory()` and falling back to Chromium's
@@ -43,6 +58,14 @@ hydranium server; a non-Theia host does not need it.
   forwarder bridges the two; port discovery, connect orchestration, and the
   buffer-and-replay fix for frontend writes that arrive before the forwarder is
   wired all live here.
+- **`SocketChannelForwarder`** (Node side) — the byte forwarder both heads plug
+  into that hook. When the frontend channel closes, it finishes the writes it
+  still has queued before it ends the socket, so a message sent just before a
+  page goes away still reaches the server.
+- **`Clock`** (either side) — the protocol's `Clock` as an injection token.
+  The frontend and backend classes above that time or bound something inject
+  it as optional and use a `SystemClock` when the container binds none, so a
+  container can supply another clock.
 - **`./testing`** — `makeStubOutputChannelManager` and `makeStubInversifyContext`,
   the doubles that let the pieces above be unit-tested without a Theia
   application.
@@ -60,8 +83,11 @@ declared peer dependencies are:
 | --------------------- | ------------- |
 | `@hydranium/protocol` | `^1.0.0-next` |
 | `@theia/core`         | `^1.70.0`     |
+| `@theia/editor`       | `^1.70.0`     |
+| `@theia/filesystem`   | `^1.70.0`     |
 | `@theia/output`       | `^1.70.0`     |
 | `inversify`           | `^6.0.0`      |
+| `vscode-jsonrpc`      | `9.0.1`       |
 
 `@theia/output` is easy to miss: the memory-diagnostics commands and the channel
 logger both write to an Output channel, so a host that does not already depend on
@@ -86,12 +112,13 @@ from here:
 
 ## Entry points
 
-| Subpath     | Holds                                                                                                                                                                                                            | Environment                      |
-| ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------- |
-| `.`         | Nothing. Deliberately empty, so an environment-specific import cannot reach the wrong bundle through a barrel.                                                                                                    | browser-neutral (gated)          |
-| `./browser` | `ChannelLogger`, `ChannelTracer`, `LogLevelPreferenceContribution`, `MemoryDiagnosticsContribution`, the `bind*` helpers, `captureBrowserRuntime`                                                                 | browser / Theia frontend (gated) |
-| `./node`    | `AbstractSocketForwardingConnectionHandler` and its options — imports `node:net`                                                                                                                                          | Node / Theia backend             |
-| `./testing` | `makeStubOutputChannelManager`, `makeStubInversifyContext`                                                                                                                                                        | browser-neutral (gated)          |
+| Subpath     | Holds                                                                                                                                                                                       | Environment                      |
+| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------- |
+| `.`         | Nothing. Deliberately empty, so an environment-specific import cannot reach the wrong bundle through a barrel.                                                                              | browser-neutral (gated)          |
+| `./browser` | `ChannelLogger`, `ChannelTracer`, `LogLevelPreferenceContribution`, `MemoryDiagnosticsContribution`, `EditorDiskSync`, `HydraniumFileService`, the `bind*` helpers, `captureBrowserRuntime` | browser / Theia frontend (gated) |
+| `./common`  | `Clock`, the framed socket write buffer and the connection-resilience options                                                                                                               | browser-neutral (gated)          |
+| `./node`    | `AbstractSocketForwardingConnectionHandler` and its options, `SocketChannelForwarder` — imports `node:net`                                                                                  | Node / Theia backend             |
+| `./testing` | `makeStubOutputChannelManager`, `makeStubInversifyContext`                                                                                                                                  | browser-neutral (gated)          |
 
 Every subpath also has a `./lib/<name>` twin, so a consumer on
 `moduleResolution: "Node"` can reach it. "Gated" means the entry is enforced

package/lib/browser/channel-logger.d.ts

@@ -61,9 +61,10 @@ export declare class ChannelLogger extends AbstractLogger {
 }
 /**
  * Inversify token for the browser `Tracer` — a {@link DefaultTracer} over
- * the {@link ChannelLogger} (emit sink) + a {@link SystemClock} + a browser
- * heap reader. The browser head has no Langium `services.Tracer` slot, so this
- * is how frontend services that time obtain a tracer: `@inject(ChannelTracer)`.
+ * the {@link ChannelLogger} (emit sink) + the container's {@link Clock}, or a
+ * `SystemClock` when it binds none, + a browser heap reader. The browser head
+ * has no Langium `services.Tracer` slot, so this is how frontend services that
+ * time obtain a tracer: `@inject(ChannelTracer)`.
  * Bound by {@link bindChannelLogger}.
  */
 export declare const ChannelTracer: unique symbol;

package/lib/browser/channel-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel-logger.d.ts","sourceRoot":"","sources":["../../src/browser/channel-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,cAAc,EAAiB,KAAK,QAAQ,EAAkC,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAc,KAAK,UAAU,EAAqB,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,KAAK,aAAa,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEpG;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAoB;IAClC,6DAA6D;IAC7D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,0DAA0D;IAC1D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;sFACsF;AACtF,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;;;;;;;;;;;;;;;GAgBG;AACH,qBACa,aAAc,SAAQ,cAAc;IAIb,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB;IACvD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IAJjF,SAAS,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC;gBAGiB,cAAc,EAAE,oBAAoB,EACpC,OAAO,EAAE,oBAAoB,EACjE,SAAS,GAAE,MAAM,GAAG,SAA6B;IAKjE,SAAS,KAAK,OAAO,IAAI,aAAa,CAErC;IAED,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,IAAI;IAOhG;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAQ3C;AAOD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD;gDACgD;AAChD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,MAAM,GAAG,SAAS,CAOpF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAW5F"}
+{"version":3,"file":"channel-logger.d.ts","sourceRoot":"","sources":["../../src/browser/channel-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,cAAc,EAAiB,KAAK,QAAQ,EAAkC,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAc,KAAK,UAAU,EAAqB,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,KAAK,aAAa,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAGpG;;;;;;;;GAQG;AACH,MAAM,WAAW,oBAAoB;IAClC,6DAA6D;IAC7D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,0DAA0D;IAC1D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED;sFACsF;AACtF,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;;;;;;;;;;;;;;;GAgBG;AACH,qBACa,aAAc,SAAQ,cAAc;IAIb,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,oBAAoB;IACvD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IAJjF,SAAS,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC;gBAGiB,cAAc,EAAE,oBAAoB,EACpC,OAAO,EAAE,oBAAoB,EACjE,SAAS,GAAE,MAAM,GAAG,SAA6B;IAKjE,SAAS,KAAK,OAAO,IAAI,aAAa,CAErC;IAED,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,IAAI;IAOhG;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAQ3C;AAOD;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa,eAA0B,CAAC;AAErD;gDACgD;AAChD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,MAAM,GAAG,SAAS,CAOpF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAc5F"}

package/lib/browser/channel-logger.js

@@ -26,6 +26,7 @@ exports.bindChannelLogger = bindChannelLogger;
 const protocol_1 = require("@hydranium/protocol");
 const inversify_1 = require("@theia/core/shared/inversify");
 const output_channel_1 = require("@theia/output/lib/browser/output-channel");
+const clock_1 = require("../common/clock");
 /** Inversify token for the {@link ChannelLoggerOptions} constant (merged with the
  *  interface name — the standard Theia "type + token under one identifier" idiom). */
 exports.ChannelLoggerOptions = Symbol('ChannelLoggerOptions');
@@ -89,9 +90,10 @@ exports.ChannelLogger = ChannelLogger = __decorate([
 const ChannelLoggerBase = Symbol('ChannelLoggerBase');
 /**
  * Inversify token for the browser `Tracer` — a {@link DefaultTracer} over
- * the {@link ChannelLogger} (emit sink) + a {@link SystemClock} + a browser
- * heap reader. The browser head has no Langium `services.Tracer` slot, so this
- * is how frontend services that time obtain a tracer: `@inject(ChannelTracer)`.
+ * the {@link ChannelLogger} (emit sink) + the container's {@link Clock}, or a
+ * `SystemClock` when it binds none, + a browser heap reader. The browser head
+ * has no Langium `services.Tracer` slot, so this is how frontend services that
+ * time obtain a tracer: `@inject(ChannelTracer)`.
  * Bound by {@link bindChannelLogger}.
  */
 exports.ChannelTracer = Symbol('ChannelTracer');
@@ -127,7 +129,10 @@ function bindChannelLogger(bind, options) {
         return parentName ? base.for(parentName) : base;
     });
     bind(exports.ChannelTracer)
-        .toDynamicValue(ctx => new protocol_1.DefaultTracer(ctx.container.get(ChannelLoggerBase), new protocol_1.SystemClock(), readBrowserMemory))
+        .toDynamicValue(ctx => {
+        const clock = ctx.container.isBound(clock_1.Clock) ? ctx.container.get(clock_1.Clock) : new protocol_1.SystemClock();
+        return new protocol_1.DefaultTracer(ctx.container.get(ChannelLoggerBase), clock, readBrowserMemory);
+    })
         .inSingletonScope();
 }
 /** Browser heap reader for {@link ChannelTracer}, backed by Chromium's non-standard `performance.memory`. */

package/lib/browser/channel-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"channel-logger.js","sourceRoot":"","sources":["../../src/browser/channel-logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"channel-logger.js","sourceRoot":"","sources":["../../src/browser/channel-logger.ts"],"names":[],"mappings":"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"}

package/lib/browser/editor-disk-sync.d.ts

@@ -0,0 +1,133 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+import type { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { ILogger } from '@theia/core/lib/common/logger';
+import URI from '@theia/core/lib/common/uri';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import type { EditorWidget } from '@theia/editor/lib/browser/editor-widget';
+import type { FileResourceVersion } from '@theia/filesystem/lib/browser/file-resource';
+import { FileService, type TextFileContent } from '@theia/filesystem/lib/browser/file-service';
+import { Clock } from '../common/clock';
+/**
+ * The members of Theia's Monaco editor model {@link EditorDiskSync} reads and
+ * resets. `contentChanges`, `resourceVersion` and `run` are `protected` there,
+ * so {@link isResyncableEditorDocument} checks for them at runtime: a Theia
+ * that renames them yields a document it refuses, and the sync then leaves it
+ * alone.
+ */
+export interface ResyncableEditorDocument {
+    readonly uri: string;
+    readonly dirty: boolean;
+    getText(): string;
+    revert(options: {
+        soft: boolean;
+    }): Promise<void>;
+    /** The edits the next save applies to the file, in place of the whole text. */
+    readonly contentChanges: unknown[];
+    /** The file version the next save expects to find on disk. */
+    resourceVersion: FileResourceVersion | undefined;
+    /** Queue `operation` behind the model's saves and syncs in progress. */
+    run(operation: () => Promise<void>): Promise<void>;
+    /** Awaited by each save before it takes the pending edits. */
+    onModelWillSaveModel(listener: () => Promise<void>): {
+        dispose(): void;
+    };
+}
+/** Whether `document` carries the members of {@link ResyncableEditorDocument}. */
+export declare function isResyncableEditorDocument(document: object): document is ResyncableEditorDocument;
+/**
+ * Keeps a dirty editor's save from applying edits its file already holds, as
+ * the file does once the server saves a document the editor shows unsaved.
+ *
+ * Theia keeps such an editor dirty, and its next save corrupts the file: the
+ * save applies the editor's pending edits to the file rather than writing the
+ * whole text, and the file already holds them, so each is applied twice.
+ * Theia's check that the file has not changed since the editor read it passes
+ * whenever the new file has the old one's size, so no conflict is reported. A
+ * revert alone keeps the pending edits.
+ *
+ * Before each save of the editor it reads the file. When the file holds the
+ * text the buffer held as the save began, it drops the edits pending then and
+ * has the save expect the file's version, so the save writes only the edits
+ * made after that point, a save participant's included, onto the file as it
+ * is. The save is not cancelled: it completes and is reported as saved. Save
+ * All relies on this check, since it saves a diagram and then an editor on the
+ * same file at once, before the file watcher has reported the diagram's write.
+ * The buffer is taken when the save calls its will-save listeners. Theia runs
+ * its save participants one after another, each behind an await, and its
+ * first one awaits before it edits, so none has changed the buffer by then. A
+ * participant ordered ahead of it that edits before its first await makes the
+ * file and the taken text differ, and the save applies every edit again.
+ *
+ * On each change the file watcher reports, it marks the editor clean when the
+ * file holds exactly its buffer. The file is compared with the buffer after
+ * it has been read, and the editor is marked in the same step, so a keystroke
+ * made while the file was read leaves the editor dirty. This sync waits behind
+ * a save in flight: that save drops the edits it sent from the pending ones
+ * when it finishes, and a sync before then would have it drop the edits typed
+ * meanwhile.
+ *
+ * An editor whose file holds neither text is left to Theia's own save,
+ * same-size gap included, and so is one whose file cannot be read within
+ * {@link readTimeoutMs}, or whose check throws.
+ *
+ * The adopter binds it as a `FrontendApplicationContribution`.
+ */
+export declare class EditorDiskSync implements FrontendApplicationContribution {
+    protected readonly fileService: FileService;
+    protected readonly editorManager: EditorManager;
+    protected readonly logger: ILogger;
+    /** Times {@link readTimeoutMs}: the container's {@link Clock}, or a `SystemClock`. */
+    protected readonly clock: Clock;
+    /** Whether an editor's document has failed {@link isResyncableEditorDocument}; warned of once. */
+    protected warnedUnsyncable: boolean;
+    /**
+     * How long a check waits for the file. The editor's save, and every later
+     * save and sync of that editor, waits for the check.
+     */
+    protected readTimeoutMs: number;
+    onStart(): void;
+    /** Check `widget`'s document before each of its saves, for as long as the widget lives. */
+    protected guardSaves(widget: EditorWidget): void;
+    /** Check each dirty document an editor shows on `uri`, behind that document's save in flight. */
+    protected checkFile(uri: URI): void;
+    /** Read the file of `document` if it is dirty, and sync it if the file holds its buffer. */
+    protected syncIfOnDisk(document: ResyncableEditorDocument): Promise<void>;
+    /**
+     * Before a save of `document`, drop the edits pending now if its file holds
+     * the buffer as it is now, and take the file's version. The buffer and the
+     * count are taken before the first await, while the save is still calling
+     * its will-save listeners; an edit made after that stays pending, and the
+     * save writes it onto the file.
+     */
+    protected dropChangesOnDisk(document: ResyncableEditorDocument): Promise<void>;
+    /**
+     * The file of `document`, or `undefined` when it is gone, cannot be read, or
+     * is not read within {@link readTimeoutMs}.
+     */
+    protected readFile(document: ResyncableEditorDocument): Promise<TextFileContent | undefined>;
+    /**
+     * Run `check`, and log its failure rather than pass it on. A will-save
+     * listener that rejects makes Theia drop the save without writing, and a
+     * sync that rejects goes unhandled.
+     */
+    protected isolate(check: () => Promise<void>): Promise<void>;
+    /** The dirty documents open in an editor on `uri`, each once however many editors show it. */
+    protected dirtyDocuments(uri: URI): ResyncableEditorDocument[];
+    /** `document` if it carries the members the sync resets; otherwise `undefined`, warned of once. */
+    protected resyncable(document: object): ResyncableEditorDocument | undefined;
+    /**
+     * Take `version` as the file `document` was last saved to, with nothing
+     * pending, and mark it clean. Synchronous throughout: a soft revert only
+     * marks the document clean, and reads nothing. The revert also cancels a
+     * save queued behind the sync, which would have written the same text.
+     */
+    protected syncFromDisk(document: ResyncableEditorDocument, version: FileResourceVersion): void;
+}
+//# sourceMappingURL=editor-disk-sync.d.ts.map

package/lib/browser/editor-disk-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"editor-disk-sync.d.ts","sourceRoot":"","sources":["../../src/browser/editor-disk-sync.ts"],"names":[],"mappings":"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"}

package/lib/browser/editor-disk-sync.js

@@ -0,0 +1,232 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EditorDiskSync = void 0;
+exports.isResyncableEditorDocument = isResyncableEditorDocument;
+const protocol_1 = require("@hydranium/protocol");
+const logger_1 = require("@theia/core/lib/common/logger");
+const uri_1 = __importDefault(require("@theia/core/lib/common/uri"));
+const inversify_1 = require("@theia/core/shared/inversify");
+const editor_manager_1 = require("@theia/editor/lib/browser/editor-manager");
+const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
+const clock_1 = require("../common/clock");
+/** Whether `document` carries the members of {@link ResyncableEditorDocument}. */
+function isResyncableEditorDocument(document) {
+    return ('uri' in document &&
+        typeof document.uri === 'string' &&
+        'dirty' in document &&
+        'getText' in document &&
+        typeof document.getText === 'function' &&
+        'revert' in document &&
+        typeof document.revert === 'function' &&
+        'contentChanges' in document &&
+        Array.isArray(document.contentChanges) &&
+        'resourceVersion' in document &&
+        'run' in document &&
+        typeof document.run === 'function' &&
+        'onModelWillSaveModel' in document &&
+        typeof document.onModelWillSaveModel === 'function');
+}
+/**
+ * Keeps a dirty editor's save from applying edits its file already holds, as
+ * the file does once the server saves a document the editor shows unsaved.
+ *
+ * Theia keeps such an editor dirty, and its next save corrupts the file: the
+ * save applies the editor's pending edits to the file rather than writing the
+ * whole text, and the file already holds them, so each is applied twice.
+ * Theia's check that the file has not changed since the editor read it passes
+ * whenever the new file has the old one's size, so no conflict is reported. A
+ * revert alone keeps the pending edits.
+ *
+ * Before each save of the editor it reads the file. When the file holds the
+ * text the buffer held as the save began, it drops the edits pending then and
+ * has the save expect the file's version, so the save writes only the edits
+ * made after that point, a save participant's included, onto the file as it
+ * is. The save is not cancelled: it completes and is reported as saved. Save
+ * All relies on this check, since it saves a diagram and then an editor on the
+ * same file at once, before the file watcher has reported the diagram's write.
+ * The buffer is taken when the save calls its will-save listeners. Theia runs
+ * its save participants one after another, each behind an await, and its
+ * first one awaits before it edits, so none has changed the buffer by then. A
+ * participant ordered ahead of it that edits before its first await makes the
+ * file and the taken text differ, and the save applies every edit again.
+ *
+ * On each change the file watcher reports, it marks the editor clean when the
+ * file holds exactly its buffer. The file is compared with the buffer after
+ * it has been read, and the editor is marked in the same step, so a keystroke
+ * made while the file was read leaves the editor dirty. This sync waits behind
+ * a save in flight: that save drops the edits it sent from the pending ones
+ * when it finishes, and a sync before then would have it drop the edits typed
+ * meanwhile.
+ *
+ * An editor whose file holds neither text is left to Theia's own save,
+ * same-size gap included, and so is one whose file cannot be read within
+ * {@link readTimeoutMs}, or whose check throws.
+ *
+ * The adopter binds it as a `FrontendApplicationContribution`.
+ */
+let EditorDiskSync = class EditorDiskSync {
+    fileService;
+    editorManager;
+    logger;
+    /** Times {@link readTimeoutMs}: the container's {@link Clock}, or a `SystemClock`. */
+    clock = new protocol_1.SystemClock();
+    /** Whether an editor's document has failed {@link isResyncableEditorDocument}; warned of once. */
+    warnedUnsyncable = false;
+    /**
+     * How long a check waits for the file. The editor's save, and every later
+     * save and sync of that editor, waits for the check.
+     */
+    readTimeoutMs = 1_000;
+    onStart() {
+        this.fileService.onDidFilesChange(event => {
+            for (const change of event.changes) {
+                this.checkFile(change.resource);
+            }
+        });
+        this.editorManager.onCreated(widget => this.guardSaves(widget));
+        for (const widget of this.editorManager.all) {
+            this.guardSaves(widget);
+        }
+    }
+    /** Check `widget`'s document before each of its saves, for as long as the widget lives. */
+    guardSaves(widget) {
+        const document = this.resyncable(widget.editor.document);
+        if (document) {
+            const registration = document.onModelWillSaveModel(() => this.isolate(() => this.dropChangesOnDisk(document)));
+            widget.onDidDispose(() => registration.dispose());
+        }
+    }
+    /** Check each dirty document an editor shows on `uri`, behind that document's save in flight. */
+    checkFile(uri) {
+        for (const document of this.dirtyDocuments(uri)) {
+            void document.run(() => this.isolate(() => this.syncIfOnDisk(document)));
+        }
+    }
+    /** Read the file of `document` if it is dirty, and sync it if the file holds its buffer. */
+    async syncIfOnDisk(document) {
+        if (!document.dirty) {
+            return;
+        }
+        const content = await this.readFile(document);
+        if (content && document.getText() === content.value) {
+            this.syncFromDisk(document, { etag: content.etag, mtime: content.mtime, encoding: content.encoding });
+        }
+    }
+    /**
+     * Before a save of `document`, drop the edits pending now if its file holds
+     * the buffer as it is now, and take the file's version. The buffer and the
+     * count are taken before the first await, while the save is still calling
+     * its will-save listeners; an edit made after that stays pending, and the
+     * save writes it onto the file.
+     */
+    async dropChangesOnDisk(document) {
+        if (!document.dirty) {
+            return;
+        }
+        const text = document.getText();
+        const pending = document.contentChanges.length;
+        const content = await this.readFile(document);
+        if (content?.value === text) {
+            document.contentChanges.splice(0, pending);
+            document.resourceVersion = { etag: content.etag, mtime: content.mtime, encoding: content.encoding };
+        }
+    }
+    /**
+     * The file of `document`, or `undefined` when it is gone, cannot be read, or
+     * is not read within {@link readTimeoutMs}.
+     */
+    async readFile(document) {
+        const read = this.fileService.read(new uri_1.default(document.uri)).catch(() => undefined);
+        const content = await this.clock.raceTimer(read, this.readTimeoutMs);
+        return content === protocol_1.TIMED_OUT ? undefined : content;
+    }
+    /**
+     * Run `check`, and log its failure rather than pass it on. A will-save
+     * listener that rejects makes Theia drop the save without writing, and a
+     * sync that rejects goes unhandled.
+     */
+    async isolate(check) {
+        try {
+            await check();
+        }
+        catch (err) {
+            void this.logger.error('EditorDiskSync: checking an editor against its file failed; the editor is left as it is.', err);
+        }
+    }
+    /** The dirty documents open in an editor on `uri`, each once however many editors show it. */
+    dirtyDocuments(uri) {
+        const target = uri.toString();
+        const documents = new Set();
+        for (const widget of this.editorManager.all) {
+            const document = this.resyncable(widget.editor.document);
+            if (document && document.uri === target && document.dirty) {
+                documents.add(document);
+            }
+        }
+        return [...documents];
+    }
+    /** `document` if it carries the members the sync resets; otherwise `undefined`, warned of once. */
+    resyncable(document) {
+        if (isResyncableEditorDocument(document)) {
+            return document;
+        }
+        if (!this.warnedUnsyncable) {
+            this.warnedUnsyncable = true;
+            void this.logger.warn('EditorDiskSync: an editor document lacks the Monaco model members the sync resets, so such editors are not synced with their files.');
+        }
+        return undefined;
+    }
+    /**
+     * Take `version` as the file `document` was last saved to, with nothing
+     * pending, and mark it clean. Synchronous throughout: a soft revert only
+     * marks the document clean, and reads nothing. The revert also cancels a
+     * save queued behind the sync, which would have written the same text.
+     */
+    syncFromDisk(document, version) {
+        document.contentChanges.splice(0, document.contentChanges.length);
+        document.resourceVersion = version;
+        void document.revert({ soft: true });
+    }
+};
+exports.EditorDiskSync = EditorDiskSync;
+__decorate([
+    (0, inversify_1.inject)(file_service_1.FileService),
+    __metadata("design:type", file_service_1.FileService)
+], EditorDiskSync.prototype, "fileService", void 0);
+__decorate([
+    (0, inversify_1.inject)(editor_manager_1.EditorManager),
+    __metadata("design:type", editor_manager_1.EditorManager)
+], EditorDiskSync.prototype, "editorManager", void 0);
+__decorate([
+    (0, inversify_1.inject)(logger_1.ILogger),
+    __metadata("design:type", Object)
+], EditorDiskSync.prototype, "logger", void 0);
+__decorate([
+    (0, inversify_1.inject)(clock_1.Clock),
+    (0, inversify_1.optional)(),
+    __metadata("design:type", Object)
+], EditorDiskSync.prototype, "clock", void 0);
+exports.EditorDiskSync = EditorDiskSync = __decorate([
+    (0, inversify_1.injectable)()
+], EditorDiskSync);
+//# sourceMappingURL=editor-disk-sync.js.map

package/lib/browser/editor-disk-sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editor-disk-sync.js","sourceRoot":"","sources":["../../src/browser/editor-disk-sync.ts"],"names":[],"mappings":"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"}

package/lib/browser/hydranium-file-service.d.ts

@@ -0,0 +1,44 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+import type URI from '@theia/core/lib/common/uri';
+import { FileService, type UpdateTextFileOptions } from '@theia/filesystem/lib/browser/file-service';
+/**
+ * Theia's `FileService`, refusing an incremental save once the file has
+ * changed since the editor read it.
+ *
+ * Theia's own check, which `write` and `update` share, passes a file whose
+ * mtime moved on when its size still matches the etag the editor read. That
+ * is safe for `write`, which replaces the file with the whole text, but
+ * `update` applies the editor's pending edits to the file as it is, so after a
+ * same-size change, the server saving those very edits included, it applies
+ * them a second time. Here `update` hands that check the etag with a `!`
+ * appended, which no file's etag can match: Theia writes an etag as the mtime
+ * in base 29 followed by the size in base 31, digits and lower-case letters
+ * only. An advanced mtime is then enough for Theia to refuse with its
+ * `FILE_MODIFIED_SINCE`. The editor's save then falls back to `write` with the
+ * whole text, which Theia checks as before: it writes when the size is
+ * unchanged, and asks the user otherwise. A same-size change by another
+ * process is therefore overwritten by that write rather than merged with the
+ * editor's edits. `write` is left as it is.
+ *
+ * It is the safety net behind `EditorDiskSync`, which acts only when the
+ * file holds the editor's buffer: a file holding some of the edits, as when a
+ * save participant ordered ahead of Theia's first one edits before its first
+ * await, is left to this check.
+ *
+ * A write within the file system's mtime resolution of the read goes unseen,
+ * as it does for Theia's own check. A file whose mtime moves while its text
+ * stays the same costs a whole-text write rather than the edits.
+ *
+ * The adopter binds it with `rebind(FileService).to(HydraniumFileService).inSingletonScope()`.
+ */
+export declare class HydraniumFileService extends FileService {
+    update(resource: URI, changes: Parameters<FileService['update']>[1], options: UpdateTextFileOptions): ReturnType<FileService['update']>;
+}
+//# sourceMappingURL=hydranium-file-service.d.ts.map

package/lib/browser/hydranium-file-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydranium-file-service.d.ts","sourceRoot":"","sources":["../../src/browser/hydranium-file-service.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,KAAK,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGrG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBACa,oBAAqB,SAAQ,WAAW;IACzC,MAAM,CACZ,QAAQ,EAAE,GAAG,EACb,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7C,OAAO,EAAE,qBAAqB,GAC9B,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;CAKtC"}