@10et/cli 1.0.0

package/dist/lib/service-utils.d.ts

@@ -0,0 +1,103 @@
+/**
+ * Service Management Utilities
+ *
+ * Shared utilities for service lifecycle management across commands.
+ * Provides version tracking, health checks, and restart logic.
+ *
+ * @purpose Shared service management utilities for update flow
+ */
+export interface RestartOpts {
+    stopCommand: string;
+    startCommand: string;
+    healthCheck?: string;
+    timeout?: number;
+    promptMultipleSessions?: () => Promise<boolean>;
+}
+export interface ServiceHealth {
+    healthy: boolean;
+    message: string;
+    port?: number;
+}
+export interface CliVersionInfo {
+    version: string;
+    updated_at: string;
+    services: {
+        [serviceName: string]: {
+            version: string;
+            port?: number;
+        };
+    };
+}
+/**
+ * Get current CLI version from package.json
+ */
+export declare function getCurrentCliVersion(): string;
+/**
+ * Read stored CLI version info
+ */
+export declare function readCliVersion(): CliVersionInfo | null;
+/**
+ * Write CLI version info
+ */
+export declare function writeCliVersion(version: string, services?: Record<string, {
+    version: string;
+    port?: number;
+}>): void;
+/**
+ * Detect if services have changed (CLI version bump)
+ */
+export declare function detectServiceChanges(): Promise<{
+    changed: boolean;
+    oldVersion?: string;
+    newVersion: string;
+}>;
+/**
+ * Check if a service is running via health endpoint
+ */
+export declare function waitForHealthy(url: string, timeout?: number): Promise<boolean>;
+/**
+ * Check if a service is running via PID file
+ */
+export declare function isServiceRunningViaPid(pidFile: string): {
+    running: boolean;
+    pid?: number;
+};
+/**
+ * Check health of a service
+ */
+export declare function checkServiceHealth(serviceName: string, healthUrl?: string, pidFile?: string): Promise<ServiceHealth>;
+/**
+ * Restart a service with health validation
+ */
+export declare function restartService(serviceName: string, opts: RestartOpts): Promise<{
+    success: boolean;
+    message: string;
+}>;
+/**
+ * Ensure a service is running (start if not, validate if running)
+ */
+export declare function ensureServiceRunning(serviceName: string, startCommand: string, healthCheck?: string, pidFile?: string): Promise<{
+    success: boolean;
+    message: string;
+}>;
+/**
+ * Restart all core services (Context Hub + Service Manager)
+ */
+export declare function restartCoreServices(options?: {
+    skipPrompt?: boolean;
+}): Promise<{
+    contextHub: boolean;
+    serviceManager: boolean;
+}>;
+/**
+ * Validate all core services are healthy
+ */
+export declare function validateCoreServices(): Promise<{
+    healthy: boolean;
+    issues: Array<{
+        service: string;
+        message: string;
+        remedy: string;
+    }>;
+}>;
+//# sourceMappingURL=service-utils.d.ts.map

package/dist/lib/service-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-utils.d.ts","sourceRoot":"","sources":["../../src/lib/service-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAcH,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,sBAAsB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;CAChD;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE;QACR,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,OAAO,EAAE,MAAM,CAAA;YACf,IAAI,CAAC,EAAE,MAAM,CAAA;SACd,CAAA;KACF,CAAA;CACF;AAQD;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAS7C;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,cAAc,GAAG,IAAI,CAWtD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,IAAI,CAgBpH;AAED;;GAEG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBnH;AAMD;;GAEG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,MAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CA0B1F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAkB1F;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAiDxB;AA2CD;;GAEG;AACH,wBAAsB,cAAc,CAClC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAqDhD;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CA2ChD;AAMD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GACrC,OAAO,CAAC;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,cAAc,EAAE,OAAO,CAAA;CAAE,CAAC,CA2C3D;AAED;;GAEG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IACpD,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACpE,CAAC,CAqCD"}

package/dist/lib/service-utils.js

@@ -0,0 +1,385 @@
+/**
+ * Service Management Utilities
+ *
+ * Shared utilities for service lifecycle management across commands.
+ * Provides version tracking, health checks, and restart logic.
+ *
+ * @purpose Shared service management utilities for update flow
+ */
+import * as fs from "fs";
+import * as path from "path";
+import { execSync } from "child_process";
+import chalk from "chalk";
+import ora from "ora";
+import { JFL_PATHS } from "../utils/jfl-paths.js";
+import { getProjectPort } from "../utils/context-hub-port.js";
+// ============================================================================
+// Version Tracking
+// ============================================================================
+const CLI_VERSION_FILE = path.join(JFL_PATHS.data, "cli-version.json");
+/**
+ * Get current CLI version from package.json
+ */
+export function getCurrentCliVersion() {
+    try {
+        const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, "../../package.json"), "utf-8"));
+        return packageJson.version;
+    }
+    catch {
+        return "0.0.0";
+    }
+}
+/**
+ * Read stored CLI version info
+ */
+export function readCliVersion() {
+    if (!fs.existsSync(CLI_VERSION_FILE)) {
+        return null;
+    }
+    try {
+        const content = fs.readFileSync(CLI_VERSION_FILE, "utf-8");
+        return JSON.parse(content);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Write CLI version info
+ */
+export function writeCliVersion(version, services) {
+    const dir = path.dirname(CLI_VERSION_FILE);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    const versionInfo = {
+        version,
+        updated_at: new Date().toISOString(),
+        services: services || {
+            "context-hub": { version, port: getProjectPort() },
+            "service-manager": { version, port: 3402 }
+        }
+    };
+    fs.writeFileSync(CLI_VERSION_FILE, JSON.stringify(versionInfo, null, 2));
+}
+/**
+ * Detect if services have changed (CLI version bump)
+ */
+export async function detectServiceChanges() {
+    const currentVersion = getCurrentCliVersion();
+    const storedInfo = readCliVersion();
+    if (!storedInfo) {
+        // First time - no stored version yet
+        return { changed: false, newVersion: currentVersion };
+    }
+    const changed = storedInfo.version !== currentVersion;
+    return {
+        changed,
+        oldVersion: storedInfo.version,
+        newVersion: currentVersion
+    };
+}
+// ============================================================================
+// Service Health Checks
+// ============================================================================
+/**
+ * Check if a service is running via health endpoint
+ */
+export async function waitForHealthy(url, timeout = 5000) {
+    const startTime = Date.now();
+    while (Date.now() - startTime < timeout) {
+        try {
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), 2000);
+            const response = await fetch(url, {
+                signal: controller.signal
+            });
+            clearTimeout(timeoutId);
+            if (response.ok) {
+                return true;
+            }
+        }
+        catch {
+            // Health check failed, retry
+        }
+        // Wait 500ms before retry
+        await new Promise(resolve => setTimeout(resolve, 500));
+    }
+    return false;
+}
+/**
+ * Check if a service is running via PID file
+ */
+export function isServiceRunningViaPid(pidFile) {
+    if (!fs.existsSync(pidFile)) {
+        return { running: false };
+    }
+    try {
+        const pid = parseInt(fs.readFileSync(pidFile, "utf-8").trim(), 10);
+        process.kill(pid, 0); // Check if process exists
+        return { running: true, pid };
+    }
+    catch {
+        // Process doesn't exist, clean up stale PID file
+        try {
+            fs.unlinkSync(pidFile);
+        }
+        catch {
+            // Ignore cleanup errors
+        }
+        return { running: false };
+    }
+}
+/**
+ * Check health of a service
+ */
+export async function checkServiceHealth(serviceName, healthUrl, pidFile) {
+    // If health URL provided, check that
+    if (healthUrl) {
+        try {
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), 3000);
+            const response = await fetch(healthUrl, {
+                signal: controller.signal
+            });
+            clearTimeout(timeoutId);
+            if (response.ok) {
+                const data = await response.json().catch(() => ({}));
+                return {
+                    healthy: true,
+                    message: `${serviceName} is healthy`,
+                    port: data.port
+                };
+            }
+            return {
+                healthy: false,
+                message: `${serviceName} health check failed: HTTP ${response.status}`
+            };
+        }
+        catch (err) {
+            return {
+                healthy: false,
+                message: `${serviceName} health check failed: ${err.message}`
+            };
+        }
+    }
+    // Fallback to PID file check
+    if (pidFile) {
+        const status = isServiceRunningViaPid(pidFile);
+        return {
+            healthy: status.running,
+            message: status.running
+                ? `${serviceName} is running (PID: ${status.pid})`
+                : `${serviceName} is not running`
+        };
+    }
+    return {
+        healthy: false,
+        message: `Cannot determine health for ${serviceName} (no health URL or PID file)`
+    };
+}
+// ============================================================================
+// Service Control
+// ============================================================================
+/**
+ * Wait for a service to stop
+ */
+async function waitForStop(pidFile, timeout) {
+    const startTime = Date.now();
+    while (Date.now() - startTime < timeout) {
+        if (!fs.existsSync(pidFile)) {
+            return true;
+        }
+        try {
+            const pid = parseInt(fs.readFileSync(pidFile, "utf-8").trim(), 10);
+            process.kill(pid, 0); // Check if process exists
+        }
+        catch {
+            // Process is gone
+            return true;
+        }
+        await new Promise(resolve => setTimeout(resolve, 200));
+    }
+    return false;
+}
+/**
+ * Execute a command silently
+ */
+function execSilent(command) {
+    try {
+        execSync(command, { stdio: "pipe" });
+        return { success: true };
+    }
+    catch (err) {
+        return { success: false, error: err.message };
+    }
+}
+/**
+ * Restart a service with health validation
+ */
+export async function restartService(serviceName, opts) {
+    const spinner = ora(`Restarting ${serviceName}...`).start();
+    try {
+        // 1. Stop the service
+        const stopResult = execSilent(opts.stopCommand);
+        if (stopResult.success) {
+            spinner.text = `${serviceName} stopped, starting...`;
+            await new Promise(resolve => setTimeout(resolve, 500));
+        }
+        // 2. Start the service
+        const startResult = execSilent(opts.startCommand);
+        if (!startResult.success) {
+            spinner.fail(`${serviceName} failed to start`);
+            return {
+                success: false,
+                message: `Failed to start: ${startResult.error}`
+            };
+        }
+        // 3. Wait a moment for startup
+        await new Promise(resolve => setTimeout(resolve, 800));
+        // 4. Health check if URL provided
+        if (opts.healthCheck) {
+            spinner.text = `Checking ${serviceName} health...`;
+            const healthy = await waitForHealthy(opts.healthCheck, opts.timeout || 5000);
+            if (healthy) {
+                spinner.succeed(`${serviceName} restarted`);
+                return { success: true, message: "Service restarted and healthy" };
+            }
+            else {
+                spinner.warn(`${serviceName} started but health check failed`);
+                return {
+                    success: false,
+                    message: "Service started but not responding to health checks"
+                };
+            }
+        }
+        spinner.succeed(`${serviceName} restarted`);
+        return { success: true, message: "Service restarted" };
+    }
+    catch (error) {
+        spinner.fail(`${serviceName} restart failed`);
+        return {
+            success: false,
+            message: error.message
+        };
+    }
+}
+/**
+ * Ensure a service is running (start if not, validate if running)
+ */
+export async function ensureServiceRunning(serviceName, startCommand, healthCheck, pidFile) {
+    // Check if already running
+    if (pidFile) {
+        const status = isServiceRunningViaPid(pidFile);
+        if (status.running && healthCheck) {
+            // Verify health
+            const healthy = await waitForHealthy(healthCheck, 2000);
+            if (healthy) {
+                return { success: true, message: `${serviceName} already running` };
+            }
+            // Process exists but not healthy - fall through to restart
+        }
+        else if (status.running) {
+            return { success: true, message: `${serviceName} already running` };
+        }
+    }
+    // Start the service
+    const result = execSilent(startCommand);
+    if (!result.success) {
+        return {
+            success: false,
+            message: `Failed to start: ${result.error}`
+        };
+    }
+    // Wait for startup
+    await new Promise(resolve => setTimeout(resolve, 800));
+    // Validate health if URL provided
+    if (healthCheck) {
+        const healthy = await waitForHealthy(healthCheck, 5000);
+        if (healthy) {
+            return { success: true, message: `${serviceName} started successfully` };
+        }
+        else {
+            return {
+                success: false,
+                message: `${serviceName} started but health check failed`
+            };
+        }
+    }
+    return { success: true, message: `${serviceName} started` };
+}
+// ============================================================================
+// Multi-Service Operations
+// ============================================================================
+/**
+ * Restart all core services (Context Hub + Service Manager)
+ */
+export async function restartCoreServices(options = {}) {
+    const results = {
+        contextHub: false,
+        serviceManager: false
+    };
+    console.log(chalk.cyan("\n📦 Checking services...\n"));
+    // Context Hub: only restart if not healthy (avoid killing a working hub)
+    const hubPort = getProjectPort();
+    const hubHealthy = await waitForHealthy(`http://localhost:${hubPort}/health`, 2000);
+    if (hubHealthy) {
+        console.log(chalk.green(`  ✓ context-hub already healthy on port ${hubPort}`));
+        results.contextHub = true;
+    }
+    else {
+        console.log(chalk.yellow(`  → context-hub not responding, restarting...`));
+        const contextHubResult = await restartService("context-hub", {
+            stopCommand: "jfl context-hub stop",
+            startCommand: "jfl context-hub ensure",
+            healthCheck: `http://localhost:${hubPort}/health`,
+            timeout: 5000
+        });
+        results.contextHub = contextHubResult.success;
+    }
+    // Service Manager: only restart if not healthy
+    const smHealthy = await waitForHealthy("http://localhost:3402/health", 2000);
+    if (smHealthy) {
+        console.log(chalk.green(`  ✓ service-manager already healthy`));
+        results.serviceManager = true;
+    }
+    else {
+        const serviceManagerResult = await restartService("service-manager", {
+            stopCommand: "jfl service-manager stop",
+            startCommand: "jfl service-manager ensure",
+            healthCheck: "http://localhost:3402/health",
+            timeout: 5000
+        });
+        results.serviceManager = serviceManagerResult.success;
+    }
+    return results;
+}
+/**
+ * Validate all core services are healthy
+ */
+export async function validateCoreServices() {
+    const issues = [];
+    // Check Context Hub
+    const contextHubHealth = await checkServiceHealth("context-hub", `http://localhost:${getProjectPort()}/health`, ".jfl/context-hub.pid");
+    if (!contextHubHealth.healthy) {
+        issues.push({
+            service: "context-hub",
+            message: contextHubHealth.message,
+            remedy: "Run: jfl context-hub restart"
+        });
+    }
+    // Check Service Manager
+    const serviceManagerHealth = await checkServiceHealth("service-manager", "http://localhost:3402/health", path.join(JFL_PATHS.data, "services", "pids", "service-manager.pid"));
+    if (!serviceManagerHealth.healthy) {
+        issues.push({
+            service: "service-manager",
+            message: serviceManagerHealth.message,
+            remedy: "Run: jfl service-manager restart"
+        });
+    }
+    return {
+        healthy: issues.length === 0,
+        issues
+    };
+}
+//# sourceMappingURL=service-utils.js.map

package/dist/lib/service-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service-utils.js","sourceRoot":"","sources":["../../src/lib/service-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,GAAY,MAAM,KAAK,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AA+B7D,+EAA+E;AAC/E,mBAAmB;AACnB,+EAA+E;AAE/E,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;AAEtE;;GAEG;AACH,MAAM,UAAU,oBAAoB;IAClC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CACrE,CAAA;QACD,OAAO,WAAW,CAAC,OAAO,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAA;IAChB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;QAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,QAA6D;IAC5G,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC1C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,WAAW,GAAmB;QAClC,OAAO;QACP,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACpC,QAAQ,EAAE,QAAQ,IAAI;YACpB,aAAa,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE;YAClD,iBAAiB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE;SAC3C;KACF,CAAA;IAED,EAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAC1E,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,MAAM,cAAc,GAAG,oBAAoB,EAAE,CAAA;IAC7C,MAAM,UAAU,GAAG,cAAc,EAAE,CAAA;IAEnC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,qCAAqC;QACrC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,CAAA;IACvD,CAAC;IAED,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,KAAK,cAAc,CAAA;IAErD,OAAO;QACL,OAAO;QACP,UAAU,EAAE,UAAU,CAAC,OAAO;QAC9B,UAAU,EAAE,cAAc;KAC3B,CAAA;AACH,CAAC;AAED,+EAA+E;AAC/E,wBAAwB;AACxB,+EAA+E;AAE/E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW,EAAE,UAAkB,IAAI;IACtE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAE5B,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;YACxC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAA;YAE5D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAA;YAEF,YAAY,CAAC,SAAS,CAAC,CAAA;YAEvB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,6BAA6B;QAC/B,CAAC;QAED,0BAA0B;QAC1B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;QAClE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA,CAAC,0BAA0B;QAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAA;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,iDAAiD;QACjD,IAAI,CAAC;YACH,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,wBAAwB;QAC1B,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAAmB,EACnB,SAAkB,EAClB,OAAgB;IAEhB,qCAAqC;IACrC,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;YACxC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAA;YAE5D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE;gBACtC,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAA;YAEF,YAAY,CAAC,SAAS,CAAC,CAAA;YAEvB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,MAAM,IAAI,GAAQ,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACzD,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,GAAG,WAAW,aAAa;oBACpC,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB,CAAA;YACH,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,GAAG,WAAW,8BAA8B,QAAQ,CAAC,MAAM,EAAE;aACvE,CAAA;QACH,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,GAAG,WAAW,yBAAyB,GAAG,CAAC,OAAO,EAAE;aAC9D,CAAA;QACH,CAAC;IACH,CAAC;IAED,6BAA6B;IAC7B,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAA;QAC9C,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACrB,CAAC,CAAC,GAAG,WAAW,qBAAqB,MAAM,CAAC,GAAG,GAAG;gBAClD,CAAC,CAAC,GAAG,WAAW,iBAAiB;SACpC,CAAA;IACH,CAAC;IAED,OAAO;QACL,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,+BAA+B,WAAW,8BAA8B;KAClF,CAAA;AACH,CAAC;AAED,+EAA+E;AAC/E,kBAAkB;AAClB,+EAA+E;AAE/E;;GAEG;AACH,KAAK,UAAU,WAAW,CAAC,OAAe,EAAE,OAAe;IACzD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAE5B,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CAAC;QACxC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;YAClE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA,CAAC,0BAA0B;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,kBAAkB;YAClB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,OAAe;IACjC,IAAI,CAAC;QACH,QAAQ,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAA;IAC/C,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,WAAmB,EACnB,IAAiB;IAEjB,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,WAAW,KAAK,CAAC,CAAC,KAAK,EAAE,CAAA;IAE3D,IAAI,CAAC;QACH,sBAAsB;QACtB,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE/C,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,GAAG,GAAG,WAAW,uBAAuB,CAAA;YACpD,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QACxD,CAAC;QAED,uBAAuB;QACvB,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAEjD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,kBAAkB,CAAC,CAAA;YAC9C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,oBAAoB,WAAW,CAAC,KAAK,EAAE;aACjD,CAAA;QACH,CAAC;QAED,+BAA+B;QAC/B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;QAEtD,kCAAkC;QAClC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,GAAG,YAAY,WAAW,YAAY,CAAA;YAClD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,CAAA;YAE5E,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,YAAY,CAAC,CAAA;gBAC3C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAA;YACpE,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,kCAAkC,CAAC,CAAA;gBAC9D,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,qDAAqD;iBAC/D,CAAA;YACH,CAAC;QACH,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,YAAY,CAAC,CAAA;QAC3C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAA;IAExD,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,iBAAiB,CAAC,CAAA;QAC7C,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAA;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,WAAmB,EACnB,YAAoB,EACpB,WAAoB,EACpB,OAAgB;IAEhB,2BAA2B;IAC3B,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAA;QAC9C,IAAI,MAAM,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;YAClC,gBAAgB;YAChB,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;YACvD,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW,kBAAkB,EAAE,CAAA;YACrE,CAAC;YACD,2DAA2D;QAC7D,CAAC;aAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW,kBAAkB,EAAE,CAAA;QACrE,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,MAAM,MAAM,GAAG,UAAU,CAAC,YAAY,CAAC,CAAA;IAEvC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,oBAAoB,MAAM,CAAC,KAAK,EAAE;SAC5C,CAAA;IACH,CAAC;IAED,mBAAmB;IACnB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;IAEtD,kCAAkC;IAClC,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QACvD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW,uBAAuB,EAAE,CAAA;QAC1E,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,GAAG,WAAW,kCAAkC;aAC1D,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,WAAW,UAAU,EAAE,CAAA;AAC7D,CAAC;AAED,+EAA+E;AAC/E,2BAA2B;AAC3B,+EAA+E;AAE/E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,UAAoC,EAAE;IAEtC,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,KAAK;QACjB,cAAc,EAAE,KAAK;KACtB,CAAA;IAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC,CAAA;IAEtD,yEAAyE;IACzE,MAAM,OAAO,GAAG,cAAc,EAAE,CAAA;IAChC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,oBAAoB,OAAO,SAAS,EAAE,IAAI,CAAC,CAAA;IAEnF,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,2CAA2C,OAAO,EAAE,CAAC,CAAC,CAAA;QAC9E,OAAO,CAAC,UAAU,GAAG,IAAI,CAAA;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,+CAA+C,CAAC,CAAC,CAAA;QAC1E,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAAC,aAAa,EAAE;YAC3D,WAAW,EAAE,sBAAsB;YACnC,YAAY,EAAE,wBAAwB;YACtC,WAAW,EAAE,oBAAoB,OAAO,SAAS;YACjD,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,OAAO,CAAC,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAA;IAC/C,CAAC;IAED,+CAA+C;IAC/C,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAA;IAE5E,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAA;QAC/D,OAAO,CAAC,cAAc,GAAG,IAAI,CAAA;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,oBAAoB,GAAG,MAAM,cAAc,CAAC,iBAAiB,EAAE;YACnE,WAAW,EAAE,0BAA0B;YACvC,YAAY,EAAE,4BAA4B;YAC1C,WAAW,EAAE,8BAA8B;YAC3C,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,OAAO,CAAC,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAA;IACvD,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IAIxC,MAAM,MAAM,GAAgE,EAAE,CAAA;IAE9E,oBAAoB;IACpB,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAC/C,aAAa,EACb,oBAAoB,cAAc,EAAE,SAAS,EAC7C,sBAAsB,CACvB,CAAA;IAED,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,MAAM,EAAE,8BAA8B;SACvC,CAAC,CAAA;IACJ,CAAC;IAED,wBAAwB;IACxB,MAAM,oBAAoB,GAAG,MAAM,kBAAkB,CACnD,iBAAiB,EACjB,8BAA8B,EAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,qBAAqB,CAAC,CACrE,CAAA;IAED,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,oBAAoB,CAAC,OAAO;YACrC,MAAM,EAAE,kCAAkC;SAC3C,CAAC,CAAA;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;QAC5B,MAAM;KACP,CAAA;AACH,CAAC"}

package/dist/lib/session-lock.d.ts

@@ -0,0 +1,61 @@
+/**
+ * Session Lock Registry + Merge Sequencer
+ *
+ * File-based concurrency control for multiple JFL sessions in the same project.
+ * Uses flock(2) for atomic operations and heartbeat files for liveness detection.
+ *
+ * Lock Registry: Sessions register on start, heartbeat every 30s, detected as
+ * stale after 90s of no heartbeat. Zero external dependencies.
+ *
+ * Merge Sequencer: FIFO queue with flock-based locking so only one session
+ * merges at a time. Others wait and retry.
+ *
+ * @purpose Concurrency control for multi-session JFL projects
+ */
+export interface SessionLock {
+    id: string;
+    pid: number;
+    branch: string;
+    worktree: string | null;
+    user: string;
+    claiming: string[];
+    started: string;
+    heartbeat: string;
+}
+export interface MergeQueueEntry {
+    session: string;
+    branch: string;
+    targetBranch: string;
+    ts: string;
+    status: "pending" | "merging" | "done" | "failed";
+    error?: string;
+}
+export declare const SESSION_ID_PATTERN: RegExp;
+export declare function validateSessionId(sessionId: string): void;
+export declare function registerSession(projectRoot: string, session: Omit<SessionLock, "heartbeat">): SessionLock;
+export declare function heartbeat(projectRoot: string, sessionId: string): boolean;
+export declare function updateClaims(projectRoot: string, sessionId: string, claiming: string[]): boolean;
+export declare function unregisterSession(projectRoot: string, sessionId: string): void;
+export declare function getActiveSessions(projectRoot: string): SessionLock[];
+export declare function getStaleSessions(projectRoot: string): SessionLock[];
+export declare function cleanStaleSessions(projectRoot: string): number;
+export declare function checkClaimConflict(projectRoot: string, sessionId: string, paths: string[]): {
+    conflicting: boolean;
+    claimedBy: string[];
+    paths: string[];
+};
+export declare function startHeartbeat(projectRoot: string, sessionId: string): void;
+export declare function stopHeartbeat(sessionId: string): void;
+export declare function enqueueMerge(projectRoot: string, sessionBranch: string, targetBranch: string, sessionId: string): void;
+export declare function acquireMergeLock(projectRoot: string, sessionId: string, timeoutMs?: number): Promise<boolean>;
+export declare function releaseMergeLock(projectRoot: string): void;
+export interface MergeResult {
+    success: boolean;
+    merged: boolean;
+    error?: string;
+    conflictFiles?: string[];
+}
+export declare function sequencedMerge(projectRoot: string, sessionBranch: string, targetBranch: string, sessionId: string, cwd?: string): Promise<MergeResult>;
+export declare function emitEvent(projectRoot: string, data: Record<string, unknown>): void;
+export declare function readRecentEvents(projectRoot: string, count?: number): Record<string, unknown>[];
+//# sourceMappingURL=session-lock.d.ts.map

package/dist/lib/session-lock.d.ts.map

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