agor-live 0.21.2 → 0.22.0

package/dist/daemon/services/groups.d.ts

@@ -29,6 +29,8 @@ export declare function requireBranchGrantManager(branchRepo: BranchRepository,
 export declare function setupBranchGroupGrantsService(app: import('@agor/core/feathers').Application, db: Database, branchRepo: BranchRepository): void;
 export declare function setupBoardGroupGrantsService(app: import('@agor/core/feathers').Application, db: Database): void;
 export declare function setupBranchEffectiveAccessService(app: import('@agor/core/feathers').Application, branchRepo: BranchRepository): void;
+export declare function setupBoardAlignedBranchesService(app: import('@agor/core/feathers').Application, branchRepo: BranchRepository): void;
+export declare function setupBranchFsAccessUsersService(app: import('@agor/core/feathers').Application, branchRepo: BranchRepository): void;
 export declare const groupsHooks: {
     before: {
         all: (typeof requireMember)[];

package/dist/daemon/services/groups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"groups.d.ts","sourceRoot":"","sources":["../../src/services/groups.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAmB,KAAK,QAAQ,EAAmB,MAAM,eAAe,CAAC;AAEhF,OAAO,KAAK,EAIV,qBAAqB,EAErB,KAAK,EACL,eAAe,EACf,WAAW,EACX,MAAM,EAEP,MAAM,kBAAkB,CAAC;AAI1B,iBAAS,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAQxD;AAED,iBAAS,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAQvD;AAmBD,wBAAgB,qCAAqC,CACnD,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,KAAK,IAAI,qBAAqB,CAKxC;AAED,wBAAgB,wCAAwC,CAAC,KAAK,EAAE,OAAO,GAAG,qBAAqB,CAI9F;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ;kBAGxB,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YAI/B,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;iBAKlB,OAAO,CAAC,KAAK,CAAC,WAAW,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;cAQnD,MAAM,QAAQ,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;eAQ5C,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;EAI3C;AAED,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,QAAQ;kBAGlC,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;iBAO/C;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,WACpC,MAAM,GACd,OAAO,CAAC,eAAe,CAAC;eASV,MAAM,WAAW,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;EAWtE;AAuBD,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,WAAW,CAAC,CAgBtB;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,EAAE,EAAE,QAAQ,EACZ,UAAU,EAAE,gBAAgB,QAqE7B;AAgCD,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,EAAE,EAAE,QAAQ,QAoEb;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,UAAU,EAAE,gBAAgB,QA4C7B;AAED,eAAO,MAAM,WAAW;;;;;;;CAOvB,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;CAIjC,CAAC"}
+{"version":3,"file":"groups.d.ts","sourceRoot":"","sources":["../../src/services/groups.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAmB,KAAK,QAAQ,EAAmB,MAAM,eAAe,CAAC;AAEhF,OAAO,KAAK,EAMV,qBAAqB,EAErB,KAAK,EACL,eAAe,EACf,WAAW,EACX,MAAM,EAGP,MAAM,kBAAkB,CAAC;AAI1B,iBAAS,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAQxD;AAED,iBAAS,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,CAQvD;AAmBD,wBAAgB,qCAAqC,CACnD,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,KAAK,IAAI,qBAAqB,CAKxC;AAED,wBAAgB,wCAAwC,CAAC,KAAK,EAAE,OAAO,GAAG,qBAAqB,CAI9F;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,QAAQ;kBAGxB,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YAI/B,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;iBAKlB,OAAO,CAAC,KAAK,CAAC,WAAW,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;cAQnD,MAAM,QAAQ,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;eAQ5C,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;EAI3C;AAED,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,QAAQ;kBAGlC,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;iBAO/C;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,WACpC,MAAM,GACd,OAAO,CAAC,eAAe,CAAC;eASV,MAAM,WAAW,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;EAWtE;AAuBD,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,WAAW,CAAC,CAgBtB;AAED,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,EAAE,EAAE,QAAQ,EACZ,UAAU,EAAE,gBAAgB,QAqE7B;AAgCD,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,EAAE,EAAE,QAAQ,QAoEb;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,UAAU,EAAE,gBAAgB,QA4C7B;AAED,wBAAgB,gCAAgC,CAC9C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,UAAU,EAAE,gBAAgB,QAwB7B;AAED,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,OAAO,qBAAqB,EAAE,WAAW,EAC9C,UAAU,EAAE,gBAAgB,QAoC7B;AAED,eAAO,MAAM,WAAW;;;;;;;CAOvB,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;CAIjC,CAAC"}

package/dist/daemon/services/groups.js

@@ -320,6 +320,60 @@ function setupBranchEffectiveAccessService(app, branchRepo) {
     { methods: ["find"] }
   );
 }
+function setupBoardAlignedBranchesService(app, branchRepo) {
+  app.use(
+    "boards/:id/aligned-branches",
+    {
+      async find(params) {
+        const authParams = params;
+        if (authParams?.provider && !authParams.user?._isServiceAccount) {
+          const user = authParams.user;
+          if (!user) throw new NotAuthenticated2("Authentication required");
+          if (!hasMinimumRole2(user.role, ROLES2.ADMIN)) {
+            throw new Forbidden2("Only admins can list board-aligned branches");
+          }
+        }
+        const boardId = paramsRoute(params)?.id;
+        if (!boardId) throw new BadRequest("Board ID is required");
+        return branchRepo.findBoardAlignedBranches(boardId);
+      }
+    },
+    { methods: ["find"] }
+  );
+}
+function setupBranchFsAccessUsersService(app, branchRepo) {
+  app.use(
+    "branches/:id/fs-access-users",
+    {
+      async find(params) {
+        const authParams = params;
+        if (authParams?.provider && !authParams.user?._isServiceAccount) {
+          const user = authParams.user;
+          if (!user) throw new NotAuthenticated2("Authentication required");
+          if (!hasMinimumRole2(user.role, ROLES2.ADMIN)) {
+            throw new Forbidden2("Only admins can list branch filesystem access users");
+          }
+        }
+        const branchId = paramsRoute(params)?.id;
+        if (!branchId) throw new BadRequest("Branch ID is required");
+        const userIds = await branchRepo.findExplicitFsAccessUserIds(branchId);
+        const usersService = app.service("users");
+        const users = await Promise.all(
+          userIds.map(async (userId) => {
+            try {
+              return await usersService.get(userId);
+            } catch (error) {
+              console.error(`Failed to fetch branch filesystem access user ${userId}:`, error);
+              return null;
+            }
+          })
+        );
+        return users.filter((user) => user !== null);
+      }
+    },
+    { methods: ["find"] }
+  );
+}
 var groupsHooks = {
   before: {
     all: [requireMember],
@@ -341,7 +395,9 @@ export {
   groupMembershipsHooks,
   groupsHooks,
   requireBranchGrantManager,
+  setupBoardAlignedBranchesService,
   setupBoardGroupGrantsService,
   setupBranchEffectiveAccessService,
+  setupBranchFsAccessUsersService,
   setupBranchGroupGrantsService
 };

package/dist/daemon/services/mcp-servers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-servers.d.ts","sourceRoot":"","sources":["../../src/services/mcp-servers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,KAAK,QAAQ,EAAuB,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EACV,oBAAoB,EAEpB,SAAS,EAIT,SAAS,EACT,WAAW,EACX,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAEH;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc,CACnD,SAAS,EACT,oBAAoB,GAAG,oBAAoB,EAC3C,eAAe,CAChB;IACC,OAAO,CAAC,aAAa,CAAsB;gBAE/B,EAAE,EAAE,QAAQ;IAcxB;;OAEG;IACG,IAAI,CAAC,MAAM,CAAC,EAAE,eAAe;IA0CnC;;OAEG;IACG,WAAW,CACf,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,SAAS,EAAE,CAAC;CAGxB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,QAAQ,GAAG,iBAAiB,CAEvE"}
+{"version":3,"file":"mcp-servers.d.ts","sourceRoot":"","sources":["../../src/services/mcp-servers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,KAAK,QAAQ,EAAuB,MAAM,eAAe,CAAC;AACnE,OAAO,KAAK,EACV,oBAAoB,EAEpB,SAAS,EAIT,SAAS,EACT,WAAW,EACX,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAEH;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc,CACnD,SAAS,EACT,oBAAoB,GAAG,oBAAoB,EAC3C,eAAe,CAChB;IACC,OAAO,CAAC,aAAa,CAAsB;gBAE/B,EAAE,EAAE,QAAQ;IAcxB;;OAEG;IACG,IAAI,CAAC,MAAM,CAAC,EAAE,eAAe;IAgCnC;;OAEG;IACG,WAAW,CACf,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,SAAS,EAAE,CAAC;CAGxB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,QAAQ,GAAG,iBAAiB,CAEvE"}

package/dist/daemon/services/mcp-servers.js

@@ -241,12 +241,6 @@ var MCPServersService = class extends DrizzleService {
    * Override find to support filter params
    */
   async find(params) {
-    const paramsRecord = params;
-    const userRecord = paramsRecord?.user;
-    const userId = userRecord?.user_id;
-    console.log(
-      `[MCPServersService.find] Called with userId: ${userId || "NONE"}, provider: ${params?.provider || "internal"}, hasConnection: ${!!paramsRecord?.connection}`
-    );
     const filters = {};
     if (params?.query) {
       if (params.query.scope) filters.scope = params.query.scope;

package/dist/daemon/services/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/services/scheduler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAe9C,OAAO,KAAK,EACV,MAAM,EAGN,QAAQ,EACR,UAAU,EACV,OAAO,EAGP,IAAI,EACL,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAQpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAiCnD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,MAAM,GACrB,MAAM,CA8BR;AAED;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,SAAgB,IAAI,mBAAmB;gBAC3B,UAAU,EAAE,MAAM;CAM/B;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,SAAgB,IAAI,EAAE,mBAAmB,GAAG,qBAAqB,CAAC;gBACtD,IAAI,EAAE,mBAAmB,GAAG,qBAAqB,EAAE,OAAO,EAAE,MAAM;CAK/E;AAED,MAAM,WAAW,eAAe;IAC9B,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4CAA4C;IAC5C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,wDAAwD;IACxD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,EAAE,CAAW;IACrB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,cAAc,CAA6B;gBAEvC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAE,eAAoB;IAgBxE;;OAEG;IACH,KAAK,IAAI,IAAI;IAwBb;;OAEG;IACH,IAAI,IAAI,IAAI;IAeZ;;;;;;;;;OASG;YACW,IAAI;IA2BlB;;;;;;;;;;;;;OAaG;YACW,eAAe;IA0E7B;;;;;;;;;;;;;OAaG;IACG,kBAAkB,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAuC/F;;;;;;;;;;;;;;;OAeG;YACW,0BAA0B;IAsCxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;YACW,qBAAqB;IA2NnC;;;OAGG;YACW,sBAAsB;IAuBpC;;;;;;;;OAQG;YACW,sBAAsB;CAyBrC"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/services/scheduler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAe9C,OAAO,KAAK,EACV,MAAM,EAGN,QAAQ,EACR,UAAU,EACV,OAAO,EAGP,IAAI,EACL,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAQpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAiCnD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,MAAM,GACrB,MAAM,CA8BR;AAED;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,SAAgB,IAAI,mBAAmB;gBAC3B,UAAU,EAAE,MAAM;CAM/B;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,SAAgB,IAAI,EAAE,mBAAmB,GAAG,qBAAqB,CAAC;gBACtD,IAAI,EAAE,mBAAmB,GAAG,qBAAqB,EAAE,OAAO,EAAE,MAAM;CAK/E;AAED,MAAM,WAAW,eAAe;IAC9B,2DAA2D;IAC3D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4CAA4C;IAC5C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,wDAAwD;IACxD,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,EAAE,CAAW;IACrB,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,cAAc,CAA6B;gBAEvC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAE,eAAoB;IAgBxE;;OAEG;IACH,KAAK,IAAI,IAAI;IAwBb;;OAEG;IACH,IAAI,IAAI,IAAI;IAeZ;;;;;;;;;OASG;YACW,IAAI;IA2BlB;;;;;;;;;;;;;OAaG;YACW,eAAe;IA8E7B;;;;;;;;;;;;;OAaG;IACG,kBAAkB,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,WAAW,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAuC/F;;;;;;;;;;;;;;;OAeG;YACW,0BAA0B;IAsCxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmCG;YACW,qBAAqB;IA2NnC;;;OAGG;YACW,sBAAsB;IAuBpC;;;;;;;;OAQG;YACW,sBAAsB;CAyBrC"}

package/dist/daemon/services/scheduler.js

@@ -231,11 +231,15 @@ var SchedulerService = class {
           }
           return;
         }
-        console.log(`   \u2705 ${schedule.name}: Schedule is due, spawning session...`);
+        console.log(
+          `   \u{1F552} Scheduler due: "${schedule.name}" scheduled_at=${new Date(scheduledRunAt).toISOString()} \u2014 spawning session`
+        );
         await this.spawnScheduledSession(schedule, scheduledRunAt, now, { source: "cron" });
       });
     } else {
-      console.log(`   \u2705 ${schedule.name}: Schedule is due, spawning session...`);
+      console.log(
+        `   \u{1F552} Scheduler due: "${schedule.name}" scheduled_at=${new Date(scheduledRunAt).toISOString()} \u2014 spawning session`
+      );
       await this.spawnScheduledSession(schedule, scheduledRunAt, now, { source: "cron" });
     }
   }

package/dist/daemon/services/sessions.d.ts

@@ -29,6 +29,8 @@ export type SessionParams = QueryParams<{
     /** Root-level include_last_message flag (bypasses Feathers query filtering, used by internal service calls) */
     _include_last_message?: boolean | 'true' | 'false';
 };
+export declare function markRemoteRelationshipsEnrichedResult<T extends object>(result: T): T;
+export declare function isRemoteRelationshipsEnrichedResult(result: unknown): boolean;
 /**
  * Execute task data payload
  * Used by setExecuteHandler, executeTask, and related methods
@@ -47,10 +49,12 @@ export declare class SessionsService extends DrizzleService<Session, Partial<Ses
     private sessionRepo;
     private app;
     private sessionMCPRepo;
+    private sessionRelationshipRepo;
     private sessionEnvSelectionRepo;
     private usersRepo;
     private branchRepo;
     constructor(db: Database, app: Application);
+    enrichRemoteRelationships(sessionList: Session[]): Promise<Session[]>;
     /**
      * Attach explicit MCP server IDs to a session.
      * Emits WebSocket events so the UI updates in real-time.
@@ -176,6 +180,11 @@ export declare class SessionsService extends DrizzleService<Session, Partial<Ses
      * Override remove to cascade delete children (forks and subsessions)
      */
     remove(id: import('@agor/core/types').NullableId, params?: SessionParams): Promise<Session | Session[]>;
+    /**
+     * Override patch to keep durable relationship callback state synchronized
+     * with the existing callback_config.enabled execution switch.
+     */
+    patch(id: import('@agor/core/types').NullableId, data: Partial<Session>, params?: SessionParams): Promise<Session | Session[]>;
     /**
      * Override get to optionally enrich with last message
      *
@@ -183,9 +192,8 @@ export declare class SessionsService extends DrizzleService<Session, Partial<Ses
      */
     get(id: string, params?: SessionParams): Promise<SessionWithLastMessage>;
     /**
-     * Override find - no custom logic, just use default find
-     *
-     * Note: Last message is NOT included in list operations - only on single GET
+     * Override find to include durable remote relationships in list results.
+     * Note: Last message is NOT included in list operations - only on single GET.
      */
     find(params?: SessionParams): Promise<Paginated<Session> | Session[]>;
 }

package/dist/daemon/services/sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/services/sessions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/services/sessions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAEL,KAAK,QAAQ,EAKb,KAAK,sBAAsB,EAE5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,WAAW,EAAa,MAAM,qBAAqB,CAAC;AAGlE,OAAO,KAAK,EACV,mBAAmB,EAGnB,SAAS,EACT,WAAW,EACX,OAAO,EACP,SAAS,EAGV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAgCrD;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,uGAAuG;IACvG,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC;IACtC,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IAClD,8BAA8B,CAAC,EAAE,MAAM,CAAC;CACzC,CAAC,GACA,mBAAmB,GACnB,wBAAwB,GAAG;IACzB,+GAA+G;IAC/G,qBAAqB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;CACpD,CAAC;AAIJ,wBAAgB,qCAAqC,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAGpF;AAED,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAI5E;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,OAAO,kBAAkB,EAAE,cAAc,CAAC;IAC3D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,kBAAkB,EAAE,aAAa,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAgB,SAAQ,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAC3F,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,uBAAuB,CAAgC;IAC/D,OAAO,CAAC,uBAAuB,CAAgC;IAC/D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,UAAU,CAAmB;gBAEzB,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW;IAwBpC,yBAAyB,CAAC,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA8B3E;;;OAGG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB5F;;;OAGG;YACW,cAAc;IA0B5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAiCG;YACW,oBAAoB;IAoElC;;;;OAIG;IACG,IAAI,CACR,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,EAC1C,MAAM,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC,OAAO,CAAC;IA2EnB;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACG,KAAK,CACT,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,OAAO,CAAC,OAAO,kBAAkB,EAAE,WAAW,CAAC,EACrD,MAAM,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC,OAAO,CAAC;IA4JnB;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc,CAAC,CASpB;IAEH,iBAAiB,CACf,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,eAAe,EACrB,MAAM,CAAC,EAAE,aAAa,KACnB,OAAO,CAAC;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;KACpB,CAAC,GACD,IAAI;IAID,WAAW,CACf,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,eAAe,EACrB,MAAM,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;KACpB,CAAC;IAOF;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc,CAAC,CAA+D;IAEtF,iBAAiB,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IAI1F,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/E;;;;OAIG;IACG,YAAY,CAChB,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,SAAS,EAAE,OAAO,EAAE,CAAC;QACrB,QAAQ,EAAE,OAAO,EAAE,CAAC;KACrB,CAAC;IAgBF;;OAEG;IACG,MAAM,CACV,EAAE,EAAE,OAAO,kBAAkB,EAAE,UAAU,EACzC,MAAM,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;IAsC/B;;;OAGG;IACG,KAAK,CACT,EAAE,EAAE,OAAO,kBAAkB,EAAE,UAAU,EACzC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,MAAM,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;IAqB/B;;;;OAIG;IACG,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,sBAAsB,CAAC;IA2B9E;;;OAGG;IACG,IAAI,CAAC,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC;CAc5E;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,WAAW,GAAG,eAAe,CAErF"}

package/dist/daemon/services/sessions.js

@@ -4,6 +4,7 @@ import {
   BranchRepository,
   SessionEnvSelectionRepository,
   SessionMCPServerRepository,
+  SessionRelationshipRepository,
   SessionRepository,
   UsersRepository
 } from "@agor/core/db";
@@ -309,10 +310,19 @@ function getInheritableConfig(parent) {
     model_config: parent.model_config
   };
 }
+var remoteRelationshipsEnrichedResults = /* @__PURE__ */ new WeakSet();
+function markRemoteRelationshipsEnrichedResult(result) {
+  remoteRelationshipsEnrichedResults.add(result);
+  return result;
+}
+function isRemoteRelationshipsEnrichedResult(result) {
+  return typeof result === "object" && result !== null && remoteRelationshipsEnrichedResults.has(result);
+}
 var SessionsService = class extends DrizzleService {
   sessionRepo;
   app;
   sessionMCPRepo;
+  sessionRelationshipRepo;
   sessionEnvSelectionRepo;
   usersRepo;
   branchRepo;
@@ -331,10 +341,31 @@ var SessionsService = class extends DrizzleService {
     this.sessionRepo = sessionRepo;
     this.app = app;
     this.sessionMCPRepo = new SessionMCPServerRepository(db);
+    this.sessionRelationshipRepo = new SessionRelationshipRepository(db);
     this.sessionEnvSelectionRepo = new SessionEnvSelectionRepository(db);
     this.branchRepo = new BranchRepository(db);
     this.usersRepo = new UsersRepository(db);
   }
+  async enrichRemoteRelationships(sessionList) {
+    const sessionIds = sessionList.map((session) => session.session_id);
+    if (sessionIds.length === 0) return sessionList;
+    const relationships = await this.sessionRelationshipRepo.findForSessions(sessionIds);
+    if (relationships.length === 0) return sessionList;
+    const bySessionId = /* @__PURE__ */ new Map();
+    for (const relationship of relationships) {
+      const sourceBucket = bySessionId.get(relationship.source_session_id) ?? { as_source: [], as_target: [] };
+      sourceBucket.as_source?.push(relationship);
+      bySessionId.set(relationship.source_session_id, sourceBucket);
+      const targetBucket = bySessionId.get(relationship.target_session_id) ?? { as_source: [], as_target: [] };
+      targetBucket.as_target?.push(relationship);
+      bySessionId.set(relationship.target_session_id, targetBucket);
+    }
+    return sessionList.map((session) => {
+      const remoteRelationships = bySessionId.get(session.session_id);
+      if (!remoteRelationships) return session;
+      return { ...session, remote_relationships: remoteRelationships };
+    });
+  }
   /**
    * Attach explicit MCP server IDs to a session.
    * Emits WebSocket events so the UI updates in real-time.
@@ -737,6 +768,24 @@ ${data.extraInstructions}`;
     this.emit?.("removed", session, params);
     return session;
   }
+  /**
+   * Override patch to keep durable relationship callback state synchronized
+   * with the existing callback_config.enabled execution switch.
+   */
+  async patch(id, data, params) {
+    const result = await super.patch(id, data, params);
+    const callbackEnabled = data.callback_config?.enabled;
+    if (typeof callbackEnabled === "boolean" && !params?._skipRelationshipCallbackSync) {
+      const sessionsToSync = Array.isArray(result) ? result : [result];
+      for (const session of sessionsToSync) {
+        await this.sessionRelationshipRepo.setCallbackEnabledForTargetSession(
+          session.session_id,
+          callbackEnabled
+        );
+      }
+    }
+    return result;
+  }
   /**
    * Override get to optionally enrich with last message
    *
@@ -747,6 +796,8 @@ ${data.extraInstructions}`;
     const includeLastMessageRoot = params?._include_last_message;
     const includeLastMessage = includeLastMessageRoot ?? includeLastMessageQuery;
     const session = await super.get(id, params);
+    const [enrichedSession] = await this.enrichRemoteRelationships([session]);
+    const sessionWithRelationships = enrichedSession ?? session;
     if (includeLastMessage === true || includeLastMessage === "true") {
       const truncationLengthQuery = params?.query?.last_message_truncation_length;
       const truncationLengthRoot = params?._last_message_truncation_length;
@@ -754,20 +805,28 @@ ${data.extraInstructions}`;
         truncationLengthRoot ?? truncationLengthQuery
       );
       const result = await this.sessionRepo.enrichWithLastMessage(
-        session,
+        sessionWithRelationships,
         truncationLength
       );
       return result;
     }
-    return session;
+    return sessionWithRelationships;
   }
   /**
-   * Override find - no custom logic, just use default find
-   *
-   * Note: Last message is NOT included in list operations - only on single GET
+   * Override find to include durable remote relationships in list results.
+   * Note: Last message is NOT included in list operations - only on single GET.
    */
   async find(params) {
-    return super.find(params);
+    const result = await super.find(params);
+    if (Array.isArray(result)) {
+      const enriched = await this.enrichRemoteRelationships(result);
+      return markRemoteRelationshipsEnrichedResult(enriched);
+    }
+    const enrichedData = await this.enrichRemoteRelationships(result.data);
+    return markRemoteRelationshipsEnrichedResult({
+      ...result,
+      data: enrichedData
+    });
   }
 };
 function createSessionsService(db, app) {
@@ -775,5 +834,7 @@ function createSessionsService(db, app) {
 }
 export {
   SessionsService,
-  createSessionsService
+  createSessionsService,
+  isRemoteRelationshipsEnrichedResult,
+  markRemoteRelationshipsEnrichedResult
 };

package/dist/daemon/services/tasks.d.ts

@@ -14,14 +14,25 @@ export type TaskParams = QueryParams<{
 }> & {
     /**
      * Internal-only: terminal task patches normally transition the owning session
-     * back to idle. Heartbeat-loss handling marks the session failed instead.
+     * back to a promptable terminal state. Heartbeat-loss handling marks the session failed instead.
      */
-    suppressTerminalSessionIdle?: boolean;
+    suppressTerminalSessionStateUpdate?: boolean;
     /**
      * Internal-only: terminal task patches normally drain queued work for the
      * owning session. Heartbeat-loss handling must not auto-start queued prompts.
      */
     suppressTerminalQueueProcessing?: boolean;
+    /**
+     * Internal-only: skip parent callback dispatch for terminal transitions that
+     * are administrative cancellation, not agent output. Does not disable BTW
+     * fork archival; those ephemeral sessions should still be cleaned up.
+     */
+    suppressCompletionCallbacks?: boolean;
+    /**
+     * Internal-only escape hatch for preserving an ephemeral BTW fork after
+     * terminal transition. Most callers should leave this unset.
+     */
+    suppressBtwCleanup?: boolean;
 };
 /**
  * Extended tasks service with custom methods

package/dist/daemon/services/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/services/tasks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/services/tasks.ts"],"names":[],"mappings":"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"}

package/dist/daemon/services/tasks.js

@@ -849,7 +849,7 @@ var TasksService = class extends DrizzleService {
       },
       {
         ...params,
-        suppressTerminalSessionIdle: true,
+        suppressTerminalSessionStateUpdate: true,
         suppressTerminalQueueProcessing: true
       }
     );
@@ -861,10 +861,17 @@ var TasksService = class extends DrizzleService {
       );
       return failedTask;
     }
+    const sessionPatchParams = {
+      ...params,
+      suppressTerminalQueueProcessing: true
+    };
     await this.app.service("sessions").patch(
       failedTask.session_id,
-      { status: SessionStatus.FAILED, ready_for_prompt: true },
-      params
+      {
+        status: SessionStatus.FAILED,
+        ready_for_prompt: true
+      },
+      sessionPatchParams
     ).catch((error) => {
       console.warn(
         `[executor-heartbeat] Failed to mark session ${shortId2(failedTask.session_id)} failed after stale heartbeat:`,
@@ -903,11 +910,10 @@ var TasksService = class extends DrizzleService {
    */
   async patch(id, data, params) {
     const nextStatus = data.status;
-    const mayTransitionStatus = nextStatus === TaskStatus.RUNNING || isAnalyticsTerminalTaskStatus(nextStatus);
-    const currentTask = mayTransitionStatus ? await this.get(id, params) : void 0;
-    if (currentTask && isTerminalTaskStatus(currentTask.status) && isTerminalTaskStatus(nextStatus)) {
+    const currentTask = nextStatus !== void 0 ? await this.get(id, params) : void 0;
+    if (currentTask && isTerminalTaskStatus(currentTask.status) && nextStatus !== void 0) {
       console.warn(
-        `\u23ED\uFE0F [TasksService] Ignoring terminal status rewrite for task ${shortId2(currentTask.task_id)} (${currentTask.status} \u2192 ${nextStatus})`
+        `\u23ED\uFE0F [TasksService] Ignoring status rewrite for terminal task ${shortId2(currentTask.task_id)} (${currentTask.status} \u2192 ${nextStatus})`
       );
       return currentTask;
     }
@@ -984,49 +990,59 @@ var TasksService = class extends DrizzleService {
             });
           }
           const latestTaskId = session.tasks?.[session.tasks.length - 1];
+          const suppressCompletionCallbacks = params?.suppressCompletionCallbacks === true;
+          const suppressBtwCleanup = params?.suppressBtwCleanup === true;
           if (latestTaskId && latestTaskId !== task.task_id) {
             console.log(
-              `\u23ED\uFE0F [TasksService] Skipping session IDLE update - task ${shortId2(task.task_id)} is not the latest (latest: ${shortId2(latestTaskId)})`
+              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update - task ${shortId2(task.task_id)} is not the latest (latest: ${shortId2(latestTaskId)})`
             );
-            await this.dispatchCompletionCallbacks(task, session, params);
+            if (!suppressCompletionCallbacks) {
+              await this.dispatchCompletionCallbacks(task, session, params);
+            }
             return result;
           }
           const isUserInitiatedStop = data.status === TaskStatus.STOPPED;
           if (isUserInitiatedStop) {
             console.log(
-              `\u23ED\uFE0F [TasksService] Skipping session IDLE update for STOPPED task ${shortId2(task.task_id)} \u2014 stop endpoint handles session state`
+              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update for STOPPED task ${shortId2(task.task_id)} \u2014 stop endpoint handles session state`
             );
-          } else if (params?.suppressTerminalSessionIdle) {
+          } else if (params?.suppressTerminalSessionStateUpdate) {
             console.log(
-              `\u23ED\uFE0F [TasksService] Skipping session IDLE update for task ${shortId2(task.task_id)} (${data.status}) due to internal patch params`
+              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update for task ${shortId2(task.task_id)} (${data.status}) due to internal patch params`
             );
           } else {
             await this.app.service("sessions").patch(
               task.session_id,
               {
-                status: "idle",
+                status: data.status === TaskStatus.FAILED ? SessionStatus.FAILED : SessionStatus.IDLE,
                 ready_for_prompt: true
               },
               params
             );
             console.log(
-              `\u2705 [TasksService] Session ${shortId2(task.session_id)} status updated to IDLE (task ${shortId2(task.task_id)} ${data.status})`
+              `\u2705 [TasksService] Session ${shortId2(task.session_id)} status updated after terminal task (task ${shortId2(task.task_id)} ${data.status})`
             );
           }
-          await this.dispatchCompletionCallbacks(task, session, params);
+          if (!suppressCompletionCallbacks) {
+            await this.dispatchCompletionCallbacks(task, session, params);
+          }
           if (session.fork_origin === "btw") {
-            try {
-              await this.app.service("sessions").patch(session.session_id, {
-                archived: true,
-                archived_reason: "btw_completed"
-              });
-              console.log(
-                `\u{1F4E6} [TasksService] Auto-archived btw fork session ${shortId2(session.session_id)}`
-              );
-            } catch (error) {
-              console.warn(`\u26A0\uFE0F  [TasksService] Failed to auto-archive btw fork:`, error);
+            if (!suppressBtwCleanup) {
+              try {
+                await this.app.service("sessions").patch(session.session_id, {
+                  archived: true,
+                  archived_reason: "btw_completed"
+                });
+                console.log(
+                  `\u{1F4E6} [TasksService] Auto-archived btw fork session ${shortId2(session.session_id)}`
+                );
+              } catch (error) {
+                console.warn(`\u26A0\uFE0F  [TasksService] Failed to auto-archive btw fork:`, error);
+              }
+            }
+            if (!suppressCompletionCallbacks) {
+              await this.injectBtwResultMessage(task, session, params);
             }
-            await this.injectBtwResultMessage(task, session, params);
           }
           const sessionsService = this.app.service("sessions");
           if (!params?.suppressTerminalQueueProcessing && sessionsService.triggerQueueProcessing) {

package/dist/daemon/startup.js

@@ -1103,11 +1103,15 @@ var SchedulerService = class {
           }
           return;
         }
-        console.log(`   \u2705 ${schedule.name}: Schedule is due, spawning session...`);
+        console.log(
+          `   \u{1F552} Scheduler due: "${schedule.name}" scheduled_at=${new Date(scheduledRunAt).toISOString()} \u2014 spawning session`
+        );
         await this.spawnScheduledSession(schedule, scheduledRunAt, now, { source: "cron" });
       });
     } else {
-      console.log(`   \u2705 ${schedule.name}: Schedule is due, spawning session...`);
+      console.log(
+        `   \u{1F552} Scheduler due: "${schedule.name}" scheduled_at=${new Date(scheduledRunAt).toISOString()} \u2014 spawning session`
+      );
       await this.spawnScheduledSession(schedule, scheduledRunAt, now, { source: "cron" });
     }
   }

package/dist/daemon/utils/session-stop.d.ts

@@ -0,0 +1,43 @@
+import { type TaskRepository } from '@agor/core/db';
+import type { Application } from '@agor/core/feathers';
+import type { Params, SessionID } from '@agor/core/types';
+import { SessionStatus } from '@agor/core/types';
+import type { SessionsServiceImpl, TasksServiceImpl } from '../declarations.js';
+export interface StopSessionResult {
+    success: boolean;
+    status?: typeof SessionStatus.IDLE;
+    reason?: string;
+    stoppedTaskId?: string;
+    queuedTasksPreserved?: number;
+}
+export interface StopSessionDeps {
+    app: Application;
+    taskRepo: Pick<TaskRepository, 'findQueued'>;
+    sessionsService: Pick<SessionsServiceImpl, 'get' | 'patch'>;
+    tasksService: Pick<TasksServiceImpl, 'patch'>;
+    killExecutorProcess: (sessionId: string) => boolean;
+}
+/**
+ * Mark a stopped session promptable without letting the session after.patch
+ * hook drain the queue while the Stop route still holds the turn lock.
+ *
+ * The route schedules queue processing after the lock is released. Doing it
+ * here would deadlock/retry against the same in-flight lock.
+ */
+export declare function markStoppedSessionPromptableNoDrain(sessionsService: Pick<SessionsServiceImpl, 'patch'>, sessionId: SessionID, params?: Params): Promise<void>;
+/**
+ * Stop semantics, in one place:
+ * - target only the active task for the session;
+ * - preserve queued work so it can drain after Stop;
+ * - suppress task-terminal side effects that would independently drain or
+ *   dispatch callbacks for a user-stopped turn;
+ * - leave the session idle/promptable before the caller kicks the queue
+ *   drainer after releasing the session turn lock.
+ *
+ * Callers must hold the session turn lock while invoking this function, and
+ * must trigger queue processing only after the lock is released.
+ */
+export declare function stopSessionPreserveQueue(deps: StopSessionDeps, sessionId: SessionID, params?: Params, options?: {
+    reason?: string;
+}): Promise<StopSessionResult>;
+//# sourceMappingURL=session-stop.d.ts.map

package/dist/daemon/utils/session-stop.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-stop.d.ts","sourceRoot":"","sources":["../../src/utils/session-stop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAsB,aAAa,EAAc,MAAM,kBAAkB,CAAC;AACjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGhF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,aAAa,CAAC,IAAI,CAAC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,WAAW,CAAC;IACjB,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAC7C,eAAe,EAAE,IAAI,CAAC,mBAAmB,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC;IAC5D,YAAY,EAAE,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC9C,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CACrD;AAED;;;;;;GAMG;AACH,wBAAsB,mCAAmC,CACvD,eAAe,EAAE,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,EACnD,SAAS,EAAE,SAAS,EACpB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAYf;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,SAAS,EACpB,MAAM,GAAE,MAAW,EACnB,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAgE5B"}