@gaia-ai/addon-remote-drupal 0.6.3 → 0.6.5

package/dist/src/index.js

@@ -6,6 +6,16 @@
 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'];
 export class DrupalGaiaRemote {
     api;
     constructor(api) {
@@ -271,16 +281,21 @@ export class DrupalGaiaRemote {
         // 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
         // conductor (GAIA-121): only tickets assigned to `id` are loaded, so a
-        // ticket owned by another conductor never reaches the reaper loop. "Finished"
-        // = reached `done` OR already `closed`; the collection builder has no OR, so
-        // this is two 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.
+        // 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
             .collection('gaia_ticket')
             .where('conductor_id.machine_id', '=', id)
-            .where('state', '=', 'done')
+            .whereIn('state', TERMINAL)
             .where('cleaned_up', '=', '0')
             .fields(fields)
             .page(100)

package/package.json

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