contextos-mcp 0.4.0

package/dist/mcp/server.js.map

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

package/dist/mcp/session.d.ts

@@ -0,0 +1,117 @@
+/**
+ * MCP session manager — maintains per-directory swarm state.
+ *
+ * Each directory gets its own session with:
+ *   - ThreadManager (spawning/tracking threads)
+ *   - SwarmConfig (loaded from the project dir)
+ *   - AbortController (for cancellation)
+ *   - BudgetState (cost tracking)
+ *
+ * Sessions are lazily initialized on first tool call and persist
+ * across multiple MCP tool invocations.
+ *
+ * Concurrency:
+ *   - pendingSessions deduplicates concurrent init for the same dir
+ *   - loadConfig(cwd) avoids process.chdir() race conditions
+ */
+import type { SwarmConfig } from "../config.js";
+import { ActionDispatcher } from "../core/action-dispatcher.js";
+import type { BudgetState, CompressedResult, MergeResult, ThreadState, VerificationSpec } from "../core/types.js";
+import { ThreadManager } from "../threads/manager.js";
+import { type AsyncTaskRecord } from "./state.js";
+export interface SwarmSession {
+    dir: string;
+    config: SwarmConfig;
+    threadManager: ThreadManager;
+    abortController: AbortController;
+    createdAt: number;
+    dispatcher?: ActionDispatcher;
+}
+export interface ThreadSpawnParams {
+    id?: string;
+    task: string;
+    files?: string[];
+    writeScope?: string[];
+    writeScopeDeny?: string[];
+    allowRepositoryWide?: boolean;
+    focusFiles?: string[];
+    agent?: string;
+    model?: string;
+    context?: string;
+    testCommand?: string;
+    verificationSpec?: VerificationSpec;
+    expectedResult?: string;
+    maxAttempts?: number;
+}
+/** Inspect existing state without initializing agents, worktrees or migrations. */
+export declare function inspectSession(dir: string): {
+    dir: string;
+    threads: ThreadState[];
+    asyncTasks: Record<string, AsyncTaskRecord>;
+    budget: BudgetState;
+} | {
+    dir: string;
+    threads: ThreadState[];
+    asyncTasks: Record<string, AsyncTaskRecord>;
+    budget: {
+        totalSpentUsd: number;
+        sessionLimitUsd: number;
+        totalTokens: {
+            input: number;
+            output: number;
+        };
+    };
+};
+/**
+ * Get or create a session for a directory.
+ * The directory is resolved to an absolute path and used as the session key.
+ * Concurrent calls for the same directory are deduplicated.
+ */
+export declare function getSession(dir: string): Promise<SwarmSession>;
+/**
+ * Spawn a thread in a session.
+ */
+export declare function spawnThread(session: SwarmSession, params: ThreadSpawnParams): Promise<CompressedResult>;
+/**
+ * Get all threads in a session (merging memory with persisted state).
+ */
+export declare function getThreads(session: SwarmSession): ThreadState[];
+/**
+ * Record an async job into persistent state.
+ */
+export declare function recordAsyncJob(session: SwarmSession, taskId: string, agentCount: number, status?: "running" | "completed" | "failed" | "unknown_after_restart"): void;
+/**
+ * Get all async jobs from persistent state.
+ */
+export declare function getAsyncJobs(session: SwarmSession): Record<string, AsyncTaskRecord>;
+/**
+ * Get budget state for a session.
+ */
+export declare function getBudgetState(session: SwarmSession): BudgetState;
+/**
+ * Merge completed threads.
+ */
+export declare function mergeThreads(session: SwarmSession): Promise<MergeResult[]>;
+/**
+ * Cancel a specific thread or all threads.
+ * Per-thread cancellation uses ThreadManager.cancelThread() which
+ * aborts the thread's individual AbortController.
+ */
+export declare function cancelThreads(session: SwarmSession, threadId?: string): {
+    cancelled: boolean;
+    message: string;
+};
+/**
+ * Cleanup a session — destroy worktrees, remove session.
+ * @param dryRun - If true, report what would be cleaned without actually deleting.
+ */
+export declare function cleanupSession(dir: string, purgeAllOrphans?: boolean, dryRun?: boolean): Promise<string>;
+/**
+ * Cleanup all sessions. Snapshots keys first to avoid
+ * mutating the map during iteration.
+ */
+export declare function cleanupAllSessions(): Promise<void>;
+/**
+ * Creates an ActionDispatcher wired to a SwarmSession for declarative orchestration.
+ */
+export declare function createSessionDispatcher(session: SwarmSession): ActionDispatcher;

package/dist/mcp/session.js

@@ -0,0 +1,450 @@
+/**
+ * MCP session manager — maintains per-directory swarm state.
+ *
+ * Each directory gets its own session with:
+ *   - ThreadManager (spawning/tracking threads)
+ *   - SwarmConfig (loaded from the project dir)
+ *   - AbortController (for cancellation)
+ *   - BudgetState (cost tracking)
+ *
+ * Sessions are lazily initialized on first tool call and persist
+ * across multiple MCP tool invocations.
+ *
+ * Concurrency:
+ *   - pendingSessions deduplicates concurrent init for the same dir
+ *   - loadConfig(cwd) avoids process.chdir() race conditions
+ */
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { loadConfig } from "../config.js";
+import { ActionDispatcher } from "../core/action-dispatcher.js";
+import { assertWithinRepository } from "../security/repository-boundary.js";
+import { ThreadManager } from "../threads/manager.js";
+import { isEligibleForMerge, mergeAllThreads, mergeThreadBranch } from "../worktree/merge.js";
+import { clearPersistedState, getPersistedAsyncTasks, getPersistedThreads, purgeOrphans, reconcileSessionStateWithGit, recordAsyncTask, recordThreadState, } from "./state.js";
+// ── Session Manager ────────────────────────────────────────────────────────
+const sessions = new Map();
+/** Deduplicates concurrent getSession() calls for the same directory. */
+const pendingSessions = new Map();
+/** Inspect existing state without initializing agents, worktrees or migrations. */
+export function inspectSession(dir) {
+    const canonicalDir = assertWithinRepository(path.resolve(dir), path.resolve(dir));
+    const session = sessions.get(canonicalDir);
+    if (session)
+        return {
+            dir: canonicalDir,
+            threads: getThreads(session),
+            asyncTasks: getAsyncJobs(session),
+            budget: getBudgetState(session),
+        };
+    const config = loadConfig(canonicalDir);
+    const threads = getPersistedThreads(canonicalDir, config.worktree_base_dir);
+    const asyncTasks = getPersistedAsyncTasks(canonicalDir, config.worktree_base_dir);
+    return {
+        dir: canonicalDir,
+        threads,
+        asyncTasks,
+        budget: {
+            totalSpentUsd: threads.reduce((sum, thread) => sum + (thread.result?.estimatedCostUsd ?? thread.estimatedCostUsd ?? 0), 0),
+            sessionLimitUsd: config.max_session_budget_usd,
+            totalTokens: threads.reduce((sum, thread) => ({
+                input: sum.input + (thread.result?.usage?.inputTokens || 0),
+                output: sum.output + (thread.result?.usage?.outputTokens || 0),
+            }), { input: 0, output: 0 }),
+        },
+    };
+}
+/**
+ * Lazily init agent backends (only once).
+ * Agent modules self-register when imported.
+ * The flag is set eagerly to prevent duplicate imports even if
+ * the first call hasn't finished awaiting yet.
+ */
+let agentsRegistered = false;
+async function ensureAgentsRegistered() {
+    if (agentsRegistered)
+        return;
+    agentsRegistered = true;
+    // Each agent module calls registerAgent() at module level on import
+    const modules = [
+        import("../agents/opencode.js"),
+        import("../agents/claude-code.js"),
+        import("../agents/codex.js"),
+        import("../agents/aider.js"),
+        import("../agents/direct-llm.js"),
+    ];
+    // Import all, ignoring individual failures
+    await Promise.allSettled(modules);
+}
+/**
+ * Get or create a session for a directory.
+ * The directory is resolved to an absolute path and used as the session key.
+ * Concurrent calls for the same directory are deduplicated.
+ */
+export async function getSession(dir) {
+    const absDir = path.resolve(dir);
+    if (!fs.existsSync(absDir)) {
+        throw new Error(`Directory does not exist: ${absDir}`);
+    }
+    const canonicalDir = assertWithinRepository(absDir, absDir);
+    // Return existing session
+    const existing = sessions.get(canonicalDir);
+    if (existing)
+        return existing;
+    // Deduplicate concurrent init for the same dir
+    const pending = pendingSessions.get(canonicalDir);
+    if (pending)
+        return pending;
+    const initPromise = initSession(canonicalDir);
+    pendingSessions.set(canonicalDir, initPromise);
+    try {
+        const session = await initPromise;
+        return session;
+    }
+    finally {
+        pendingSessions.delete(canonicalDir);
+    }
+}
+/**
+ * Initialize a new session for a directory.
+ * Uses loadConfig(cwd) to avoid process.chdir() race conditions.
+ */
+async function initSession(absDir) {
+    await ensureAgentsRegistered();
+    // Load config from project dir without chdir (concurrency-safe)
+    const config = loadConfig(absDir);
+    const abortController = new AbortController();
+    // ThreadManager creates its own WorktreeManager internally,
+    // so we don't need a separate one at the session level.
+    const threadManager = new ThreadManager(absDir, config, 
+    // Progress callback — log to stderr (stdout is MCP protocol) and persist to disk
+    (threadId, phase, detail) => {
+        const msg = detail ? `[${threadId}] ${phase}: ${detail}` : `[${threadId}] ${phase}`;
+        process.stderr.write(`[swarm-mcp] ${msg}\n`);
+        const current = threadManager.getThreads();
+        const t = current.find((item) => item.id === threadId);
+        if (t) {
+            recordThreadState(absDir, t, config.worktree_base_dir);
+        }
+    }, abortController.signal);
+    await threadManager.init();
+    // Task 2.5d: Reconcile persisted state against active git worktrees on startup
+    await reconcileSessionStateWithGit(absDir, config.worktree_base_dir);
+    // Rehydrate threads from persisted state (survives server restart)
+    const persisted = getPersistedThreads(absDir, config.worktree_base_dir);
+    for (const thread of persisted) {
+        threadManager.restoreThread(thread);
+    }
+    // Mark lingering running async tasks as unknown_after_restart
+    const asyncTasks = getPersistedAsyncTasks(absDir, config.worktree_base_dir);
+    for (const task of Object.values(asyncTasks)) {
+        if (task.status === "running") {
+            recordAsyncTask(absDir, { ...task, status: "unknown_after_restart" }, config.worktree_base_dir);
+        }
+    }
+    const session = {
+        dir: absDir,
+        config,
+        threadManager,
+        abortController,
+        createdAt: Date.now(),
+    };
+    session.dispatcher = createSessionDispatcher(session);
+    sessions.set(absDir, session);
+    return session;
+}
+/**
+ * Spawn a thread in a session.
+ */
+export async function spawnThread(session, params) {
+    const threadId = params.id || `mcp-${randomUUID()}`;
+    if (params.files) {
+        for (const file of params.files) {
+            assertWithinRepository(path.resolve(session.dir, file), session.dir);
+        }
+    }
+    const threadConfig = {
+        id: threadId,
+        task: params.task,
+        context: params.context || "",
+        agent: {
+            backend: params.agent || session.config.default_agent,
+            model: params.model || session.config.default_model,
+        },
+        files: params.focusFiles || params.files || [],
+        focusFiles: params.focusFiles || params.files || [],
+        writeScope: params.writeScope || [],
+        writeScopeDeny: params.writeScopeDeny || [],
+        allowRepositoryWide: params.allowRepositoryWide ?? params.writeScope?.includes(".") ?? false,
+        verificationSpec: params.verificationSpec,
+        testCommand: params.testCommand ||
+            (params.verificationSpec?.executable
+                ? `${params.verificationSpec.executable} ${params.verificationSpec.args.join(" ")}`.trim()
+                : undefined),
+        taskBrief: params.testCommand || params.verificationSpec || params.expectedResult || params.maxAttempts || params.writeScope
+            ? {
+                taskId: threadId,
+                baseSha: "",
+                objective: params.task,
+                writeScope: params.writeScope || [],
+                writeScopeDeny: params.writeScopeDeny || [],
+                allowRepositoryWide: params.allowRepositoryWide ?? params.writeScope?.includes(".") ?? false,
+                focusFiles: params.focusFiles || params.files || [],
+                testCommand: params.testCommand ||
+                    (params.verificationSpec?.executable
+                        ? `${params.verificationSpec.executable} ${params.verificationSpec.args.join(" ")}`.trim()
+                        : ""),
+                verificationSpec: params.verificationSpec,
+                expectedResult: params.expectedResult || "Task completes successfully",
+                maxAttempts: params.maxAttempts || session.config.thread_retries + 1,
+            }
+            : undefined,
+    };
+    const resultPromise = session.threadManager.spawnThread(threadConfig);
+    const initialThread = session.threadManager.getThreads().find((t) => t.id === threadId);
+    if (initialThread) {
+        recordThreadState(session.dir, initialThread, session.config.worktree_base_dir);
+    }
+    const result = await resultPromise;
+    const finalThread = session.threadManager.getThreads().find((t) => t.id === threadId);
+    if (finalThread) {
+        recordThreadState(session.dir, finalThread, session.config.worktree_base_dir);
+    }
+    return result;
+}
+/**
+ * Get all threads in a session (merging memory with persisted state).
+ */
+export function getThreads(session) {
+    const memoryThreads = session.threadManager.getThreads();
+    const persisted = getPersistedThreads(session.dir, session.config.worktree_base_dir);
+    const map = new Map();
+    for (const t of persisted)
+        map.set(t.id, t);
+    for (const t of memoryThreads)
+        map.set(t.id, t);
+    return Array.from(map.values());
+}
+/**
+ * Record an async job into persistent state.
+ */
+export function recordAsyncJob(session, taskId, agentCount, status = "running") {
+    recordAsyncTask(session.dir, { taskId, agentCount, startedAt: Date.now(), status }, session.config.worktree_base_dir);
+}
+/**
+ * Get all async jobs from persistent state.
+ */
+export function getAsyncJobs(session) {
+    return getPersistedAsyncTasks(session.dir, session.config.worktree_base_dir);
+}
+/**
+ * Get budget state for a session.
+ */
+export function getBudgetState(session) {
+    return session.threadManager.getBudgetState();
+}
+/**
+ * Merge completed threads.
+ */
+export async function mergeThreads(session) {
+    const threads = session.threadManager.getThreads();
+    return mergeAllThreads(session.dir, threads, { continueOnConflict: true });
+}
+/**
+ * Cancel a specific thread or all threads.
+ * Per-thread cancellation uses ThreadManager.cancelThread() which
+ * aborts the thread's individual AbortController.
+ */
+export function cancelThreads(session, threadId) {
+    if (threadId) {
+        const cancelled = session.threadManager.cancelThread(threadId);
+        if (!cancelled) {
+            const threads = session.threadManager.getThreads();
+            const thread = threads.find((t) => t.id === threadId);
+            if (!thread)
+                return { cancelled: false, message: `Thread ${threadId} not found` };
+            return { cancelled: false, message: `Thread ${threadId} is ${thread.status}, cannot cancel` };
+        }
+        return { cancelled: true, message: `Thread ${threadId} cancelled` };
+    }
+    // Cancel all — abort the session controller
+    session.abortController.abort();
+    return { cancelled: true, message: "All threads cancelled" };
+}
+/**
+ * Cleanup a session — destroy worktrees, remove session.
+ * @param dryRun - If true, report what would be cleaned without actually deleting.
+ */
+export async function cleanupSession(dir, purgeAllOrphans = false, dryRun = false) {
+    const absDir = path.resolve(dir);
+    const canonicalDir = fs.existsSync(absDir) ? assertWithinRepository(absDir, absDir) : absDir;
+    const session = sessions.get(canonicalDir) || sessions.get(absDir);
+    const worktreeBaseDir = session?.config.worktree_base_dir;
+    if (!session && !purgeAllOrphans) {
+        if (!dryRun && fs.existsSync(canonicalDir))
+            clearPersistedState(canonicalDir, worktreeBaseDir);
+        return "No active session for this directory";
+    }
+    if (session && !dryRun) {
+        session.abortController.abort();
+        await session.threadManager.cleanup();
+        sessions.delete(canonicalDir);
+        sessions.delete(absDir);
+    }
+    if (!dryRun && fs.existsSync(canonicalDir)) {
+        clearPersistedState(canonicalDir, worktreeBaseDir);
+    }
+    if (purgeAllOrphans) {
+        const { prunedWorktrees, deletedBranches, report } = await purgeOrphans(canonicalDir, dryRun, worktreeBaseDir);
+        const prefix = dryRun ? "[DRY RUN] " : "";
+        const reportStr = report.length > 0 ? `\n${report.join("\n")}` : "";
+        return `${prefix}Session cleaned up for ${canonicalDir} (purged ${prunedWorktrees} orphan worktree dirs, ${deletedBranches} branches)${reportStr}`;
+    }
+    return `Session cleaned up for ${canonicalDir}`;
+}
+/**
+ * Cleanup all sessions. Snapshots keys first to avoid
+ * mutating the map during iteration.
+ */
+export async function cleanupAllSessions() {
+    const dirs = [...sessions.keys()];
+    for (const dir of dirs) {
+        await cleanupSession(dir);
+    }
+}
+/**
+ * Creates an ActionDispatcher wired to a SwarmSession for declarative orchestration.
+ */
+export function createSessionDispatcher(session) {
+    return new ActionDispatcher({
+        async spawn(action) {
+            const threadId = `mcp-${randomUUID()}`;
+            const result = await spawnThread(session, {
+                id: threadId,
+                task: action.task,
+                files: action.focusFiles || [],
+                writeScope: action.writeScope,
+                focusFiles: action.focusFiles || [],
+                model: action.model,
+            });
+            return {
+                threadId,
+                success: result.success,
+                summary: result.summary,
+                filesChanged: result.filesChanged,
+                durationMs: result.durationMs,
+            };
+        },
+        async wait(action) {
+            const threads = getThreads(session);
+            const matched = threads.filter((t) => action.threadIds.includes(t.id));
+            return {
+                threads: matched.map((t) => ({
+                    id: t.id,
+                    status: t.status,
+                    phase: t.phase,
+                    success: t.result?.success,
+                })),
+            };
+        },
+        async inspectDiff(action) {
+            const threads = getThreads(session);
+            const thread = threads.find((t) => t.id === action.threadId);
+            if (!thread) {
+                return { error: `Thread ${action.threadId} not found` };
+            }
+            let diff = "";
+            if (thread.worktreePath) {
+                const wm = session.threadManager.getWorktreeManager();
+                diff = await wm.getDiff(action.threadId);
+            }
+            return {
+                threadId: action.threadId,
+                diff,
+                diffStats: thread.result?.diffStats || "",
+                filesChanged: thread.result?.filesChanged || [],
+            };
+        },
+        async review(action) {
+            const threads = getThreads(session);
+            const thread = threads.find((t) => t.id === action.threadId);
+            if (!thread) {
+                return { error: `Thread ${action.threadId} not found` };
+            }
+            // Acquire lease for thread mutation
+            const store = require("../mcp/state.js").getThreadStore(session.dir);
+            let lease = null;
+            if (store && typeof store.acquireLease === "function") {
+                lease = store.acquireLease(action.threadId, "mcp-action");
+                if (!lease.tryAcquire()) {
+                    return { error: `Thread ${action.threadId} is locked by another process (failed to acquire lease)` };
+                }
+            }
+            try {
+                return {
+                    threadId: action.threadId,
+                    status: thread.status,
+                    reviewed: Boolean(thread.review),
+                    verdict: thread.review,
+                };
+            }
+            finally {
+                if (lease)
+                    lease.release();
+            }
+        },
+        async merge(action) {
+            const threads = getThreads(session);
+            const thread = threads.find((t) => t.id === action.threadId);
+            if (!thread) {
+                return { error: `Thread ${action.threadId} not found` };
+            }
+            if (!thread.branchName) {
+                return { error: `Thread ${action.threadId} has no branch` };
+            }
+            const eligibility = isEligibleForMerge(thread);
+            if (!eligibility.eligible) {
+                return {
+                    threadId: action.threadId,
+                    merged: false,
+                    error: `Merge blocked by strict merge predicate: ${eligibility.reason}`,
+                };
+            }
+            // Acquire lease for thread mutation
+            const store = require("../mcp/state.js").getThreadStore(session.dir);
+            let lease = null;
+            if (store && typeof store.acquireLease === "function") {
+                lease = store.acquireLease(action.threadId, "mcp-action");
+                if (!lease.tryAcquire()) {
+                    return {
+                        threadId: action.threadId,
+                        merged: false,
+                        error: `Thread ${action.threadId} is locked by another process (failed to acquire lease)`,
+                    };
+                }
+            }
+            try {
+                const result = await mergeThreadBranch(session.dir, thread.branchName, action.threadId, thread);
+                return {
+                    threadId: action.threadId,
+                    merged: result.success,
+                    branch: result.branch,
+                    message: result.message,
+                    conflicts: result.conflicts,
+                };
+            }
+            finally {
+                if (lease)
+                    lease.release();
+            }
+        },
+        async finish(action) {
+            return {
+                finished: true,
+                summary: action.summary,
+            };
+        },
+    });
+}
+//# sourceMappingURL=session.js.map

package/dist/mcp/session.js.map

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

package/dist/mcp/state.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Persistent session and thread state storage for ContextOS MCP server.
+ *
+ * Ensures that thread execution states, worktree locations, and results
+ * survive MCP server process restarts and can be recovered or cleaned up.
+ *
+ * Integrates with ContextOS Runtime v2 ThreadStore.
+ */
+import type { ThreadState } from "../core/types.js";
+export interface AsyncTaskRecord {
+    taskId: string;
+    agentCount: number;
+    startedAt: number;
+    status: "running" | "completed" | "failed" | "unknown_after_restart";
+}
+export interface OrphanReport {
+    worktreeDirs: string[];
+    swarmBranches: string[];
+}
+export interface StateLockData {
+    pid: number;
+    sessionId?: string;
+    lockedAt: number;
+}
+export declare function isProcessAlive(pid: number): boolean;
+export declare function acquireStateLock(dir: string, sessionId?: string): (() => void) | null;
+export declare function reconcileSessionStateWithGit(repoRoot: string, worktreeBaseDir?: string): Promise<{
+    threads: ThreadState[];
+} | null>;
+export declare function recordThreadState(dir: string, thread: ThreadState, _worktreeBaseDir?: string): void;
+export declare function savePersistedState(dir: string, state: any, worktreeBaseDir?: string): void;
+export declare function loadPersistedState(dir: string, worktreeBaseDir?: string): any;
+export declare function recordAsyncTask(dir: string, task: AsyncTaskRecord, _worktreeBaseDir?: string): void;
+export declare function getPersistedThreads(dir: string, _worktreeBaseDir?: string): ThreadState[];
+export declare function getPersistedAsyncTasks(dir: string, _worktreeBaseDir?: string): Record<string, AsyncTaskRecord>;
+export declare function clearPersistedState(_dir: string, _worktreeBaseDir?: string): void;
+export declare function scanOrphanWorktrees(repoRoot: string, worktreeBaseDir?: string): Promise<OrphanReport>;
+export declare function purgeOrphans(repoRoot: string, dryRun?: boolean, worktreeBaseDir?: string): Promise<{
+    prunedWorktrees: number;
+    deletedBranches: number;
+    report: string[];
+}>;