@gaia-ai/addon-remote-drupal 0.10.0 → 0.11.0

package/dist/src/index.d.ts

@@ -5,6 +5,10 @@ export declare class DrupalGaiaRemote implements GaiaRemote {
     constructor(api: JsonApiClient);
     fetchActiveRuns(id: string): Promise<ActiveRun[]>;
     activeRunCount(id: string): Promise<number>;
+    machineCapacity(hostKey: string): Promise<{
+        maxParallel: number;
+        currentLoad: number;
+    } | null>;
     claimNext(c: ClaimOptions): Promise<ClaimedRun | null>;
     getTicket(uuid: string): Promise<Ticket>;
     getRunWorktree(uuid: string): Promise<string>;
@@ -47,6 +51,13 @@ export declare class DrupalGaiaRemote implements GaiaRemote {
      * so it degrades to '' and the row still renders.
      */
     private projectName;
+    /**
+     * Host concurrent-run budget for a machine uuid (GAIA-353).
+     *
+     * Best-effort: an unreadable or missing machine degrades to 0 so the row
+     * still lists; capacity is never invented from a conductor field.
+     */
+    private machineMaxParallel;
     private projectUuid;
 }
 export declare function drupalRemote(): RemotePlugin;

package/dist/src/index.js

@@ -34,12 +34,12 @@ export class DrupalGaiaRemote {
         this.api = api;
     }
     async fetchActiveRuns(id) {
-        // The conductor identity `id` is the machine_id (hash of hostname+path).
+        // The conductor identity `id` is the registration key (conductor_id).
         // gaia_run links to its owning conductor via the `conductor_id` entity-ref;
-        // filter on the related conductor's `machine_id` (nested relationship filter).
+        // filter on the related conductor's registration string field.
         const rows = await this.api
             .collection('gaia_run')
-            .where('conductor_id.machine_id', '=', id)
+            .where('conductor_id.conductor_id', '=', id)
             .whereIn('state', ACTIVE)
             .fields(['state', 'state_at_start', 'worktree_path'])
             .page(100)
@@ -55,22 +55,39 @@ export class DrupalGaiaRemote {
         })));
     }
     async activeRunCount(id) {
-        // Filter on the related conductor's `machine_id` (nested relationship filter).
+        // Filter on the related conductor's registration string field.
         return this.api
             .collection('gaia_run')
-            .where('conductor_id.machine_id', '=', id)
+            .where('conductor_id.conductor_id', '=', id)
             .whereIn('state', ACTIVE)
             .fields(['drupal_internal__id'])
             .page(100)
             .count();
     }
+    async machineCapacity(hostKey) {
+        // Shared host budget (GAIA-353 D5): read gaia_machine after heartbeat so
+        // current_load is peers + this process. Filter on host_key (MachineContext
+        // stem), not the composed conductor_id.
+        const row = await this.api
+            .collection('gaia_machine')
+            .where('host_key', '=', hostKey)
+            .fields(['max_parallel', 'current_load'])
+            .first();
+        if (!row)
+            return null;
+        return {
+            maxParallel: row.attr('max_parallel') ?? 1,
+            currentLoad: row.attr('current_load') ?? 0,
+        };
+    }
     async claimNext(c) {
         const res = (await this.api.post('gaia/claim-next', {
             data: {
                 attributes: {
                     lease_seconds: c.leaseSeconds,
                     // Server (`ConductorResolverTrait`) narrows to the caller's conductor
-                    // by the `machine_id` attribute; `c.conductorId` IS the machine_id.
+                    // by conductor_id (legacy machine_id still accepted).
+                    conductor_id: c.conductorId,
                     machine_id: c.conductorId,
                 },
             },
@@ -160,14 +177,16 @@ export class DrupalGaiaRemote {
         return ticket.attr('branch_name') ?? '';
     }
     async registerConductor(reg) {
-        const r = await this.api.upsert('gaia_conductor', { path: 'machine_id', value: reg.id }, {
+        // Heartbeat is the authoritative upsert (creates machine + conductor).
+        // Keep JSON:API upsert as a best-effort create path for attributes the
+        // heartbeat already covers; key on conductor_id (GAIA-353).
+        const r = await this.api.upsert('gaia_conductor', { path: 'conductor_id', value: reg.id }, {
             attributes: {
-                machine_id: reg.id,
+                conductor_id: reg.id,
                 status: 'online',
                 workspace_root: reg.workspace,
                 label: reg.label,
                 states: reg.states,
-                max_parallel: reg.max_parallel,
                 ...processIdentity(reg),
             },
             relationships: {
@@ -185,13 +204,14 @@ export class DrupalGaiaRemote {
         return r.id; // drupal uuid
     }
     async heartbeat(reg, load, lease = 300) {
-        // Server-side upsert by machine_id (see HeartbeatResource): never 404s,
+        // Server-side upsert by conductor_id (see HeartbeatResource): never 404s,
         // heals a vanished registration, and returns the resulting status. Sending
         // the full registration lets the server recreate the entity when missing.
         const res = (await this.api.post('gaia/heartbeat', {
             data: {
                 attributes: {
-                    machine_id: reg.id,
+                    conductor_id: reg.id,
+                    host_key: reg.host_key ?? reg.id,
                     project: reg.project,
                     states: reg.states,
                     workspace_root: reg.workspace,
@@ -209,7 +229,7 @@ export class DrupalGaiaRemote {
     async getConductorStatus(id) {
         const c = await this.api
             .collection('gaia_conductor')
-            .where('machine_id', '=', id)
+            .where('conductor_id', '=', id)
             .fields(['status'])
             .first();
         return c ? (c.attr('status') ?? null) : null;
@@ -217,7 +237,7 @@ export class DrupalGaiaRemote {
     async setConductorStatus(id, status) {
         const c = await this.api
             .collection('gaia_conductor')
-            .where('machine_id', '=', id)
+            .where('conductor_id', '=', id)
             .first();
         if (c) {
             await this.api.update('gaia_conductor', c.id, { attributes: { status } });
@@ -232,10 +252,16 @@ export class DrupalGaiaRemote {
         // Resolve each distinct project once rather than per row: a machine
         // typically runs several conductors of the same project.
         const projectNames = new Map();
+        // Host capacity SoT is gaia_machine (GAIA-353); conductor.max_parallel is gone.
+        const machineMaxParallel = new Map();
         for (const r of rows) {
-            const uuid = r.rel('project_id');
-            if (uuid && !projectNames.has(uuid)) {
-                projectNames.set(uuid, await this.projectName(uuid));
+            const projectUuid = r.rel('project_id');
+            if (projectUuid && !projectNames.has(projectUuid)) {
+                projectNames.set(projectUuid, await this.projectName(projectUuid));
+            }
+            const machineUuid = r.rel('machine');
+            if (machineUuid && !machineMaxParallel.has(machineUuid)) {
+                machineMaxParallel.set(machineUuid, await this.machineMaxParallel(machineUuid));
             }
         }
         return rows.map((r) => {
@@ -245,16 +271,21 @@ export class DrupalGaiaRemote {
             const pid = r.attr('last_pid');
             const name = r.attr('conductor_name');
             return {
-                id: r.attr('machine_id') ?? r.id,
+                id: r.attr('conductor_id') ??
+                    r.attr('machine_id') ??
+                    r.id,
                 project: projectNames.get(r.rel('project_id') ?? '') ?? '',
                 label: r.attr('label') ?? '',
                 status: r.attr('status') ?? '',
                 // ISO-8601 over the wire, not the unix integer the field name implies.
                 lastSeen: toUnixSeconds(r.attr('last_seen')) ?? 0,
-                load: r.attr('current_load') ?? 0,
+                // Process load telemetry; host capacity is on gaia_machine (GAIA-353).
+                load: r.attr('reported_load') ??
+                    r.attr('current_load') ??
+                    0,
                 workspaceRoot: r.attr('workspace_root') ?? '',
                 leaseExpiresAt: toUnixSeconds(r.attr('lease_expires_at')) ?? 0,
-                maxParallel: r.attr('max_parallel') ?? 0,
+                maxParallel: machineMaxParallel.get(r.rel('machine') ?? '') ?? 0,
                 ...(typeof pid === 'number' ? { lastPid: pid } : {}),
                 ...(typeof name === 'string' && name !== ''
                     ? { conductorName: name }
@@ -287,7 +318,7 @@ export class DrupalGaiaRemote {
     async fetchFinalizableRuns(id) {
         const rows = await this.api
             .collection('gaia_run')
-            .where('conductor_id.machine_id', '=', id)
+            .where('conductor_id.conductor_id', '=', id)
             .where('state', '=', 'done')
             .where('closed', '=', '0')
             .fields(['worktree_path', 'agent', 'drupal_internal__id'])
@@ -332,7 +363,7 @@ export class DrupalGaiaRemote {
         const fields = ['branch_name', 'state', 'closed'];
         const done = await this.api
             .collection('gaia_ticket')
-            .where('conductor_id.machine_id', '=', id)
+            .where('conductor_id.conductor_id', '=', id)
             .whereIn('state', TERMINAL)
             .where('cleaned_up', '=', '0')
             .fields(fields)
@@ -340,7 +371,7 @@ export class DrupalGaiaRemote {
             .list();
         const closed = await this.api
             .collection('gaia_ticket')
-            .where('conductor_id.machine_id', '=', id)
+            .where('conductor_id.conductor_id', '=', id)
             .where('closed', '=', '1')
             .where('cleaned_up', '=', '0')
             .fields(fields)
@@ -462,6 +493,21 @@ export class DrupalGaiaRemote {
             return '';
         }
     }
+    /**
+     * Host concurrent-run budget for a machine uuid (GAIA-353).
+     *
+     * Best-effort: an unreadable or missing machine degrades to 0 so the row
+     * still lists; capacity is never invented from a conductor field.
+     */
+    async machineMaxParallel(uuid) {
+        try {
+            const m = await this.api.resource('gaia_machine', uuid);
+            return m.attr('max_parallel') ?? 0;
+        }
+        catch {
+            return 0;
+        }
+    }
     async projectUuid(name) {
         // A project's name→uuid never changes, so cache it: gatherBatch resolves
         // many identifiers per `gaia deployment tickets` call, each of which would

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/addon-remote-drupal",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "GAIA conductor remote addon: the Drupal/JSON:API control-plane remote.",
   "type": "module",
   "license": "MIT",
@@ -20,10 +20,10 @@
     "directory": "gaia-cli/addons/remote-drupal"
   },
   "dependencies": {
-    "dropsh": "^0.5.8"
+    "dropsh": "^0.6.1"
   },
   "peerDependencies": {
-    "@gaia-ai/conductor": "^0.10.0",
-    "@gaia-ai/core": "^0.10.0"
+    "@gaia-ai/conductor": "^0.11.0",
+    "@gaia-ai/core": "^0.11.0"
   }
 }