neoctl 0.2.22 → 0.2.24

package/dist/web/html.js

@@ -231,7 +231,7 @@ es.addEventListener('error', () => {
   connection.hidden = false;
   connection.textContent = 'reconnecting…';
 });
-es.addEventListener('sync', (event) => {
+es.addEventListener('sync', (event) => {
   const payload = JSON.parse(event.data);
   state.lines = payload.lines || [];
   state.status = payload.status || state.status;
@@ -245,8 +245,27 @@ es.addEventListener('sync', (event) => {
   if (payload.catalog) state.catalog = payload.catalog;
   if (payload.interactive) state.interactive = payload.interactive;
   updateInputPlaceholder();
-  scheduleRender();
-});
+  scheduleRender();
+});
+es.addEventListener('delta', (event) => {
+  const payload = JSON.parse(event.data);
+  for (const operation of payload.operations || []) {
+    if (operation.type === 'line.append') {
+      if (!state.lines.some((line) => String(line.id) === String(operation.line && operation.line.id))) state.lines.push(operation.line);
+      continue;
+    }
+    const index = state.lines.findIndex((line) => String(line.id) === String(operation.id));
+    if (index < 0) {
+      location.reload();
+      return;
+    }
+    const line = state.lines[index];
+    if (operation.type === 'line.text.append') state.lines[index] = { ...line, text: String(line.text || '') + String(operation.text || '') };
+    else if (operation.type === 'line.patch') state.lines[index] = { ...line, ...(operation.patch || {}) };
+  }
+  if (payload.status) state.status = payload.status;
+  scheduleRender();
+});
 
 function scheduleRender() {
   if (renderPending) return;

package/dist/web/html.js.map

@@ -1 +1 @@
-{"version":3,"file":"html.js","sourceRoot":"","sources":["../../src/web/html.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAq1B1B,CAAC"}
+{"version":3,"file":"html.js","sourceRoot":"","sources":["../../src/web/html.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAw2B1B,CAAC"}

package/dist/web/index.d.ts

@@ -138,6 +138,18 @@ interface WebSetAppPromptPayload {
     source?: string;
     clear?: boolean;
 }
+type WebLineOperation = {
+    type: "line.append";
+    line: UiLine;
+} | {
+    type: "line.text.append";
+    id: number;
+    text: string;
+} | {
+    type: "line.patch";
+    id: number;
+    patch: Partial<UiLine>;
+};
 export declare function runWebServer(argv?: string[], runtimeOptions?: RunWebServerOptions): Promise<void>;
 export declare function createWebRuntime(options?: CreateWebRuntimeOptions): Promise<WebRuntime>;
 export declare class WebRuntimeRouter {
@@ -153,6 +165,10 @@ export declare function createWebRuntimeRouter(options?: WebRuntimeRouterOptions
 export declare class WebRepl {
     private runtime;
     private readonly subscribers;
+    private eventSequence;
+    private pendingDeltaOperations;
+    private pendingDeltaStatus;
+    private pendingDeltaTimer;
     private lineId;
     private assistantLineId;
     private thinkingLineId;
@@ -264,7 +280,7 @@ export declare class WebRepl {
         cancelled: boolean;
     };
     private append;
-    private updateLine;
+    private appendLineText;
     private replaceLineText;
     private replaceLine;
     private setBusy;
@@ -283,6 +299,13 @@ export declare class WebRepl {
     private handleCommandOrPrompt;
     private runCompaction;
     private send;
+    private broadcastDelta;
+    private queueDeltaOperation;
+    private queueDeltaStatus;
+    private scheduleDeltaFlush;
+    private flushDeltaOperations;
+    private discardPendingDeltaOperations;
     private broadcastSync;
 }
+export declare function compactLineOperations(operations: WebLineOperation[]): WebLineOperation[];
 export {};

package/dist/web/index.js

@@ -249,6 +249,10 @@ function webRuntimeScopeKey(scope) {
 export class WebRepl {
     runtime;
     subscribers = new Set();
+    eventSequence = 0;
+    pendingDeltaOperations = [];
+    pendingDeltaStatus = false;
+    pendingDeltaTimer;
     lineId = 0;
     assistantLineId;
     thinkingLineId;
@@ -279,16 +283,17 @@ export class WebRepl {
         runtime.engine.onSessionTitleChange(() => this.broadcastSync());
     }
     subscribe(res) {
-        this.subscribers.add(res);
+        const subscriber = { response: res, blocked: false, needsSync: false };
+        this.subscribers.add(subscriber);
         res.writeHead(200, {
             "Content-Type": "text/event-stream; charset=utf-8",
             "Cache-Control": "no-cache, no-transform",
             Connection: "keep-alive",
             "X-Accel-Buffering": "no",
         });
-        this.send(res, "sync", this.snapshot(true));
+        this.send(subscriber, "sync", this.snapshot(true));
         reqKeepAlive(res);
-        res.on("close", () => this.subscribers.delete(res));
+        res.on("close", () => this.subscribers.delete(subscriber));
     }
     snapshot(includeCatalog = false) {
         return {
@@ -505,15 +510,19 @@ export class WebRepl {
             this.broadcastSync();
         return { ok: true, cancelled: had };
     }
-    append(line) {
+    append(line, streaming = false) {
         const id = ++this.lineId;
-        this.lines.push({ id, ...line });
-        this.broadcastSync();
+        const nextLine = { id, ...line };
+        this.lines.push(nextLine);
+        if (streaming)
+            this.broadcastDelta({ type: "line.append", line: nextLine });
+        else
+            this.broadcastSync();
         return id;
     }
-    updateLine(id, updater) {
-        this.lines = this.lines.map((line) => line.id === id ? { ...line, text: updater(line.text) } : line);
-        this.broadcastSync();
+    appendLineText(id, text) {
+        this.lines = this.lines.map((line) => line.id === id ? { ...line, text: line.text + text } : line);
+        this.broadcastDelta({ type: "line.text.append", id, text });
     }
     replaceLineText(id, text) {
         this.lines = this.lines.map((line) => line.id === id ? { ...line, text } : line);
@@ -621,6 +630,7 @@ export class WebRepl {
         if (id === undefined)
             return;
         this.lines = this.lines.map((line) => line.id === id ? { ...line, live: false } : line);
+        this.queueDeltaOperation({ type: "line.patch", id, patch: { live: false } });
     }
     finalizeThinkingLine() {
         const id = this.thinkingLineId;
@@ -642,22 +652,26 @@ export class WebRepl {
             this.broadcastSync();
             return;
         }
-        if (event.type === "state" || event.type === "context.metrics" || event.type === "usage" || event.type === "tool_call.delta" || event.type === "retrying") {
+        if (event.type === "tool_call.delta") {
+            this.queueDeltaStatus();
+            return;
+        }
+        if (event.type === "state" || event.type === "context.metrics" || event.type === "usage" || event.type === "retrying") {
             this.broadcastSync();
             return;
         }
         if (event.type === "assistant.delta") {
             this.finalizeThinkingLine();
-            const id = this.assistantLineId ?? this.append({ kind: "assistant", text: "", live: true });
+            const id = this.assistantLineId ?? this.append({ kind: "assistant", text: "", live: true }, true);
             this.assistantLineId = id;
-            this.updateLine(id, (text) => text + event.text);
+            this.appendLineText(id, event.text);
             return;
         }
         if (event.type === "thinking.delta") {
-            const id = this.thinkingLineId ?? this.finalizedThinkingLineId ?? this.append(thinkingLine("", true));
+            const id = this.thinkingLineId ?? this.finalizedThinkingLineId ?? this.append(thinkingLine("", true), true);
             this.thinkingLineId = id;
             this.finalizedThinkingLineId = undefined;
-            this.updateLine(id, (text) => text + event.text);
+            this.appendLineText(id, event.text);
             return;
         }
         if (event.type === "message") {
@@ -939,15 +953,86 @@ export class WebRepl {
             this.setStatus({ ...this.status, phase: "ready", detail: undefined, activityTick: this.status.activityTick + 1 });
         }
     }
-    send(res, event, data) {
-        res.write(`event: ${event}\n`);
-        res.write(`data: ${JSON.stringify(data)}\n\n`);
+    send(subscriber, event, data) {
+        if (subscriber.blocked) {
+            subscriber.needsSync = true;
+            return;
+        }
+        const eventId = ++this.eventSequence;
+        const frame = `id: ${eventId}\nevent: ${event}\ndata: ${JSON.stringify(data)}\n\n`;
+        if (subscriber.response.write(frame))
+            return;
+        subscriber.blocked = true;
+        subscriber.response.once("drain", () => {
+            subscriber.blocked = false;
+            if (!subscriber.needsSync || subscriber.response.destroyed)
+                return;
+            subscriber.needsSync = false;
+            this.send(subscriber, "sync", this.snapshot(false));
+        });
+    }
+    broadcastDelta(operation) {
+        this.queueDeltaOperation(operation);
+    }
+    queueDeltaOperation(operation) {
+        this.pendingDeltaOperations.push(operation);
+        this.scheduleDeltaFlush();
+    }
+    queueDeltaStatus() {
+        this.pendingDeltaStatus = true;
+        this.scheduleDeltaFlush();
+    }
+    scheduleDeltaFlush() {
+        if (this.pendingDeltaTimer)
+            return;
+        this.pendingDeltaTimer = setTimeout(() => this.flushDeltaOperations(), 25);
+        this.pendingDeltaTimer.unref?.();
+    }
+    flushDeltaOperations() {
+        this.pendingDeltaTimer = undefined;
+        if (this.pendingDeltaOperations.length === 0 && !this.pendingDeltaStatus)
+            return;
+        const operations = compactLineOperations(this.pendingDeltaOperations);
+        this.pendingDeltaOperations = [];
+        this.pendingDeltaStatus = false;
+        const payload = {
+            protocolVersion: 2,
+            sessionId: this.runtime.engine.snapshot().session?.sessionId,
+            operations,
+            status: this.status,
+        };
+        for (const subscriber of this.subscribers)
+            this.send(subscriber, "delta", payload);
+    }
+    discardPendingDeltaOperations() {
+        if (this.pendingDeltaTimer)
+            clearTimeout(this.pendingDeltaTimer);
+        this.pendingDeltaTimer = undefined;
+        this.pendingDeltaOperations = [];
+        this.pendingDeltaStatus = false;
     }
     broadcastSync() {
+        this.discardPendingDeltaOperations();
         const payload = this.snapshot(false);
-        for (const res of this.subscribers)
-            this.send(res, "sync", payload);
+        for (const subscriber of this.subscribers)
+            this.send(subscriber, "sync", payload);
+    }
+}
+export function compactLineOperations(operations) {
+    const compacted = [];
+    for (const operation of operations) {
+        const previous = compacted.at(-1);
+        if (operation.type === "line.text.append" && previous?.type === "line.text.append" && previous.id === operation.id) {
+            previous.text += operation.text;
+            continue;
+        }
+        if (operation.type === "line.patch" && previous?.type === "line.patch" && previous.id === operation.id) {
+            previous.patch = { ...previous.patch, ...operation.patch };
+            continue;
+        }
+        compacted.push(operation.type === "line.patch" ? { ...operation, patch: { ...operation.patch } } : { ...operation });
     }
+    return compacted;
 }
 function reqKeepAlive(res) {
     const timer = setInterval(() => res.write(": keep-alive\n\n"), 25_000);