Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
613b568835 | ||
|
|
329a46a075 |
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"monorepoCommit": "6b219fa01231a4f203449fdaf5890317bf3daa8f",
|
"monorepoCommit": "be30143a326d5d7d7b0cbabea5bc5ac0301ef5b9",
|
||||||
"sourcePath": "quixos-instance/packages/agent-presentation"
|
"sourcePath": "quixos-instance/packages/agent-presentation"
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+18
-18
@@ -21,19 +21,19 @@
|
|||||||
"helpers": {
|
"helpers": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1793277056,
|
"lastModified": 1790852599,
|
||||||
"narHash": "sha256-w7TrYSjU8hbVrqbLdHgxDJAzMdN2NoWe+HkInJLWRlI=",
|
"narHash": "sha256-MdNtZpcsoguLPSCpAy9Naz6fkVPrftbZQbz1Aj7Zm9A=",
|
||||||
"ref": "refs/tags/quixos-reachability/c2454054dac36fb7a6ff12004003170a65e4f288",
|
"ref": "refs/tags/quixos-reachability/91679e8cc82133093cb0b4f9e519cbb39a5bba4f",
|
||||||
"rev": "c2454054dac36fb7a6ff12004003170a65e4f288",
|
"rev": "91679e8cc82133093cb0b4f9e519cbb39a5bba4f",
|
||||||
"revCount": 85,
|
"revCount": 54,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://repos.quixos.org/quixos-toolchain/quixos-nix-helpers.git"
|
"url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"ref": "refs/tags/quixos-reachability/c2454054dac36fb7a6ff12004003170a65e4f288",
|
"ref": "refs/tags/quixos-reachability/91679e8cc82133093cb0b4f9e519cbb39a5bba4f",
|
||||||
"rev": "c2454054dac36fb7a6ff12004003170a65e4f288",
|
"rev": "91679e8cc82133093cb0b4f9e519cbb39a5bba4f",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://repos.quixos.org/quixos-toolchain/quixos-nix-helpers.git"
|
"url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
@@ -58,19 +58,19 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1793458533,
|
"lastModified": 1791261504,
|
||||||
"narHash": "sha256-DnK9ad5YJXxyPqJYt2ysA9Kt6YcUmQV/EGmPzt5rleg=",
|
"narHash": "sha256-QSk9DWR7n5KL6cMHzmSKKXNIyaFA0s8Nu+wXjhhlENI=",
|
||||||
"ref": "refs/tags/quixos-reachability/27af7af6c5704c7d9c39fd14d5875ccb1aaca1fd",
|
"ref": "refs/tags/quixos-reachability/5b44c8154dc038efd87cf1cbdd2c00b66bfd4f87",
|
||||||
"rev": "27af7af6c5704c7d9c39fd14d5875ccb1aaca1fd",
|
"rev": "5b44c8154dc038efd87cf1cbdd2c00b66bfd4f87",
|
||||||
"revCount": 241,
|
"revCount": 184,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://repos.quixos.org/quixos-toolchain/quixos-protocol.git"
|
"url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-protocol.git"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"ref": "refs/tags/quixos-reachability/27af7af6c5704c7d9c39fd14d5875ccb1aaca1fd",
|
"ref": "refs/tags/quixos-reachability/5b44c8154dc038efd87cf1cbdd2c00b66bfd4f87",
|
||||||
"rev": "27af7af6c5704c7d9c39fd14d5875ccb1aaca1fd",
|
"rev": "5b44c8154dc038efd87cf1cbdd2c00b66bfd4f87",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://repos.quixos.org/quixos-toolchain/quixos-protocol.git"
|
"url": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-protocol.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
inputs.protocol.url = "git+https://repos.quixos.org/quixos-toolchain/quixos-protocol.git?ref=refs/tags/quixos-reachability/27af7af6c5704c7d9c39fd14d5875ccb1aaca1fd&rev=27af7af6c5704c7d9c39fd14d5875ccb1aaca1fd";
|
inputs.protocol.url = "git+https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-protocol.git?ref=refs/tags/quixos-reachability/5b44c8154dc038efd87cf1cbdd2c00b66bfd4f87&rev=5b44c8154dc038efd87cf1cbdd2c00b66bfd4f87";
|
||||||
inputs.nixpkgs.follows = "protocol/nixpkgs";
|
inputs.nixpkgs.follows = "protocol/nixpkgs";
|
||||||
inputs.flake-utils.follows = "protocol/flake-utils";
|
inputs.flake-utils.follows = "protocol/flake-utils";
|
||||||
inputs.helpers = {
|
inputs.helpers = {
|
||||||
url = "git+https://repos.quixos.org/quixos-toolchain/quixos-nix-helpers.git?ref=refs/tags/quixos-reachability/c2454054dac36fb7a6ff12004003170a65e4f288&rev=c2454054dac36fb7a6ff12004003170a65e4f288";
|
url = "git+https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git?ref=refs/tags/quixos-reachability/91679e8cc82133093cb0b4f9e519cbb39a5bba4f&rev=91679e8cc82133093cb0b4f9e519cbb39a5bba4f";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
|
|||||||
+7
-7
@@ -1,9 +1,9 @@
|
|||||||
quixos-lock version 1 {
|
quixos-lock version 1 {
|
||||||
quixos source { repository "https://gitea.internal.quixos.org/quixos/quixos.git"; commit "6b219fa01231a4f203449fdaf5890317bf3daa8f"; }
|
quixos source { repository "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git"; commit "be30143a326d5d7d7b0cbabea5bc5ac0301ef5b9"; }
|
||||||
interface StandaloneView source { repository "https://repos.quixos.org/quixos-templates/interface-react-standalone-view.git"; commit "30a23efd52d9a6ca155bc9db14a106d94e5ae57e"; }
|
interface StandaloneView source { repository "https://repos.quixos.org/quixos-templates/interface-react-standalone-view.git"; commit "29a974e9db15387c9efc0f0fe64fec348db10344"; }
|
||||||
interface AgentThread source { repository "https://repos.quixos.org/quixos-templates/interface-agent-thread.git"; commit "505f26de30291803f34a54cc100443d8fbc40cc2"; }
|
interface AgentThread source { repository "https://repos.quixos.org/quixos-templates/interface-agent-thread.git"; commit "6ace62f773c230c468efeabe9b5aac35115b7900"; }
|
||||||
interface Agent source { repository "https://repos.quixos.org/quixos-templates/interface-agent.git"; commit "7f24d4fb2b13956d7de7b45b24f6608ed1ea27d0"; }
|
interface Agent source { repository "https://repos.quixos.org/quixos-templates/interface-agent.git"; commit "dcd3f271b42649b4ce15a890f9b41e19a7271563"; }
|
||||||
interface AgentRequest source { repository "https://repos.quixos.org/quixos-templates/interface-agent-request.git"; commit "ac9a56212a23ccb0b64deb897e25ddd8aa497b59"; }
|
interface AgentRequest source { repository "https://repos.quixos.org/quixos-templates/interface-agent-request.git"; commit "7f1e9d6278366329fd76f2698cd5a53c136f9914"; }
|
||||||
interface AgentItem source { repository "https://repos.quixos.org/quixos-templates/interface-agent-item.git"; commit "92ef0407ab0985ca99617d5579f46f950379e1b4"; }
|
interface AgentItem source { repository "https://repos.quixos.org/quixos-templates/interface-agent-item.git"; commit "6e702e5cab24634d306c8f657f3a0b4873469060"; }
|
||||||
interface AgentQuestion source { repository "https://repos.quixos.org/quixos-templates/interface-agent-question.git"; commit "2dfb99d7a87b918b14d3bbce22d67ac5eb4a7cad"; }
|
interface AgentQuestion source { repository "https://repos.quixos.org/quixos-templates/interface-agent-question.git"; commit "7d69058c2c12b4ca1800d8ff8218caffa45e5d13"; }
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-81
@@ -50,64 +50,6 @@ export const control = async (input: Record<string, unknown>) => {
|
|||||||
};
|
};
|
||||||
export const draftKey = (thread: string) => `quixos.agent.draft:${location.origin}:${thread}`;
|
export const draftKey = (thread: string) => `quixos.agent.draft:${location.origin}:${thread}`;
|
||||||
|
|
||||||
/** Status and directory invalidation shared by shells, without a recurring
|
|
||||||
* snapshot timer. Reconnecting rechecks state to cover disconnected changes. */
|
|
||||||
export function subscribeAgentUpdates(listener: () => void, onError: (error: unknown) => void) {
|
|
||||||
const abort = new AbortController();
|
|
||||||
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
||||||
const changed = () => {
|
|
||||||
timer ??= setTimeout(() => {
|
|
||||||
timer = undefined;
|
|
||||||
listener();
|
|
||||||
}, 100);
|
|
||||||
};
|
|
||||||
void (async () => {
|
|
||||||
while (!abort.signal.aborted) {
|
|
||||||
try {
|
|
||||||
const response = await fetch("/api/agent/updates", { credentials: "same-origin", signal: abort.signal });
|
|
||||||
if (!response.ok || !response.body) throw Error("Agent updates unavailable");
|
|
||||||
const reader = response.body.getReader(),
|
|
||||||
decoder = new TextDecoder();
|
|
||||||
let buffer = "";
|
|
||||||
try {
|
|
||||||
while (!abort.signal.aborted) {
|
|
||||||
const chunk = await reader.read();
|
|
||||||
if (chunk.done) break;
|
|
||||||
buffer += decoder.decode(chunk.value, { stream: true });
|
|
||||||
if (buffer.length > 65536) throw Error("Agent update frame exceeds limit");
|
|
||||||
let end: number;
|
|
||||||
while ((end = buffer.indexOf("\n")) !== -1) {
|
|
||||||
const line = buffer.slice(0, end);
|
|
||||||
buffer = buffer.slice(end + 1);
|
|
||||||
if (line && JSON.parse(line).type === "changed") changed();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
await reader.cancel().catch(() => {});
|
|
||||||
reader.releaseLock();
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
if (!abort.signal.aborted) onError(error);
|
|
||||||
}
|
|
||||||
if (!abort.signal.aborted)
|
|
||||||
await new Promise<void>((resolve) => {
|
|
||||||
const finish = () => {
|
|
||||||
clearTimeout(retry);
|
|
||||||
abort.signal.removeEventListener("abort", finish);
|
|
||||||
resolve();
|
|
||||||
};
|
|
||||||
const retry = setTimeout(finish, 1000);
|
|
||||||
abort.signal.addEventListener("abort", finish, { once: true });
|
|
||||||
if (abort.signal.aborted) finish();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})();
|
|
||||||
return () => {
|
|
||||||
abort.abort();
|
|
||||||
clearTimeout(timer);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A browser observer owns no executor. Closing it only stops reads. */
|
/** A browser observer owns no executor. Closing it only stops reads. */
|
||||||
export class HttpThreadController implements ThreadController {
|
export class HttpThreadController implements ThreadController {
|
||||||
private state: ThreadState = {
|
private state: ThreadState = {
|
||||||
@@ -123,8 +65,7 @@ export class HttpThreadController implements ThreadController {
|
|||||||
private requests = new Map<string, Request>();
|
private requests = new Map<string, Request>();
|
||||||
private aliases = new Map<string, Ref>();
|
private aliases = new Map<string, Ref>();
|
||||||
private abort = new AbortController();
|
private abort = new AbortController();
|
||||||
private timer?: ReturnType<typeof setTimeout>;
|
private timer?: ReturnType<typeof setInterval>;
|
||||||
private refreshNeeded = false;
|
|
||||||
private refreshing?: Promise<void>;
|
private refreshing?: Promise<void>;
|
||||||
private closed = false;
|
private closed = false;
|
||||||
constructor(
|
constructor(
|
||||||
@@ -135,6 +76,9 @@ export class HttpThreadController implements ThreadController {
|
|||||||
void this.refresh()
|
void this.refresh()
|
||||||
.catch((error) => this.patch({ error: String(error), loading: false }))
|
.catch((error) => this.patch({ error: String(error), loading: false }))
|
||||||
.finally(() => this.stream());
|
.finally(() => this.stream());
|
||||||
|
this.timer = setInterval(() => {
|
||||||
|
void this.refresh().catch(() => {});
|
||||||
|
}, 2000);
|
||||||
}
|
}
|
||||||
getSnapshot = () => this.state;
|
getSnapshot = () => this.state;
|
||||||
subscribe = (callback: () => void) => {
|
subscribe = (callback: () => void) => {
|
||||||
@@ -346,21 +290,6 @@ export class HttpThreadController implements ThreadController {
|
|||||||
if (!older) this.refreshing = task;
|
if (!older) this.refreshing = task;
|
||||||
return task;
|
return task;
|
||||||
};
|
};
|
||||||
private scheduleRefresh() {
|
|
||||||
this.refreshNeeded = true;
|
|
||||||
if (this.closed || this.timer) return;
|
|
||||||
this.timer = setTimeout(() => {
|
|
||||||
this.timer = undefined;
|
|
||||||
this.refreshNeeded = false;
|
|
||||||
void (async () => {
|
|
||||||
// A notification arriving during a previous snapshot needs a subsequent
|
|
||||||
// read, not merely the same in-flight promise.
|
|
||||||
await this.refreshing?.catch(() => {});
|
|
||||||
await this.refresh().catch(() => {});
|
|
||||||
if (this.refreshNeeded) this.scheduleRefresh();
|
|
||||||
})();
|
|
||||||
}, 100);
|
|
||||||
}
|
|
||||||
private async stream() {
|
private async stream() {
|
||||||
while (!this.closed) {
|
while (!this.closed) {
|
||||||
try {
|
try {
|
||||||
@@ -371,7 +300,6 @@ export class HttpThreadController implements ThreadController {
|
|||||||
);
|
);
|
||||||
if (!response.ok || !response.body) throw Error("Live Agent stream unavailable");
|
if (!response.ok || !response.body) throw Error("Live Agent stream unavailable");
|
||||||
this.patch({ connected: true });
|
this.patch({ connected: true });
|
||||||
this.scheduleRefresh();
|
|
||||||
const reader = response.body.getReader(),
|
const reader = response.body.getReader(),
|
||||||
decoder = new TextDecoder();
|
decoder = new TextDecoder();
|
||||||
let buffer = "";
|
let buffer = "";
|
||||||
@@ -387,10 +315,6 @@ export class HttpThreadController implements ThreadController {
|
|||||||
buffer = buffer.slice(end + 1);
|
buffer = buffer.slice(end + 1);
|
||||||
if (!line) continue;
|
if (!line) continue;
|
||||||
const event = JSON.parse(line);
|
const event = JSON.parse(line);
|
||||||
if (event.type === "graph") {
|
|
||||||
this.scheduleRefresh();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (event.type === "reset") {
|
if (event.type === "reset") {
|
||||||
await this.refresh();
|
await this.refresh();
|
||||||
break;
|
break;
|
||||||
@@ -501,7 +425,7 @@ export class HttpThreadController implements ThreadController {
|
|||||||
close = () => {
|
close = () => {
|
||||||
this.closed = true;
|
this.closed = true;
|
||||||
this.abort.abort();
|
this.abort.abort();
|
||||||
clearTimeout(this.timer);
|
clearInterval(this.timer);
|
||||||
this.listeners.clear();
|
this.listeners.clear();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user