orkestrator 2.25.0-alpha → 2.26.0-alpha

package/dist/client.js

@@ -7444,7 +7444,7 @@ import path4 from "path";
 // ../../apps/backend/package.json
 var package_default = {
   name: "@orkestrator/backend",
-  version: "2.25.0-alpha",
+  version: "2.26.0-alpha",
   private: true,
   type: "module",
   exports: {

package/dist/main.js

@@ -815,7 +815,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@orkestrator/backend",
-    version: "2.25.0-alpha",
+    version: "2.26.0-alpha",
     private: true,
     type: "module",
     exports: {
@@ -126665,12 +126665,12 @@ function toNodeProjectSummary(nodeId, raw, index) {
     ref,
     key: projectKey(ref),
     name: boundedText(raw.name) || "Untitled project",
-    order: typeof raw.order === "number" ? raw.order : index,
+    order: typeof raw.order === "number" && Number.isFinite(raw.order) ? raw.order : index,
     ...typeof raw.folder === "string" && raw.folder ? { folder: boundedText(raw.folder, 64) } : {},
     ...hint ? { repositoryHint: hint } : {}
   };
 }
-function toNodeEnvironmentSummary(nodeId, raw) {
+function toNodeEnvironmentSummary(nodeId, raw, index = 0) {
   if (typeof raw.id !== "string" || !raw.id || typeof raw.projectId !== "string")
     return null;
   const ref = environmentRef(nodeId, raw.id);
@@ -126679,6 +126679,7 @@ function toNodeEnvironmentSummary(nodeId, raw) {
     key: environmentKey(ref),
     projectId: raw.projectId,
     name: boundedText(raw.name) || "Environment",
+    order: typeof raw.order === "number" && Number.isFinite(raw.order) ? raw.order : index,
     ...typeof raw.branch === "string" ? { branch: boundedText(raw.branch) } : {},
     status: boundedText(raw.status, 32) || "stopped",
     activity: normalizeActivity(raw.agentActivityState),
@@ -128468,6 +128469,7 @@ class NodeCoordination {
 }
 
 // ../../apps/backend/src/core/nodes/node-portal.ts
+init_backend_profile();
 init_federation();
 import { randomUUID as randomUUID6 } from "crypto";
 
@@ -128821,6 +128823,7 @@ class NodeReadModel {
   changeTimer = null;
   started = false;
   listeners = new Set;
+  self = { id: null, summary: null, stale: true, reading: null };
   constructor(options2) {
     this.options = options2;
   }
@@ -128855,7 +128858,7 @@ class NodeReadModel {
     this.listeners.add(listener);
     return () => this.listeners.delete(listener);
   }
-  async summaries(nodeIds) {
+  async summaries(nodeIds, options2 = {}) {
     const list = await this.options.nodes.listNodes();
     for (const view of list.nodes)
       this.views.set(view.nodeId, view);
@@ -128878,7 +128881,73 @@ class NodeReadModel {
         environments: state ? [...state.environmentsByProject.values()].flat() : []
       });
     }
-    return { selfId: await this.options.nodes.selfIdentity(), nodes };
+    const self = options2.includeSelf ? await this.readSelf() : null;
+    return { selfId: await this.options.nodes.selfIdentity(), nodes, ...self ? { self } : {} };
+  }
+  noteLocalEvent(event, payload) {
+    if (event === RESOURCE_CHANGED_EVENT) {
+      const resource = payload?.resource;
+      if (resource !== "project" && resource !== "environment")
+        return;
+    } else if (event !== BACKEND_PROFILE_CHANGED_EVENT) {
+      return;
+    }
+    this.self.stale = true;
+    if (this.self.id)
+      this.noteChanged(this.self.id);
+  }
+  now() {
+    return (this.options.now ?? Date.now)();
+  }
+  readSelf() {
+    const local = this.options.local;
+    if (!local)
+      return Promise.resolve(null);
+    if (this.self.summary && !this.self.stale)
+      return Promise.resolve(this.self.summary);
+    if (this.self.reading)
+      return this.self.reading;
+    this.self.stale = false;
+    const run = (async () => {
+      try {
+        const [nodeId, profile] = await Promise.all([
+          this.options.nodes.selfIdentity(),
+          this.options.nodes.selfProfile()
+        ]);
+        this.self.id = nodeId;
+        const { projects, truncated: projectsTruncated } = await readProjects(nodeId, local.invoke);
+        const environments = await this.readEnvironments(nodeId, local.invoke, projects.map((project) => project.ref.projectId));
+        let truncated = projectsTruncated;
+        const rows = [];
+        for (const project of projects) {
+          const result = environments.get(project.ref.projectId);
+          if (!result) {
+            this.self.stale = true;
+            truncated = true;
+            rows.push(...this.self.summary?.environments.filter((row) => row.projectId === project.ref.projectId) ?? []);
+            continue;
+          }
+          truncated ||= result.truncated;
+          rows.push(...result.environments);
+        }
+        this.self.summary = {
+          nodeId,
+          displayName: profile.displayName,
+          ...profile.colorToken ? { colorToken: profile.colorToken } : {},
+          loadedAt: this.now(),
+          truncated,
+          projects,
+          environments: rows
+        };
+      } catch {
+        this.self.stale = true;
+      }
+      return this.self.summary;
+    })().finally(() => {
+      this.self.reading = null;
+    });
+    this.self.reading = run;
+    return run;
   }
   async sync() {
     if (!this.started)
@@ -128918,7 +128987,7 @@ class NodeReadModel {
         prefixes: NODE_SUMMARY_EVENT_PREFIXES,
         ...this.options.fetchImpl ? { fetchImpl: this.options.fetchImpl } : {},
         onOpen: () => void this.requestHydrate(view.nodeId),
-        onEvent: (event, payload) => this.handleEvent(view.nodeId, epoch, event, payload)
+        onEvent: (event, payload) => void this.handleEvent(view.nodeId, epoch, event, payload)
       });
       state.stream.start();
       this.requestHydrate(view.nodeId);
@@ -128958,7 +129027,7 @@ class NodeReadModel {
     }
     return state;
   }
-  handleEvent(nodeId, epoch, event, payload) {
+  async handleEvent(nodeId, epoch, event, payload) {
     const state = this.states.get(nodeId);
     if (!state || state.epoch !== epoch)
       return;
@@ -128973,7 +129042,12 @@ class NodeReadModel {
       return;
     }
     if (event === BACKEND_PROFILE_CHANGED_EVENT) {
-      this.noteChanged(nodeId);
+      try {
+        await this.options.nodes.recordProfile(nodeId, parseBackendProfile(payload));
+        if (this.started && this.states.get(nodeId) === state && state.epoch === epoch) {
+          this.noteChanged(nodeId);
+        }
+      } catch {}
       return;
     }
     if (event !== RESOURCE_CHANGED_EVENT || !payload || typeof payload !== "object")
@@ -129025,7 +129099,7 @@ class NodeReadModel {
     if (!state || !link?.connected)
       return;
     const epoch = state.epoch;
-    const updates = await this.readEnvironments(nodeId, link, projectIds);
+    const updates = await this.readEnvironments(nodeId, (command, args) => link.invoke(command, args), projectIds);
     if (this.states.get(nodeId) !== state || state.epoch !== epoch)
       return;
     for (const [projectId, result] of updates) {
@@ -129060,17 +129134,13 @@ class NodeReadModel {
       return;
     const epoch = state.epoch;
     try {
-      const rawProjects = await link.invoke("get_projects");
-      const list = Array.isArray(rawProjects) ? rawProjects : [];
-      const projects = list.slice(0, MAX_SUMMARY_PROJECTS).flatMap((raw, index) => {
-        const project = raw && typeof raw === "object" ? toNodeProjectSummary(state.nodeId, raw, index) : null;
-        return project ? [project] : [];
-      }).sort((a, b) => a.order - b.order);
-      const environments = await this.readEnvironments(state.nodeId, link, projects.map((project) => project.ref.projectId));
+      const invoke = (command, args) => link.invoke(command, args);
+      const { projects, truncated: projectsTruncated } = await readProjects(state.nodeId, invoke);
+      const environments = await this.readEnvironments(state.nodeId, invoke, projects.map((project) => project.ref.projectId));
       if (this.states.get(state.nodeId) !== state || state.epoch !== epoch)
         return;
       const environmentsByProject = new Map;
-      let truncated = list.length > MAX_SUMMARY_PROJECTS;
+      let truncated = projectsTruncated;
       let failed = false;
       for (const project of projects) {
         const result = environments.get(project.ref.projectId);
@@ -129098,19 +129168,19 @@ class NodeReadModel {
       this.noteChanged(state.nodeId);
     }
   }
-  async readEnvironments(nodeId, link, projectIds) {
+  async readEnvironments(nodeId, invoke, projectIds) {
     const results = new Map;
     let next = 0;
     const worker = async () => {
       while (next < projectIds.length) {
         const projectId = projectIds[next++];
         try {
-          const raw = await link.invoke("get_environment_snapshots", { projectId });
+          const raw = await invoke("get_environment_snapshots", { projectId });
           const list = Array.isArray(raw) ? raw : [];
-          const environments = list.slice(0, MAX_SUMMARY_ENVIRONMENTS_PER_PROJECT).flatMap((entry) => {
-            const environment = entry && typeof entry === "object" ? toNodeEnvironmentSummary(nodeId, entry) : null;
+          const environments = list.flatMap((entry, index) => {
+            const environment = entry && typeof entry === "object" ? toNodeEnvironmentSummary(nodeId, entry, index) : null;
             return environment ? [environment] : [];
-          });
+          }).sort((a, b) => a.order - b.order).slice(0, MAX_SUMMARY_ENVIRONMENTS_PER_PROJECT);
           results.set(projectId, {
             environments,
             truncated: list.length > MAX_SUMMARY_ENVIRONMENTS_PER_PROJECT
@@ -129195,6 +129265,15 @@ class NodeReadModel {
     }
   }
 }
+async function readProjects(nodeId, invoke) {
+  const raw = await invoke("get_projects");
+  const list = Array.isArray(raw) ? raw : [];
+  const projects = list.slice(0, MAX_SUMMARY_PROJECTS).flatMap((entry, index) => {
+    const project = entry && typeof entry === "object" ? toNodeProjectSummary(nodeId, entry, index) : null;
+    return project ? [project] : [];
+  }).sort((a, b) => a.order - b.order);
+  return { projects, truncated: list.length > MAX_SUMMARY_PROJECTS };
+}
 function safeMessage(error) {
   const message = error instanceof Error ? error.message : String(error);
   return message.replace(/[\u0000-\u001f\u007f]+/g, " ").replace(/Bearer\s+\S+/gi, "Bearer [redacted]").slice(0, 200);
@@ -129555,6 +129634,7 @@ class NodePortal {
       nodes: options2.nodes,
       emit: options2.emit,
       ...options2.summaries ? { persistence: options2.summaries } : {},
+      ...options2.local ? { local: options2.local } : {},
       ...options2.fetchImpl ? { fetchImpl: options2.fetchImpl } : {},
       ...options2.now ? { now: options2.now } : {}
     });
@@ -129573,11 +129653,16 @@ class NodePortal {
     this.grants.revokeAll();
     this.workspaces.clear();
   }
-  summaries(nodeIds) {
+  summaries(nodeIds, includeSelf) {
     if (nodeIds !== undefined && (!Array.isArray(nodeIds) || !nodeIds.every(isBackendId))) {
       throw new Error("Expected nodeIds to be node identities.");
     }
-    return this.readModel.summaries(nodeIds);
+    if (includeSelf !== undefined && typeof includeSelf !== "boolean") {
+      throw new Error("Expected includeSelf to be a boolean.");
+    }
+    return this.readModel.summaries(nodeIds, {
+      includeSelf: includeSelf === true
+    });
   }
   async invokeOnNode(args) {
     const nodeId = args.nodeId;
@@ -129598,6 +129683,11 @@ class NodePortal {
       await this.afterRouted?.(nodeId, args.command, commandArgs, result.result).catch((error) => {
         console.warn("[nodes] Post-command step on a node failed:", error instanceof Error ? error.name : "unknown");
       });
+      if (args.command === "update_backend_profile") {
+        try {
+          await this.options.nodes.recordProfile(nodeId, parseBackendProfile(result.result));
+        } catch {}
+      }
       this.readModel.requestHydrate(nodeId);
     }
     return result;
@@ -129850,6 +129940,9 @@ class NodeService {
   selfIdentity() {
     return this.self();
   }
+  selfProfile() {
+    return this.storage.getBackendProfile();
+  }
   async status() {
     const registry = await this.currentRegistry();
     const mode = this.mode();
@@ -130490,6 +130583,37 @@ class NodeService {
       console.warn("[nodes] Could not record a node verification:", errorCode(error));
     }
   }
+  async recordProfile(nodeId, profile) {
+    try {
+      await this.mutateRegistry((registry) => {
+        const node = registry.nodes.find((entry) => entry.nodeId === nodeId);
+        const cached = node?.profileCache;
+        if (!node || cached && cached.revision > profile.revision) {
+          return { next: null, result: undefined };
+        }
+        if (cached && cached.revision === profile.revision && cached.displayName === profile.displayName && cached.colorToken === profile.colorToken) {
+          return { next: null, result: undefined };
+        }
+        const updated = {
+          ...node,
+          profileCache: {
+            displayName: profile.displayName,
+            colorToken: profile.colorToken,
+            revision: profile.revision
+          }
+        };
+        return {
+          next: {
+            ...registry,
+            nodes: registry.nodes.map((entry) => entry.nodeId === nodeId ? updated : entry)
+          },
+          result: undefined
+        };
+      });
+    } catch (error) {
+      console.warn("[nodes] Could not record a node profile:", errorCode(error));
+    }
+  }
   async adoptIdentity(provisionalId, installationId) {
     const selfId = await this.self();
     if (installationId === selfId)
@@ -156958,6 +157082,7 @@ function registerBackendProfileCommands(register) {
   register("update_backend_profile", async (args, context) => {
     const profile = await context.storage.updateBackendProfile(parseBackendProfileUpdate(args));
     context.emit(BACKEND_PROFILE_CHANGED_EVENT, profile);
+    context.nodePortal?.readModel.noteLocalEvent(BACKEND_PROFILE_CHANGED_EVENT, profile);
     return profile;
   });
 }
@@ -157062,8 +157187,8 @@ function registerNodeCommands(register) {
     return nodes(context).trustHostKey(args.probeId);
   });
   register("get_node_summaries", async (args, context) => {
-    assertOnlyKeys(args, ["nodeIds"], "arguments");
-    return portal(context).summaries(args.nodeIds);
+    assertOnlyKeys(args, ["nodeIds", "includeSelf"], "arguments");
+    return portal(context).summaries(args.nodeIds, args.includeSelf);
   });
   register("invoke_on_node", async (args, context) => {
     assertOnlyKeys(args, ["nodeId", "command", "args", "requestKey"], "arguments");
@@ -227349,6 +227474,7 @@ class OrkestratorBackend {
     }
     storage.setResourceChangeListener((change) => {
       options2.emit(RESOURCE_CHANGED_EVENT, change);
+      this.nodePortal?.readModel.noteLocalEvent(RESOURCE_CHANGED_EVENT, change);
     });
     const context = {
       storage,
@@ -227416,6 +227542,7 @@ class OrkestratorBackend {
     this.nodePortal = new NodePortal({
       nodes: this.nodes,
       emit: (event, payload) => options2.emit(event, payload),
+      local: { invoke: (command, args = {}) => this.invoke(command, args) },
       summaries: {
         load: () => storage.loadNodeSummariesCache(),
         save: (value) => storage.saveNodeSummariesCache(value)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orkestrator",
-  "version": "2.25.0-alpha",
+  "version": "2.26.0-alpha",
   "description": "Run the Orkestrator backend service without the desktop application",
   "homepage": "https://orkestrator.dev",
   "repository": {
@@ -39,8 +39,8 @@
     "sharp": "0.35.5"
   },
   "devDependencies": {
-    "@orkestrator/protocol": "2.25.0-alpha",
-    "@orkestrator/toolchain": "2.25.0-alpha"
+    "@orkestrator/protocol": "2.26.0-alpha",
+    "@orkestrator/toolchain": "2.26.0-alpha"
   },
   "engines": {
     "bun": ">=1.4.3"