@gaia-ai/addon-remote-drupal 0.11.1 → 0.11.2

package/dist/src/index.d.ts

@@ -24,7 +24,6 @@ export declare class DrupalGaiaRemote implements GaiaRemote {
     fetchFinalizableRuns(id: string): Promise<FinalizableRun[]>;
     finalizeRun(uuid: string, log: string, metrics?: RunMetrics): Promise<void>;
     fetchUncleanedTickets(id: string): Promise<UncleanTicket[]>;
-    closeTicket(uuid: string): Promise<void>;
     markTicketCleanedUp(uuid: string): Promise<void>;
     /**
      * UUID + absolute worktree path of the ticket's latest run (highest run id

package/dist/src/index.js

@@ -2,16 +2,6 @@ import { toUnixSeconds } from '@gaia-ai/core';
 import { resolveAuth } from 'dropsh';
 import { createHttpClient, createJsonApiClient } from 'dropsh/plugin';
 const ACTIVE = ['claimed', 'running'];
-/**
- * Terminal ticket states — the reap work list's state branch (GAIA-243).
- *
- * Mirrors the server's `TypeWorkflows::isTerminal()`, which derives terminality
- * from `gaia_core.workflows.yml` (a state no transition leaves). Every ticket
- * workflow there currently ends in exactly these two. When a workflow gains a
- * terminal state, this is the list to extend — and the access handler needs no
- * change, since it asks the workflow definition directly.
- */
-const TERMINAL = ['done', 'cancelled'];
 /**
  * The process-identity attributes a registration carries, if any (GAIA-232).
  *
@@ -347,54 +337,47 @@ export class DrupalGaiaRemote {
         }); // NO state — the run is already done.
     }
     async fetchUncleanedTickets(id) {
-        // Finished tickets whose worktree is not yet torn down (cleaned_up=0),
-        // driven by the durable `cleaned_up` flag (GAIA-89) AND scoped to this
+        // Closed tickets whose worktree is not yet torn down, scoped to this
         // conductor (GAIA-121): only tickets assigned to `id` are loaded, so a
-        // ticket owned by another conductor never reaches the reaper loop.
-        // "Finished" = reached a TERMINAL state (`done` or `cancelled` — GAIA-243)
-        // OR already `closed`. A cancelled ticket keeps closed=0, since nothing
-        // server-side closes a ticket on a transition, so it needs the state branch
-        // to reach it at all. The collection builder has no OR across DIFFERENT
-        // fields, so state-or-closed stays two AND-queries merged + de-duped by
-        // uuid; whereIn covers the several states within one of them, at no extra
-        // round-trip. The `conductor_id` relationship carries the assigned
-        // conductor's `machine_id` — the same nested filter the sibling reaper
-        // queries (`fetchFinalizableRuns` etc.) use.
-        const fields = ['branch_name', 'state', 'closed'];
-        const done = await this.api
+        // ticket owned by another conductor never reaches the reaper loop. Since
+        // GAIA-451 the server closes every terminal ticket on its own save
+        // (GaiaTicket::preSave()), so this asks one question — closed but not
+        // cleaned up — with no workflow-state reasoning left in it. `cleaned_up`
+        // is nullable and an unwritten Drupal boolean is NULL, and `NULL = 0`
+        // matches nothing in SQL, so the NULL twin is a second query rather than a
+        // looser operator (GAIA-364 D1, absorbed here). The collection builder has
+        // no OR across DIFFERENT conditions on the same field, so the two stay
+        // separate AND-queries merged + de-duped by uuid. The `conductor_id`
+        // relationship carries the assigned conductor's `machine_id` — the same
+        // nested filter the sibling reaper queries (`fetchFinalizableRuns` etc.)
+        // use.
+        const fields = ['branch_name'];
+        const uncleaned = await this.api
             .collection('gaia_ticket')
             .where('conductor_id.conductor_id', '=', id)
-            .whereIn('state', TERMINAL)
+            .where('closed', '=', '1')
             .where('cleaned_up', '=', '0')
             .fields(fields)
             .page(100)
             .list();
-        const closed = await this.api
+        const neverWritten = await this.api
             .collection('gaia_ticket')
             .where('conductor_id.conductor_id', '=', id)
             .where('closed', '=', '1')
-            .where('cleaned_up', '=', '0')
+            .notExists('cleaned_up')
             .fields(fields)
             .page(100)
             .list();
         const byUuid = new Map();
-        for (const r of [...done, ...closed]) {
+        for (const r of [...uncleaned, ...neverWritten]) {
             byUuid.set(r.id, r);
         }
         return Promise.all([...byUuid.values()].map(async (r) => ({
             ticketUuid: r.id,
             branchName: r.attr('branch_name') ?? '',
-            state: r.attr('state') ?? '',
-            closed: r.attr('closed') ?? false,
             ...(await this.latestRun(r.id)),
         })));
     }
-    async closeTicket(uuid) {
-        const t = Math.floor(Date.now() / 1000);
-        await this.api.update('gaia_ticket', uuid, {
-            attributes: { closed: true, closed_date: t },
-        }); // NO state — the ticket is already done.
-    }
     async markTicketCleanedUp(uuid) {
         await this.api.update('gaia_ticket', uuid, {
             attributes: { cleaned_up: true },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/addon-remote-drupal",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "GAIA conductor remote addon: the Drupal/JSON:API control-plane remote.",
   "type": "module",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "dropsh": "^0.6.1"
   },
   "peerDependencies": {
-    "@gaia-ai/conductor": "^0.11.1",
-    "@gaia-ai/core": "^0.11.1"
+    "@gaia-ai/conductor": "^0.11.2",
+    "@gaia-ai/core": "^0.11.2"
   }
 }