@supaku/agentfactory-server 0.7.37 → 0.7.39

package/dist/src/issue-lock.d.ts

@@ -110,11 +110,14 @@ export declare function isSessionParkedForIssue(issueId: string, sessionId: stri
  */
 export declare function cleanupExpiredLocksWithPendingWork(): Promise<number>;
 /**
- * Release issue locks held by sessions that have already reached a terminal state.
+ * Release issue locks held by sessions that should no longer hold them.
  *
- * This handles the case where a session completes but the lock release failed
- * (e.g., network error during cleanup). The lock's 2-hour TTL would eventually
- * expire, but this proactively clears it when workers have idle capacity.
+ * This handles cases where:
+ * - A session completes but the lock release failed (network error during cleanup)
+ * - Orphan cleanup resets a session to 'pending' but the lock wasn't released
+ *
+ * The lock's 2-hour TTL would eventually expire, but this proactively clears it
+ * when workers have idle capacity.
  *
  * Only runs when workers are online -- if no workers are available, there's no
  * point promoting parked work since nothing can pick it up.

package/dist/src/issue-lock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issue-lock.d.ts","sourceRoot":"","sources":["../../src/issue-lock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAmBH,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAoB/C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,aAAa,CAAA;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,OAAO,CAAC,CA4BlB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAY7E;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUrE;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,UAAU,GAAE,MAAyB,GACpC,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,GACf,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAoDjD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAqE5B;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAU1E;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAoD5E;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAwBlB;AAED;;;;;GAKG;AACH,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,MAAM,CAAC,CA6C1E;AAID;;;;;;;;;;;;GAYG;AACH,wBAAsB,gCAAgC,CACpD,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,MAAM,CAAC,CAgEjB"}
+{"version":3,"file":"issue-lock.d.ts","sourceRoot":"","sources":["../../src/issue-lock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAmBH,OAAO,EAAa,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAoB/C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,aAAa,CAAA;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,OAAO,CAAC,CA4BlB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAY7E;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAUrE;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,UAAU,GAAE,MAAyB,GACpC,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,GACf,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAoDjD;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAqE5B;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAU1E;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAoD5E;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAwBlB;AAED;;;;;GAKG;AACH,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,MAAM,CAAC,CA6C1E;AAOD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gCAAgC,CACpD,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,MAAM,CAAC,CAgEjB"}

package/dist/src/issue-lock.js

@@ -424,13 +424,19 @@ export async function cleanupExpiredLocksWithPendingWork() {
     }
     return promoted;
 }
-const TERMINAL_STATUSES = new Set(['completed', 'failed', 'stopped']);
+// Statuses where a session should NOT be holding an issue lock.
+// Terminal: session finished (completed/failed/stopped) but lock release failed.
+// Pending: session was reset by orphan cleanup but lock wasn't released (see orphan-cleanup.ts).
+const STALE_LOCK_STATUSES = new Set(['completed', 'failed', 'stopped', 'pending']);
 /**
- * Release issue locks held by sessions that have already reached a terminal state.
+ * Release issue locks held by sessions that should no longer hold them.
  *
- * This handles the case where a session completes but the lock release failed
- * (e.g., network error during cleanup). The lock's 2-hour TTL would eventually
- * expire, but this proactively clears it when workers have idle capacity.
+ * This handles cases where:
+ * - A session completes but the lock release failed (network error during cleanup)
+ * - Orphan cleanup resets a session to 'pending' but the lock wasn't released
+ *
+ * The lock's 2-hour TTL would eventually expire, but this proactively clears it
+ * when workers have idle capacity.
  *
  * Only runs when workers are online -- if no workers are available, there's no
  * point promoting parked work since nothing can pick it up.
@@ -471,8 +477,8 @@ export async function cleanupStaleLocksWithIdleWorkers(hasIdleWorkers) {
                     promoted++;
                 continue;
             }
-            if (TERMINAL_STATUSES.has(session.status)) {
-                log.info('Releasing stale lock (session already terminal)', {
+            if (STALE_LOCK_STATUSES.has(session.status)) {
+                log.info('Releasing stale lock (session no longer needs lock)', {
                     issueId,
                     sessionId: lock.sessionId,
                     sessionStatus: session.status,

package/dist/src/orphan-cleanup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orphan-cleanup.d.ts","sourceRoot":"","sources":["../../src/orphan-cleanup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAA;AAmB7B;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,sFAAsF;IACtF,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAChE,2FAA2F;IAC3F,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAClE;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,KAAK,CAAC;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,eAAe,EAAE,MAAM,CAAA;QACvB,MAAM,EAAE,UAAU,GAAG,QAAQ,CAAA;QAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,oEAAoE;QACpE,YAAY,CAAC,EAAE,MAAM,CAAA;KACtB,CAAC,CAAA;IACF,0DAA0D;IAC1D,sBAAsB,EAAE,MAAM,EAAE,CAAA;CACjC;AAED;;GAEG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAuDzE;AAKD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAiC9E;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,CAAC,EAAE,sBAAsB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CA+N9B;AASD,wBAAgB,gBAAgB,IAAI,OAAO,CAO1C;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,CAAC,EAAE,sBAAsB,GACjC,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAKrC"}
+{"version":3,"file":"orphan-cleanup.d.ts","sourceRoot":"","sources":["../../src/orphan-cleanup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,sBAAsB,CAAA;AAqB7B;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,sFAAsF;IACtF,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAChE,2FAA2F;IAC3F,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAClE;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,KAAK,CAAC;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,eAAe,EAAE,MAAM,CAAA;QACvB,MAAM,EAAE,UAAU,GAAG,QAAQ,CAAA;QAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,oEAAoE;QACpE,YAAY,CAAC,EAAE,MAAM,CAAA;KACtB,CAAC,CAAA;IACF,0DAA0D;IAC1D,sBAAsB,EAAE,MAAM,EAAE,CAAA;CACjC;AAED;;GAEG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAuDzE;AAKD;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAiC9E;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,CAAC,EAAE,sBAAsB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAyP9B;AASD,wBAAgB,gBAAgB,IAAI,OAAO,CAO1C;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,CAAC,EAAE,sBAAsB,GACjC,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAKrC"}

package/dist/src/orphan-cleanup.js

@@ -12,7 +12,7 @@ import { createLogger } from './logger.js';
 import { getAllSessions, resetSessionForRequeue, } from './session-storage.js';
 import { listWorkers } from './worker-storage.js';
 import { releaseClaim, isSessionInQueue, } from './work-queue.js';
-import { dispatchWork, cleanupExpiredLocksWithPendingWork, cleanupStaleLocksWithIdleWorkers, isSessionParkedForIssue, } from './issue-lock.js';
+import { dispatchWork, cleanupExpiredLocksWithPendingWork, cleanupStaleLocksWithIdleWorkers, isSessionParkedForIssue, getIssueLock, releaseIssueLock, } from './issue-lock.js';
 const log = createLogger('orphan-cleanup');
 // How long a session can be running without a valid worker before being considered orphaned
 const ORPHAN_THRESHOLD_MS = 120_000; // 2 minutes (worker TTL + buffer)
@@ -138,6 +138,19 @@ export async function cleanupOrphanedSessions(callbacks) {
                 });
                 // Release any existing claim
                 await releaseClaim(session.linearSessionId);
+                // Release the issue lock if held by this orphaned session.
+                // Without this, dispatchWork() below would fail to acquire the lock
+                // (SET NX) and park the work instead — leaving it stuck until the
+                // lock's 2-hour TTL expires, since the session is reset to 'pending'
+                // which the stale-lock cleanup doesn't consider terminal.
+                const existingLock = await getIssueLock(session.issueId);
+                if (existingLock && existingLock.sessionId === session.linearSessionId) {
+                    log.info('Releasing issue lock held by orphaned session', {
+                        sessionId: session.linearSessionId,
+                        issueId: session.issueId,
+                    });
+                    await releaseIssueLock(session.issueId);
+                }
                 // Reset session for requeue (clears workerId so new worker can claim)
                 await resetSessionForRequeue(session.linearSessionId);
                 // Re-queue the work with higher priority
@@ -153,6 +166,7 @@ export async function cleanupOrphanedSessions(callbacks) {
                     prompt: session.promptContext,
                     // providerSessionId intentionally omitted - don't resume crashed sessions
                     workType: session.workType,
+                    projectName: session.projectName,
                 };
                 const dispatchResult = await dispatchWork(work);
                 if (dispatchResult.dispatched || dispatchResult.parked) {
@@ -214,6 +228,15 @@ export async function cleanupOrphanedSessions(callbacks) {
                         sessionId: session.linearSessionId,
                         issueIdentifier,
                     });
+                    // Release issue lock if held by this zombie session (same rationale as orphan cleanup)
+                    const existingLock = await getIssueLock(session.issueId);
+                    if (existingLock && existingLock.sessionId === session.linearSessionId) {
+                        log.info('Releasing issue lock held by zombie session', {
+                            sessionId: session.linearSessionId,
+                            issueId: session.issueId,
+                        });
+                        await releaseIssueLock(session.issueId);
+                    }
                     const work = {
                         sessionId: session.linearSessionId,
                         issueId: session.issueId,
@@ -222,6 +245,7 @@ export async function cleanupOrphanedSessions(callbacks) {
                         queuedAt: Date.now(),
                         prompt: session.promptContext,
                         workType: session.workType,
+                        projectName: session.projectName,
                     };
                     const dispatchResult = await dispatchWork(work);
                     if (dispatchResult.dispatched || dispatchResult.parked) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supaku/agentfactory-server",
-  "version": "0.7.37",
+  "version": "0.7.39",
   "type": "module",
   "description": "Webhook server and distributed worker pool for AgentFactory — Redis queues, issue locks, session management",
   "author": "Supaku (https://supaku.com)",
@@ -44,8 +44,8 @@
   ],
   "dependencies": {
     "ioredis": "^5.4.2",
-    "@supaku/agentfactory": "0.7.37",
-    "@supaku/agentfactory-linear": "0.7.37"
+    "@supaku/agentfactory": "0.7.39",
+    "@supaku/agentfactory-linear": "0.7.39"
   },
   "devDependencies": {
     "@types/node": "^22.5.4",