@action-llama/action-llama 0.27.5 → 0.28.0

package/dist/scheduler/orphan-recovery.js

@@ -1,144 +0,0 @@
-// packages/action-llama/src/scheduler/orphan-recovery.ts
-import { drainQueues } from "../execution/execution.js";
-/**
- * Re-adopt orphan containers from a previous scheduler run, or clean up
- * stale container registry entries.
- *
- * This is a scheduler-startup concern that orchestrates across the execution
- * plane (runtime, runner pools) and the gateway (container registry, lock store).
- */
-export async function recoverOrphanContainers(opts) {
-    const { runtime, gateway, runnerPools, activeAgentConfigs, schedulerState, logger } = opts;
-    try {
-        const ownAgentNames = new Set(activeAgentConfigs.map((a) => a.name));
-        const orphans = (await runtime.listRunningAgents()).filter((o) => ownAgentNames.has(o.agentName));
-        if (orphans.length > 0) {
-            const registeredContainers = gateway.containerRegistry.listAll();
-            const runningNames = new Set(orphans.map((o) => o.taskId));
-            let adopted = 0;
-            let killed = 0;
-            for (const orphan of orphans) {
-                const found = gateway.containerRegistry.findByContainerName(orphan.taskId);
-                if (!found) {
-                    // Container exists but has no registry entry — unknown, kill it
-                    logger.warn({ agent: orphan.agentName, task: orphan.taskId }, "killing unregistered orphan container");
-                    try {
-                        await runtime.kill(orphan.taskId);
-                        await runtime.remove(orphan.taskId);
-                    }
-                    catch { }
-                    killed++;
-                    continue;
-                }
-                const { secret: oldSecret, reg } = found;
-                const pool = runnerPools[orphan.agentName];
-                if (!pool) {
-                    logger.warn({ agent: orphan.agentName, task: orphan.taskId }, "no runner pool for orphan, killing");
-                    try {
-                        await runtime.kill(orphan.taskId);
-                        await runtime.remove(orphan.taskId);
-                    }
-                    catch { }
-                    gateway.lockStore.releaseAll(reg.instanceId);
-                    await gateway.containerRegistry.unregister(oldSecret);
-                    killed++;
-                    continue;
-                }
-                // Get shutdown secret from container env vars
-                let shutdownSecret;
-                if (runtime.inspectContainer) {
-                    const info = await runtime.inspectContainer(orphan.taskId);
-                    shutdownSecret = info?.env?.SHUTDOWN_SECRET;
-                }
-                if (!shutdownSecret) {
-                    logger.warn({ agent: orphan.agentName, task: orphan.taskId }, "cannot read SHUTDOWN_SECRET from orphan, killing");
-                    try {
-                        await runtime.kill(orphan.taskId);
-                        await runtime.remove(orphan.taskId);
-                    }
-                    catch { }
-                    gateway.lockStore.releaseAll(reg.instanceId);
-                    await gateway.containerRegistry.unregister(oldSecret);
-                    killed++;
-                    continue;
-                }
-                const runner = pool.getAvailableRunner();
-                if (!runner) {
-                    logger.warn({ agent: orphan.agentName, task: orphan.taskId }, "no available runner for orphan, killing");
-                    try {
-                        await runtime.kill(orphan.taskId);
-                        await runtime.remove(orphan.taskId);
-                    }
-                    catch { }
-                    gateway.lockStore.releaseAll(reg.instanceId);
-                    await gateway.containerRegistry.unregister(oldSecret);
-                    killed++;
-                    continue;
-                }
-                // Re-attach to the orphaned process so streamLogs/waitForExit work normally
-                const reattach = runtime.reattach;
-                if (typeof reattach === "function" && !reattach.call(runtime, orphan.taskId)) {
-                    logger.warn({ agent: orphan.agentName, task: orphan.taskId }, "failed to reattach orphan, killing");
-                    try {
-                        await runtime.kill(orphan.taskId);
-                        await runtime.remove(orphan.taskId);
-                    }
-                    catch { }
-                    gateway.lockStore.releaseAll(reg.instanceId);
-                    await gateway.containerRegistry.unregister(oldSecret);
-                    killed++;
-                    continue;
-                }
-                // Unregister old secret mapping — will be re-registered inside adoptContainer
-                await gateway.containerRegistry.unregister(oldSecret);
-                logger.info({ agent: orphan.agentName, task: orphan.taskId, instance: reg.instanceId }, "re-adopting orphan container");
-                const containerRunner = runner;
-                if (typeof containerRunner.adoptContainer === "function") {
-                    containerRunner
-                        .adoptContainer(orphan.taskId, shutdownSecret, reg.instanceId, { type: "schedule", source: "re-adopted" })
-                        .then(() => { if (schedulerState.schedulerCtx)
-                        drainQueues(schedulerState.schedulerCtx); })
-                        .catch((err) => logger.error({ err, agent: orphan.agentName }, "orphan re-adoption failed"));
-                    adopted++;
-                }
-                else {
-                    logger.warn({ agent: orphan.agentName }, "runner does not support adoption, killing orphan");
-                    try {
-                        await runtime.kill(orphan.taskId);
-                        await runtime.remove(orphan.taskId);
-                    }
-                    catch { }
-                    killed++;
-                }
-            }
-            // Clean up registry entries for containers that exited while scheduler was down
-            for (const reg of registeredContainers) {
-                if (!runningNames.has(reg.containerName)) {
-                    const found = gateway.containerRegistry.findByContainerName(reg.containerName);
-                    if (found) {
-                        gateway.lockStore.releaseAll(reg.instanceId);
-                        await gateway.containerRegistry.unregister(found.secret);
-                        logger.info({ agent: reg.agentName, instance: reg.instanceId }, "cleaned up stale registration (container exited while scheduler was down)");
-                    }
-                }
-            }
-            logger.info({ adopted, killed, total: orphans.length }, "orphan container handling complete");
-        }
-        else {
-            // No running containers — clean up all stale registry entries
-            const staleEntries = gateway.containerRegistry.listAll();
-            if (staleEntries.length > 0) {
-                let releasedLocks = 0;
-                for (const entry of staleEntries) {
-                    releasedLocks += gateway.lockStore.releaseAll(entry.instanceId);
-                }
-                await gateway.containerRegistry.clear();
-                logger.info({ releasedLocks, staleRegistrations: staleEntries.length }, "cleaned up stale registrations (no running containers)");
-            }
-        }
-    }
-    catch (err) {
-        logger.debug({ err }, "orphan detection/re-adoption skipped (runtime does not support listing)");
-    }
-}
-//# sourceMappingURL=orphan-recovery.js.map

package/dist/scheduler/orphan-recovery.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"orphan-recovery.js","sourceRoot":"","sources":["../../src/scheduler/orphan-recovery.ts"],"names":[],"mappings":"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"}