@renseiai/agentfactory-cli 0.8.18 → 0.8.20

package/dist/src/lib/code-intelligence-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-intelligence-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/code-intelligence-runner.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,CAAA;IACjD,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,OAAO,CAAA;CAChB;AAID,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG;IAC7C,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,CAAA;IACjD,cAAc,EAAE,MAAM,EAAE,CAAA;CACzB,CAwBA;AA0aD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC,CAuBvC"}
+{"version":3,"file":"code-intelligence-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/code-intelligence-runner.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,CAAA;IACjD,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,OAAO,CAAA;CAChB;AAID,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG;IAC7C,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,CAAA;IACjD,cAAc,EAAE,MAAM,EAAE,CAAA;CACzB,CAwBA;AA+gBD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC,CAuBvC"}

package/dist/src/lib/code-intelligence-runner.js

@@ -256,6 +256,80 @@ function hasRelatedCases(lines, switchLine, _typeName) {
 function escapeRegex(str) {
     return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
+/**
+ * Determine whether a line contains a real import statement (not one inside
+ * a comment, string literal, template literal, or test assertion).
+ *
+ * The caller must maintain the parse state across lines.
+ */
+function isRealImportLine(line, state) {
+    const trimmed = line.trim();
+    // Track block comment boundaries
+    if (state.inBlockComment) {
+        if (trimmed.includes('*/')) {
+            return { real: false, state: { ...state, inBlockComment: false } };
+        }
+        return { real: false, state };
+    }
+    if (trimmed.startsWith('/*')) {
+        const closesOnSameLine = trimmed.includes('*/');
+        return { real: false, state: { ...state, inBlockComment: !closesOnSameLine } };
+    }
+    // Track template literal boundaries (backtick strings spanning multiple lines)
+    // Count unescaped backticks to toggle state
+    if (state.inTemplateLiteral) {
+        const backtickCount = countUnescapedBackticks(line);
+        if (backtickCount % 2 === 1) {
+            // Odd number of backticks — template literal ends on this line
+            return { real: false, state: { ...state, inTemplateLiteral: false } };
+        }
+        return { real: false, state };
+    }
+    // Single-line comments and JSDoc continuation lines
+    if (trimmed.startsWith('//') || trimmed.startsWith('*'))
+        return { real: false, state };
+    // Check if this line opens a template literal that doesn't close on the same line
+    const backticks = countUnescapedBackticks(line);
+    if (backticks % 2 === 1) {
+        // Odd backticks — a template literal opens and doesn't close on this line.
+        // The import on this line (if any) could be before or after the backtick.
+        // If the import keyword appears after a backtick, it's template content.
+        const importIdx = line.search(/\b(import|export)\s/);
+        const firstBacktick = line.indexOf('`');
+        if (importIdx >= 0 && firstBacktick >= 0 && importIdx > firstBacktick) {
+            // Import appears inside the template literal
+            return { real: false, state: { ...state, inTemplateLiteral: true } };
+        }
+        // Import appears before the backtick — real import, but template opens
+        if (importIdx >= 0 && (firstBacktick < 0 || importIdx < firstBacktick)) {
+            return { real: true, state: { ...state, inTemplateLiteral: true } };
+        }
+        return { real: false, state: { ...state, inTemplateLiteral: true } };
+    }
+    // Real import/export/require statements start at the beginning of the line
+    if (/^\s*(import|export)\s/.test(line))
+        return { real: true, state };
+    // Dynamic require: `const x = require('pkg')`
+    if (/\brequire\s*\(/.test(line)) {
+        const reqIdx = line.indexOf('require');
+        const beforeReq = line.slice(0, reqIdx);
+        if (beforeReq.includes('`') || beforeReq.includes("'require") || beforeReq.includes('"require')) {
+            return { real: false, state };
+        }
+        return { real: true, state };
+    }
+    return { real: false, state };
+}
+/** Count unescaped backticks in a line */
+function countUnescapedBackticks(line) {
+    let count = 0;
+    for (let i = 0; i < line.length; i++) {
+        if (line[i] === '`' && (i === 0 || line[i - 1] !== '\\')) {
+            count++;
+        }
+    }
+    return count;
+}
 async function validateCrossDeps(config) {
     const targetPath = config.positionalArgs[0]; // Optional: specific file or directory
     const files = await discoverSourceFiles(config.cwd);
@@ -283,8 +357,14 @@ async function validateCrossDeps(config) {
         if (!owningPkg)
             continue;
         const lines = content.split('\n');
+        let parseState = { inBlockComment: false, inTemplateLiteral: false };
         for (let i = 0; i < lines.length; i++) {
             const line = lines[i];
+            // Skip comments, string literals, and template content
+            const classification = isRealImportLine(line, parseState);
+            parseState = classification.state;
+            if (!classification.real)
+                continue;
             // Match import/require of workspace packages
             const importMatch = line.match(/(?:from\s+['"]|require\s*\(\s*['"]|import\s+['"])(@[^'"\/]+\/[^'"\/]+|[^.'"\/@][^'"\/]*)/);
             if (!importMatch)

package/dist/src/lib/merge-worker-sidecar.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Merge Worker Sidecar
+ *
+ * Starts the merge worker as a background loop alongside the fleet.
+ * Only one merge worker runs per repo (enforced by Redis lock).
+ *
+ * The sidecar:
+ * 1. Reads .agentfactory/config.yaml for merge queue settings
+ * 2. Creates a dedicated worktree for merge operations
+ * 3. Starts the MergeWorker poll loop
+ * 4. Stops gracefully on AbortSignal
+ *
+ * If Redis is not configured or merge queue is not enabled, this is a no-op.
+ */
+export interface MergeWorkerSidecarConfig {
+    /** Git repository root (default: auto-detect from cwd) */
+    gitRoot?: string;
+    /** Override repoId (default: derived from git remote) */
+    repoId?: string;
+}
+export interface MergeWorkerSidecarHandle {
+    /** Stop the merge worker gracefully */
+    stop(): void;
+    /** Promise that resolves when the worker exits */
+    done: Promise<void>;
+}
+/**
+ * Start the merge worker sidecar if merge queue is enabled.
+ *
+ * Returns a handle to stop the worker, or null if merge queue is not
+ * configured or Redis is unavailable. Safe to call unconditionally —
+ * it checks all preconditions before starting.
+ */
+export declare function startMergeWorkerSidecar(config?: MergeWorkerSidecarConfig, signal?: AbortSignal): MergeWorkerSidecarHandle | null;
+//# sourceMappingURL=merge-worker-sidecar.d.ts.map

package/dist/src/lib/merge-worker-sidecar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-worker-sidecar.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-worker-sidecar.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAyBH,MAAM,WAAW,wBAAwB;IACvC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,uCAAuC;IACvC,IAAI,IAAI,IAAI,CAAA;IACZ,kDAAkD;IAClD,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;CACpB;AAkED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,GAAE,wBAA6B,EACrC,MAAM,CAAC,EAAE,WAAW,GACnB,wBAAwB,GAAG,IAAI,CA0FjC"}

package/dist/src/lib/merge-worker-sidecar.js

@@ -0,0 +1,167 @@
+/**
+ * Merge Worker Sidecar
+ *
+ * Starts the merge worker as a background loop alongside the fleet.
+ * Only one merge worker runs per repo (enforced by Redis lock).
+ *
+ * The sidecar:
+ * 1. Reads .agentfactory/config.yaml for merge queue settings
+ * 2. Creates a dedicated worktree for merge operations
+ * 3. Starts the MergeWorker poll loop
+ * 4. Stops gracefully on AbortSignal
+ *
+ * If Redis is not configured or merge queue is not enabled, this is a no-op.
+ */
+import { execSync } from 'child_process';
+import path from 'path';
+import fs from 'fs';
+import { loadRepositoryConfig, MergeWorker, } from '@renseiai/agentfactory';
+import { MergeQueueStorage, isRedisConfigured, redisSetNX, redisDel, redisGet, redisSet, redisExpire, } from '@renseiai/agentfactory-server';
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function getGitRoot() {
+    return execSync('git rev-parse --show-toplevel', {
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+}
+function getRepoId(gitRoot) {
+    try {
+        const remote = execSync('git remote get-url origin', {
+            encoding: 'utf-8',
+            cwd: gitRoot,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        // Extract owner/repo from git URL
+        const match = remote.match(/[:/]([^/]+\/[^/.]+?)(?:\.git)?$/);
+        return match ? match[1] : 'default';
+    }
+    catch {
+        return 'default';
+    }
+}
+function ensureMergeWorktree(gitRoot) {
+    const worktreeBase = path.resolve(gitRoot, '..', path.basename(gitRoot) + '.wt');
+    const worktreePath = path.join(worktreeBase, '__merge-worker__');
+    if (fs.existsSync(worktreePath)) {
+        // Verify it's a valid worktree
+        try {
+            execSync('git rev-parse --git-dir', { cwd: worktreePath, stdio: ['pipe', 'pipe', 'pipe'] });
+            // Pull latest main
+            execSync('git fetch origin main && git reset --hard origin/main', {
+                cwd: worktreePath,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return worktreePath;
+        }
+        catch {
+            // Invalid worktree — recreate
+            try {
+                execSync(`git worktree remove --force "${worktreePath}"`, { cwd: gitRoot, stdio: ['pipe', 'pipe', 'pipe'] });
+            }
+            catch { /* best effort */ }
+        }
+    }
+    // Create the worktree directory parent
+    fs.mkdirSync(worktreeBase, { recursive: true });
+    // Create a detached worktree on main
+    execSync(`git worktree add --detach "${worktreePath}" origin/main`, {
+        cwd: gitRoot,
+        stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    return worktreePath;
+}
+// ---------------------------------------------------------------------------
+// Sidecar
+// ---------------------------------------------------------------------------
+/**
+ * Start the merge worker sidecar if merge queue is enabled.
+ *
+ * Returns a handle to stop the worker, or null if merge queue is not
+ * configured or Redis is unavailable. Safe to call unconditionally —
+ * it checks all preconditions before starting.
+ */
+export function startMergeWorkerSidecar(config = {}, signal) {
+    // Check Redis
+    if (!isRedisConfigured()) {
+        return null;
+    }
+    // Check repo config
+    const gitRoot = config.gitRoot ?? getGitRoot();
+    const repoConfig = loadRepositoryConfig(gitRoot);
+    if (!repoConfig?.mergeQueue?.enabled) {
+        return null;
+    }
+    const provider = repoConfig.mergeQueue.provider ?? 'local';
+    if (provider !== 'local') {
+        // GitHub-native or other external providers handle merging themselves
+        return null;
+    }
+    const repoId = config.repoId ?? getRepoId(gitRoot);
+    // Create dedicated worktree for merge operations
+    let worktreePath;
+    try {
+        worktreePath = ensureMergeWorktree(gitRoot);
+    }
+    catch (error) {
+        console.warn(`[merge-worker] Failed to create merge worktree: ${error instanceof Error ? error.message : String(error)}`);
+        return null;
+    }
+    // Build merge worker config from repo config
+    const mqConfig = repoConfig.mergeQueue;
+    const workerConfig = {
+        repoId,
+        repoPath: worktreePath,
+        strategy: mqConfig.strategy ?? 'rebase',
+        testCommand: mqConfig.testCommand ?? 'pnpm test',
+        testTimeout: mqConfig.testTimeout ?? 300_000,
+        lockFileRegenerate: mqConfig.lockFileRegenerate ?? true,
+        mergiraf: mqConfig.mergiraf ?? true,
+        pollInterval: mqConfig.pollInterval ?? 10_000,
+        maxRetries: mqConfig.maxRetries ?? 2,
+        escalation: {
+            onConflict: mqConfig.escalation?.onConflict ?? 'reassign',
+            onTestFailure: mqConfig.escalation?.onTestFailure ?? 'notify',
+        },
+        deleteBranchOnMerge: mqConfig.deleteBranchOnMerge ?? true,
+        packageManager: (repoConfig.packageManager ?? 'pnpm'),
+        remote: 'origin',
+        targetBranch: 'main',
+    };
+    // Wire Redis deps for the merge worker
+    const storage = new MergeQueueStorage();
+    const deps = {
+        storage: {
+            dequeue: (id) => storage.dequeue(id),
+            markCompleted: (id, pr) => storage.markCompleted(id, pr),
+            markFailed: (id, pr, reason) => storage.markFailed(id, pr, reason),
+            markBlocked: (id, pr, reason) => storage.markBlocked(id, pr, reason),
+        },
+        redis: {
+            setNX: async (key, value, ttl) => {
+                const result = await redisSetNX(key, value, ttl);
+                return result;
+            },
+            del: (key) => redisDel(key).then(() => undefined),
+            get: (key) => redisGet(key),
+            set: (key, value) => redisSet(key, value).then(() => undefined),
+            expire: (key, seconds) => redisExpire(key, seconds).then(() => undefined),
+        },
+    };
+    const worker = new MergeWorker(workerConfig, deps);
+    console.log(`[merge-worker] Starting merge worker sidecar (repo: ${repoId}, worktree: ${worktreePath})`);
+    const done = worker.start(signal).catch((error) => {
+        // Lock acquisition failure is expected if another worker is already running
+        if (error instanceof Error && error.message.includes('already running')) {
+            console.log(`[merge-worker] Another merge worker is already running for ${repoId} — skipping`);
+        }
+        else {
+            console.error(`[merge-worker] Merge worker error: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    });
+    return {
+        stop: () => worker.stop(),
+        done,
+    };
+}

package/dist/src/lib/orchestrator-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/orchestrator-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,iBAAiB,EAEvB,MAAM,wBAAwB,CAAA;AAkB/B,MAAM,WAAW,wBAAwB;IACvC,wCAAwC;IACxC,YAAY,EAAE,MAAM,CAAA;IACpB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,6CAA6C;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,kDAAkD;IAClD,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,iEAAiE;IACjE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,qBAAqB,CAAA;IACjC,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sDAAsD;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACpD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IAC5C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IAC/C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC1D,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAA;IAChD,SAAS,EAAE,YAAY,EAAE,CAAA;CAC1B;AAMD,wBAAgB,UAAU,IAAI,MAAM,CASnC;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAYjD;AA0CD,wBAAsB,eAAe,CACnC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,wBAAwB,CAAC,CAmGnC"}
+{"version":3,"file":"orchestrator-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/orchestrator-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAGL,KAAK,YAAY,EAEjB,KAAK,iBAAiB,EAEvB,MAAM,wBAAwB,CAAA;AAmB/B,MAAM,WAAW,wBAAwB;IACvC,wCAAwC;IACxC,YAAY,EAAE,MAAM,CAAA;IACpB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,6CAA6C;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,kDAAkD;IAClD,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,iEAAiE;IACjE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,qBAAqB,CAAA;IACjC,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sDAAsD;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACpD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IAC5C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IAC/C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC1D,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;CAClD;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,MAAM,CAAA;IACrB,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAC,CAAA;IAChD,SAAS,EAAE,YAAY,EAAE,CAAA;CAC1B;AAMD,wBAAgB,UAAU,IAAI,MAAM,CASnC;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAYjD;AA0CD,wBAAsB,eAAe,CACnC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,wBAAwB,CAAC,CA4GnC"}

package/dist/src/lib/orchestrator-runner.js

@@ -7,8 +7,9 @@
  */
 import path from 'path';
 import { execSync } from 'child_process';
-import { createOrchestrator, } from '@renseiai/agentfactory';
+import { createOrchestrator, loadRepositoryConfig, } from '@renseiai/agentfactory';
 import { LinearIssueTrackerClient, createLinearStatusMappings, linearPlugin, } from '@renseiai/plugin-linear';
+import { MergeQueueStorage, createLocalMergeQueueStorage } from '@renseiai/agentfactory-server';
 let codeIntelligencePlugin;
 try {
     ;
@@ -88,6 +89,13 @@ export async function runOrchestrator(config) {
     const cb = config.callbacks ?? defaultCallbacks();
     const issueTrackerClient = new LinearIssueTrackerClient({ apiKey: config.linearApiKey });
     const statusMappings = createLinearStatusMappings();
+    // Create local merge queue storage if configured
+    const repoConfig = loadRepositoryConfig(gitRoot);
+    const needsLocalStorage = repoConfig?.mergeQueue?.enabled &&
+        (!repoConfig.mergeQueue.provider || repoConfig.mergeQueue.provider === 'local');
+    const mergeQueueStorage = needsLocalStorage
+        ? createLocalMergeQueueStorage(new MergeQueueStorage())
+        : undefined;
     const orchestratorConfig = {
         project: config.project,
         maxConcurrent,
@@ -95,6 +103,7 @@ export async function runOrchestrator(config) {
         linearApiKey: config.linearApiKey,
         issueTrackerClient,
         statusMappings,
+        mergeQueueStorage,
         toolPlugins: [linearPlugin, codeIntelligencePlugin].filter(Boolean),
     };
     if (config.templateDir) {

package/dist/src/lib/worker-fleet-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-fleet-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-fleet-runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,MAAM,WAAW,iBAAiB;IAChC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAA;IACd,gFAAgF;IAChF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AA6UD;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAqBf"}
+{"version":3,"file":"worker-fleet-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-fleet-runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,MAAM,WAAW,iBAAiB;IAChC,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,mEAAmE;IACnE,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,4CAA4C;IAC5C,MAAM,EAAE,MAAM,CAAA;IACd,gFAAgF;IAChF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AA4VD;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAqBf"}

package/dist/src/lib/worker-fleet-runner.js

@@ -11,6 +11,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { getVersion, checkForUpdate, printUpdateNotification } from './version.js';
 import { maybeAutoUpdate, isAutoUpdateEnabled } from './auto-updater.js';
+import { startMergeWorkerSidecar } from './merge-worker-sidecar.js';
 // ---------------------------------------------------------------------------
 // ANSI colors
 // ---------------------------------------------------------------------------
@@ -60,6 +61,7 @@ function getDefaultWorkerScript() {
 // ---------------------------------------------------------------------------
 class WorkerFleet {
     workers = new Map();
+    mergeWorkerHandle = null;
     fleetConfig;
     shuttingDown = false;
     workerScript;
@@ -114,6 +116,11 @@ ${colors.cyan}================================================================${
             if (signal?.aborted)
                 return;
             fleetLog(null, colors.green, 'INF', `All ${workers} workers started`);
+            // Start merge worker sidecar (one per fleet, Redis lock prevents duplicates)
+            this.mergeWorkerHandle = startMergeWorkerSidecar({}, signal);
+            if (this.mergeWorkerHandle) {
+                fleetLog(null, colors.cyan, 'INF', 'Merge worker sidecar started');
+            }
             // Periodic auto-update check (every 4 hours)
             if (isAutoUpdateEnabled(this.autoUpdateFlag)) {
                 this.updateInterval = setInterval(async () => {
@@ -225,6 +232,13 @@ ${colors.cyan}================================================================${
             worker.process.on('exit', () => resolve());
         })));
         clearTimeout(forceKillTimeout);
+        // Stop merge worker sidecar
+        if (this.mergeWorkerHandle) {
+            fleetLog(null, colors.cyan, 'INF', 'Stopping merge worker sidecar...');
+            this.mergeWorkerHandle.stop();
+            await this.mergeWorkerHandle.done;
+            fleetLog(null, colors.cyan, 'INF', 'Merge worker sidecar stopped');
+        }
         console.log(`${colors.green}All workers stopped${colors.reset}`);
         // Resolve the running promise so start() returns
         this.resolveRunning?.();

package/dist/src/lib/worker-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgCH,MAAM,WAAW,kBAAkB;IACjC,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,mDAAmD;IACnD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,gFAAgF;IAChF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AA4ED;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAi/Bf"}
+{"version":3,"file":"worker-runner.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAkCH,MAAM,WAAW,kBAAkB;IACjC,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,mDAAmD;IACnD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,gFAAgF;IAChF,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AA4ED;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA0/Bf"}

package/dist/src/lib/worker-runner.js

@@ -8,8 +8,9 @@
 import path from 'path';
 import { execSync } from 'child_process';
 import os from 'os';
-import { createOrchestrator, createLogger, } from '@renseiai/agentfactory';
+import { createOrchestrator, createLogger, loadRepositoryConfig, } from '@renseiai/agentfactory';
 import { LinearIssueTrackerClient, createLinearStatusMappings, linearPlugin, } from '@renseiai/plugin-linear';
+import { MergeQueueStorage, createLocalMergeQueueStorage } from '@renseiai/agentfactory-server';
 let codeIntelligencePlugin;
 try {
     ;
@@ -426,11 +427,19 @@ export async function runWorker(config, signal) {
             // Create orchestrator with API activity proxy
             const issueTrackerClient = new LinearIssueTrackerClient({ apiKey: linearApiKey });
             const statusMappings = createLinearStatusMappings();
+            // Create local merge queue storage if configured
+            const repoConfig = loadRepositoryConfig(gitRoot);
+            const needsLocalStorage = repoConfig?.mergeQueue?.enabled &&
+                (!repoConfig.mergeQueue.provider || repoConfig.mergeQueue.provider === 'local');
+            const mergeQueueStorage = needsLocalStorage
+                ? createLocalMergeQueueStorage(new MergeQueueStorage())
+                : undefined;
             const orchestrator = createOrchestrator({
                 maxConcurrent: 1,
                 worktreePath: path.resolve(gitRoot, '..', path.basename(gitRoot) + '.wt'),
                 issueTrackerClient,
                 statusMappings,
+                mergeQueueStorage,
                 toolPlugins: [linearPlugin, codeIntelligencePlugin].filter(Boolean),
                 apiActivityConfig: {
                     baseUrl: workerConfig.apiUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@renseiai/agentfactory-cli",
-  "version": "0.8.18",
+  "version": "0.8.20",
   "type": "module",
   "description": "CLI tools for AgentFactory — local orchestrator, remote worker, queue admin",
   "author": "Rensei AI (https://rensei.ai)",
@@ -126,12 +126,12 @@
   ],
   "dependencies": {
     "dotenv": "^17.2.3",
-    "@renseiai/plugin-linear": "0.8.18",
-    "@renseiai/agentfactory-server": "0.8.18",
-    "@renseiai/agentfactory": "0.8.18"
+    "@renseiai/agentfactory": "0.8.20",
+    "@renseiai/agentfactory-server": "0.8.20",
+    "@renseiai/plugin-linear": "0.8.20"
   },
   "optionalDependencies": {
-    "@renseiai/agentfactory-code-intelligence": "0.8.18"
+    "@renseiai/agentfactory-code-intelligence": "0.8.20"
   },
   "devDependencies": {
     "@types/node": "^22.5.4",