spidersan 0.6.0 → 0.10.0

package/dist/commands/bot.js

@@ -0,0 +1,416 @@
+/**
+ * spidersan bot — Message-driven git operations daemon via smalltoak.
+ *
+ * Polls smalltoak for /commands, executes git actions, replies with results.
+ * Requires envoak vault injection (GIT_BOT_ENABLED=true).
+ *
+ * Usage:
+ *   envoak vault inject --key ... -- spidersan bot
+ *   spidersan bot --once
+ *   spidersan bot add <name> --path <path> --branch <branch> --push <files>
+ *   spidersan bot remove <name>
+ *   spidersan bot repos
+ */
+import { Command } from 'commander';
+import { execFileSync } from 'child_process';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+// ── Config ──────────────────────────────────────────────────────────────────
+const CONFIG_DIR = join(homedir(), '.spidersan');
+const CONFIG_FILE = join(CONFIG_DIR, 'bot.json');
+const HWM_FILE = join(CONFIG_DIR, 'bot_hwm');
+const AGENT_NAME = 'spidersan';
+const SMALLTOAK_URL = (process.env.SMALLTOAK_SERVER_URL || '').replace(/\/+$/, '');
+const SMALLTOAK_TOKEN = process.env.SMALLTOAK_TOKEN || '';
+const POLL_INTERVAL = 15_000;
+const SYNC_INTERVAL = 90_000;
+const RATE_LIMIT = 10_000; // ms per repo
+const VALID_COMMANDS = new Set(['sync', 'pull', 'push', 'status', 'conflicts', 'log']);
+const BRANCH_RE = /^[\w/.-]{1,200}$/;
+// Minimal env for git subprocesses — excludes bot secrets (SMALLTOAK_TOKEN etc.)
+function gitEnv() {
+    const env = { GIT_TERMINAL_PROMPT: '0' };
+    for (const k of ['HOME', 'PATH', 'GIT_SSH_COMMAND', 'SSH_AUTH_SOCK',
+        'GIT_AUTHOR_NAME', 'GIT_AUTHOR_EMAIL',
+        'GIT_COMMITTER_NAME', 'GIT_COMMITTER_EMAIL']) {
+        if (process.env[k] !== undefined)
+            env[k] = process.env[k];
+    }
+    return env;
+}
+// Env for spidersan subprocesses — full env minus bot-specific secrets
+function spidersanEnv() {
+    const { SMALLTOAK_TOKEN: _t, SMALLTOAK_SERVER_URL: _u, GIT_BOT_ENABLED: _e, ...rest } = process.env;
+    return rest;
+}
+// ── Tiers ───────────────────────────────────────────────────────────────────
+const TIERS = {
+    coordinator: {
+        agents: ['birdsan', 'bsan', 'treebird', 'trbr'],
+        commands: ['sync', 'pull', 'push', 'status', 'conflicts', 'log'],
+    },
+    specialist: {
+        agents: ['spidersan', 'ssan', 'sherlock', 'srlk', 'watsan', 'wsan',
+            'treesan', 'tsan', 'mycsan', 'mycs'],
+        commands: ['sync', 'pull', 'push', 'status', 'conflicts', 'log'],
+    },
+    worker: {
+        agents: ['nemosan', 'nemo', 'codex', 'codx', 'goose', 'goos'],
+        commands: ['status', 'log'],
+    },
+};
+function getTier(sender) {
+    for (const [tier, cfg] of Object.entries(TIERS)) {
+        if (cfg.agents.includes(sender))
+            return tier;
+    }
+    return null;
+}
+function isAuthorized(sender, command) {
+    const tier = getTier(sender);
+    if (!tier)
+        return false;
+    return TIERS[tier].commands.includes(command);
+}
+function loadBotConfig() {
+    if (existsSync(CONFIG_FILE)) {
+        try {
+            return JSON.parse(readFileSync(CONFIG_FILE, 'utf-8'));
+        }
+        catch { /* fall through */ }
+    }
+    return { repos: {}, pollInterval: 15, syncInterval: 90, rateLimit: 10 };
+}
+function saveBotConfig(cfg) {
+    if (!existsSync(CONFIG_DIR))
+        mkdirSync(CONFIG_DIR, { recursive: true });
+    writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2), 'utf-8');
+}
+// ── Command parser ──────────────────────────────────────────────────────────
+function parseCommand(text, repos) {
+    if (!text || !text.startsWith('/'))
+        return null;
+    const parts = text.trim().split(/\s+/);
+    if (parts.length < 2)
+        return null;
+    const cmd = parts[0].slice(1);
+    const repo = parts[1];
+    const args = parts.slice(2);
+    if (!VALID_COMMANDS.has(cmd))
+        return null;
+    if (!(repo in repos))
+        return null;
+    for (const arg of args) {
+        if (arg.includes(".."))
+            return null;
+        if (!BRANCH_RE.test(arg))
+            return null;
+    }
+    return { cmd, repo, args };
+}
+// ── Smalltoak transport ─────────────────────────────────────────────────────
+async function stRead(to, last) {
+    if (!SMALLTOAK_URL)
+        return [];
+    const params = new URLSearchParams();
+    if (to)
+        params.set('to', to);
+    if (last)
+        params.set('last', String(last));
+    const qs = params.toString() ? `?${params}` : '';
+    const headers = {};
+    if (SMALLTOAK_TOKEN)
+        headers['Authorization'] = `Bearer ${SMALLTOAK_TOKEN}`;
+    try {
+        const resp = await fetch(`${SMALLTOAK_URL}/messages${qs}`, { headers });
+        if (!resp.ok)
+            return [];
+        return await resp.json();
+    }
+    catch {
+        return [];
+    }
+}
+async function stPost(text, to, replyTo) {
+    if (!SMALLTOAK_URL)
+        return;
+    const headers = { 'Content-Type': 'application/json' };
+    if (SMALLTOAK_TOKEN)
+        headers['Authorization'] = `Bearer ${SMALLTOAK_TOKEN}`;
+    try {
+        await fetch(`${SMALLTOAK_URL}/messages`, {
+            method: 'POST',
+            headers,
+            body: JSON.stringify({
+                text, from: AGENT_NAME, to,
+                reply_to: replyTo,
+            }),
+        });
+    }
+    catch (e) {
+        console.warn('[bot] stPost failed:', e);
+    }
+}
+// ── High-water mark ─────────────────────────────────────────────────────────
+function loadHwm() {
+    try {
+        return parseInt(readFileSync(HWM_FILE, 'utf-8').trim(), 10) || 0;
+    }
+    catch {
+        return 0;
+    }
+}
+function saveHwm(id) {
+    if (!existsSync(CONFIG_DIR))
+        mkdirSync(CONFIG_DIR, { recursive: true });
+    writeFileSync(HWM_FILE, String(id), 'utf-8');
+}
+// ── Git executors ───────────────────────────────────────────────────────────
+function executePull(cfg, branch) {
+    try {
+        const b = branch || cfg.branch;
+        const r = execFileSync('git', ['pull', '--ff-only', 'origin', b], { cwd: cfg.path, encoding: 'utf-8', timeout: 60_000, env: gitEnv() });
+        return r.trim().substring(0, 500);
+    }
+    catch (err) {
+        return err.message;
+    }
+}
+function executePush(cfg) {
+    registerFiles(cfg);
+    const conflict = checkConflictsBefore(cfg);
+    if (conflict)
+        return conflict;
+    try {
+        for (const filePattern of cfg.autoPush) {
+            execFileSync('git', ['add', filePattern], { cwd: cfg.path, encoding: 'utf-8', env: gitEnv() });
+        }
+        try {
+            execFileSync('git', ['diff', '--cached', '--quiet'], { cwd: cfg.path, encoding: 'utf-8', env: gitEnv() });
+            return 'No changes to push';
+        }
+        catch { /* has staged changes */ }
+        execFileSync('git', ['commit', '-m', 'spidersan bot auto-push'], { cwd: cfg.path, encoding: 'utf-8', env: gitEnv() });
+        const r = execFileSync('git', ['push'], { cwd: cfg.path, encoding: 'utf-8', timeout: 60_000, env: gitEnv() });
+        return r.trim().substring(0, 500) || 'Pushed';
+    }
+    catch (err) {
+        return err.message;
+    }
+}
+function registerFiles(cfg) {
+    try {
+        execFileSync('spidersan', ['register',
+            '--agent', 'spidersan-bot',
+            '--files', cfg.autoPush.join(','),
+        ], { cwd: cfg.path, encoding: 'utf-8', timeout: 10_000, env: spidersanEnv() });
+    }
+    catch { /* best effort */ }
+}
+function checkConflictsBefore(cfg) {
+    try {
+        const result = execFileSync('spidersan', ['conflicts', '--json'], { cwd: cfg.path, encoding: 'utf-8', timeout: 10_000, env: spidersanEnv() });
+        const data = JSON.parse(result);
+        const blocking = (data.conflicts || []).filter((c) => c.tier >= 2 || c.tier === 'BLOCK' || c.tier === 'PAUSE');
+        if (blocking.length > 0) {
+            const labels = blocking.map((c) => `${c.tierInfo?.label || 'T' + c.tier}: ${(c.files || [c.branch]).join(', ')}`);
+            return `BLOCKED: ${blocking.length} conflict(s) (tier 2+) — ${labels.join('; ')}`;
+        }
+    }
+    catch { /* spidersan not available or no conflicts */ }
+    return null;
+}
+function executeSync(cfg) {
+    registerFiles(cfg);
+    const conflict = checkConflictsBefore(cfg);
+    if (conflict)
+        return conflict;
+    const pull = executePull(cfg);
+    const push = executePush(cfg);
+    return `Pull: ${pull}\nPush: ${push}`;
+}
+function executeStatus(cfg) {
+    try {
+        const status = execFileSync('git', ['status', '--porcelain'], { cwd: cfg.path, encoding: 'utf-8', env: gitEnv() });
+        const branch = execFileSync('git', ['branch', '--show-current'], { cwd: cfg.path, encoding: 'utf-8', env: gitEnv() });
+        return `${status.trim()}\nBranch: ${branch.trim()}`.substring(0, 500);
+    }
+    catch (err) {
+        return err.message;
+    }
+}
+function executeLog(cfg, n = 10) {
+    try {
+        const limitedN = Math.min(n, 50);
+        const r = execFileSync('git', ['log', '--oneline', `-${limitedN}`], { cwd: cfg.path, encoding: 'utf-8', env: gitEnv() });
+        return r.trim().substring(0, 500);
+    }
+    catch (err) {
+        return err.message;
+    }
+}
+function executeConflicts(cfg) {
+    try {
+        const r = execFileSync('spidersan', ['conflicts'], { cwd: cfg.path, encoding: 'utf-8', timeout: 60_000, env: spidersanEnv() });
+        return r.trim().substring(0, 500);
+    }
+    catch (err) {
+        if (err.code === 'ENOENT')
+            return 'spidersan command not found';
+        return err.message;
+    }
+}
+// ── Rate limiter ────────────────────────────────────────────────────────────
+const lastAction = {};
+function rateCheck(repo) {
+    const now = Date.now();
+    const last = lastAction[repo] || 0;
+    if (now - last < RATE_LIMIT)
+        return false;
+    lastAction[repo] = now;
+    return true;
+}
+// ── Command ─────────────────────────────────────────────────────────────────
+export const botCommand = new Command('bot')
+    .description('Message-driven git operations daemon via smalltoak')
+    .option('--once', 'Single poll+sync cycle then exit')
+    .action(async (opts) => {
+    if (process.env.GIT_BOT_ENABLED !== 'true') {
+        console.error('Error: GIT_BOT_ENABLED not set. Run via: envoak vault inject --key ... -- spidersan bot');
+        process.exit(1);
+    }
+    const config = loadBotConfig();
+    if (Object.keys(config.repos).length === 0) {
+        console.error('No repos configured. Use: spidersan bot add <name> --path <path> --branch <branch> --push <files>');
+        process.exit(1);
+    }
+    console.log(`[bot] started — ${Object.keys(config.repos).length} repos, poll=${POLL_INTERVAL / 1000}s, sync=${SYNC_INTERVAL / 1000}s`);
+    // Register all configured repos/branches with spidersan for conflict detection
+    for (const [name, cfg] of Object.entries(config.repos)) {
+        try {
+            execFileSync('spidersan', ['register',
+                '--agent', 'spidersan-bot',
+                '--files', cfg.autoPush.join(','),
+                '--description', `git-bot auto-sync: ${name} (${cfg.branch})`
+            ], { cwd: cfg.path, encoding: 'utf-8', timeout: 10_000, env: spidersanEnv() });
+            console.log(`[bot] registered ${name} (${cfg.branch}) — files: ${cfg.autoPush.join(', ')}`);
+        }
+        catch (err) {
+            console.log(`[bot] register ${name} skipped: ${err.message.split('\n')[0]}`);
+        }
+    }
+    const executors = {
+        sync: (cfg) => executeSync(cfg),
+        pull: (cfg, args) => executePull(cfg, args[0]),
+        push: (cfg) => executePush(cfg),
+        status: (cfg) => executeStatus(cfg),
+        log: (cfg, args) => executeLog(cfg, args[0] ? parseInt(args[0]) : 10),
+        conflicts: (cfg) => executeConflicts(cfg),
+    };
+    async function processMessage(msg) {
+        const sender = msg.from || 'unknown';
+        const parsed = parseCommand(msg.text || '', config.repos);
+        if (!parsed)
+            return;
+        const { cmd, repo, args } = parsed;
+        if (!isAuthorized(sender, cmd)) {
+            const tier = getTier(sender) || 'unknown';
+            await stPost(`DENIED: /${cmd} requires specialist or coordinator tier. Your tier: ${tier}.`, sender, msg.id);
+            return;
+        }
+        if (!rateCheck(repo)) {
+            await stPost(`RATE LIMITED: wait ${RATE_LIMIT / 1000}s between actions on ${repo}.`, sender, msg.id);
+            return;
+        }
+        const ts = new Date().toLocaleTimeString('en-US', { hour12: false });
+        console.log(`[${ts}] ${sender} → /${cmd} ${repo} ${args.join(' ')}`.trim());
+        try {
+            const result = executors[cmd](config.repos[repo], args);
+            await stPost(`/${cmd} ${repo}: ${result.substring(0, 500)}`, sender, msg.id);
+        }
+        catch (err) {
+            await stPost(`/${cmd} ${repo}: Error: ${err.message}`, sender, msg.id);
+        }
+    }
+    let hwm = loadHwm();
+    let lastSync = 0;
+    const cycle = async () => {
+        const now = Date.now();
+        // Periodic auto-sync
+        if (now - lastSync >= SYNC_INTERVAL) {
+            for (const [name, cfg] of Object.entries(config.repos)) {
+                try {
+                    const result = executeSync(cfg);
+                    const ts = new Date().toLocaleTimeString('en-US', { hour12: false });
+                    console.log(`[${ts}] auto-sync ${name}: ${result.substring(0, 100)}`);
+                }
+                catch (err) {
+                    console.log(`[auto-sync] ${name} failed: ${err.message}`);
+                }
+            }
+            lastSync = now;
+        }
+        // Poll for commands
+        try {
+            const msgs = await stRead(AGENT_NAME, 50);
+            const newMsgs = msgs.filter((m) => (m.id || 0) > hwm).sort((a, b) => a.id - b.id);
+            for (const msg of newMsgs) {
+                await processMessage(msg);
+                hwm = msg.id;
+                saveHwm(hwm);
+            }
+        }
+        catch (err) {
+            console.log(`[poll] error: ${err.message}`);
+        }
+    };
+    // Run once or loop
+    await cycle();
+    if (opts.once)
+        return;
+    setInterval(cycle, POLL_INTERVAL);
+    // Keep process alive
+    await new Promise(() => { });
+});
+// Sub-commands: add, remove, repos
+botCommand
+    .command('add <name>')
+    .description('Add a repo to the bot watchlist')
+    .requiredOption('--path <path>', 'Absolute path to repo')
+    .requiredOption('--branch <branch>', 'Branch to track')
+    .option('--push <files>', 'Comma-separated auto-push file patterns')
+    .action((name, opts) => {
+    const config = loadBotConfig();
+    config.repos[name] = {
+        path: opts.path,
+        branch: opts.branch,
+        autoPush: opts.push ? opts.push.split(',') : [],
+    };
+    saveBotConfig(config);
+    console.log(`Added repo: ${name}`);
+});
+botCommand
+    .command('remove <name>')
+    .description('Remove a repo from the bot watchlist')
+    .action((name) => {
+    const config = loadBotConfig();
+    delete config.repos[name];
+    saveBotConfig(config);
+    console.log(`Removed repo: ${name}`);
+});
+botCommand
+    .command('repos')
+    .description('List configured repos')
+    .action(() => {
+    const config = loadBotConfig();
+    const repos = Object.entries(config.repos);
+    if (repos.length === 0) {
+        console.log('No repos configured.');
+        return;
+    }
+    for (const [name, cfg] of repos) {
+        console.log(`  ${name}: ${cfg.path} (${cfg.branch}) push=[${cfg.autoPush.join(', ')}]`);
+    }
+});
+//# sourceMappingURL=bot.js.map

package/dist/commands/bot.js.map

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

package/dist/commands/conflicts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/commands/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqWpC,eAAO,MAAM,gBAAgB,SAgUvB,CAAC"}
+{"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/commands/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiSpC,eAAO,MAAM,gBAAgB,SAuVvB,CAAC"}

package/dist/commands/conflicts.js

@@ -19,67 +19,9 @@ import { isExcludedPath } from './register.js';
 import { loadConfig } from '../lib/config.js';
 import { logActivity } from '../lib/activity.js';
 import { isGhAvailable, getPRDetails } from '../lib/github.js';
+import { classifyWithLabel } from '../lib/conflict-tier.js';
 // Config
 const HUB_URL = process.env.HUB_URL || 'https://hub.treebird.uk';
-// Critical files that trigger TIER 3 blocking
-const TIER_3_PATTERNS = [
-    /\.env$/,
-    /secrets?\./i,
-    /credentials/i,
-    /password/i,
-    /api[_-]?key/i,
-    /private[_-]?key/i,
-    /\.pem$/,
-    /auth\.(ts|js)$/,
-    /security\.(ts|js)$/,
-];
-// Important files that trigger TIER 2 pause
-const TIER_2_PATTERNS = [
-    /package\.json$/,
-    /package-lock\.json$/,
-    /tsconfig\.json$/,
-    /CLAUDE\.md$/,
-    /\.gitignore$/,
-    /server\.(ts|js)$/,
-    /index\.(ts|js)$/,
-    /config\.(ts|js)$/,
-];
-// Optimization: Pre-compile static patterns
-const COMPILED_TIER_3 = compilePatterns(TIER_3_PATTERNS);
-const COMPILED_TIER_2 = compilePatterns(TIER_2_PATTERNS);
-function getConflictTier(file, compiledHigh = [], compiledMedium = []) {
-    // Check TIER 3 first (most critical)
-    const tier3 = [...COMPILED_TIER_3, ...compiledHigh];
-    for (const pattern of tier3) {
-        if (pattern.test(file)) {
-            return {
-                tier: 3,
-                label: 'BLOCK',
-                icon: '🔴',
-                action: 'Merge blocked. Resolve conflict first.'
-            };
-        }
-    }
-    // Check TIER 2 
-    const tier2 = [...COMPILED_TIER_2, ...compiledMedium];
-    for (const pattern of tier2) {
-        if (pattern.test(file)) {
-            return {
-                tier: 2,
-                label: 'PAUSE',
-                icon: '🟠',
-                action: 'Coordinate with other agent before proceeding.'
-            };
-        }
-    }
-    // Default: TIER 1
-    return {
-        tier: 1,
-        label: 'WARN',
-        icon: '🟡',
-        action: 'Consider coordinating, but safe to proceed.'
-    };
-}
 function getCurrentBranch() {
     try {
         return execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { encoding: 'utf-8' }).trim();
@@ -89,11 +31,19 @@ function getCurrentBranch() {
     }
 }
 async function notifyHub(branch, conflicts) {
-    const tier3 = conflicts.filter(c => c.tier === 3);
-    const tier2 = conflicts.filter(c => c.tier === 2);
-    if (tier3.length === 0 && tier2.length === 0)
+    let hasTier3 = false;
+    let hasTier2 = false;
+    for (const c of conflicts) {
+        if (c.tier === 3)
+            hasTier3 = true;
+        else if (c.tier === 2)
+            hasTier2 = true;
+        if (hasTier3 && hasTier2)
+            break;
+    }
+    if (!hasTier3 && !hasTier2)
         return;
-    const severity = tier3.length > 0 ? '🔴 TIER 3 BLOCK' : '🟠 TIER 2 PAUSE';
+    const severity = hasTier3 ? '🔴 TIER 3 BLOCK' : '🟠 TIER 2 PAUSE';
     const message = `🕷️⚠️ **Conflict Alert** on \`${branch}\`\n\n${severity}\n\nConflicting files require coordination.`;
     try {
         await fetch(`${HUB_URL}/api/chat`, {
@@ -114,9 +64,7 @@ async function notifyHub(branch, conflicts) {
 /**
  * Wake a conflicting agent and send them a message about what to fix
  */
-async function wakeConflictingAgent(agentId, myBranch, theirBranch, conflictingFiles) {
-    const fileList = conflictingFiles.slice(0, 5).join(', ');
-    const more = conflictingFiles.length > 5 ? ` (+${conflictingFiles.length - 5} more)` : '';
+async function wakeConflictingAgent(agentId, myBranch, theirBranch, _conflictingFiles) {
     // 1. Wake the agent via Hub
     try {
         const wakeResponse = await fetch(`${HUB_URL}/api/wake/${agentId}`, {
@@ -389,12 +337,23 @@ export const conflictsCommand = new Command('conflicts')
     for (const branch of allBranches) {
         if (branch.name === targetBranch || branch.status !== 'active')
             continue;
-        const overlappingFiles = branch.files.filter(f => !isExcludedPath(f) && targetFilesSet.has(f));
+        // Performance Optimization: Replace .filter() with a standard loop to avoid array allocation.
+        // Short-circuit using O(1) Set lookup (targetFilesSet.has) before calling the expensive isExcludedPath.
+        const overlappingFiles = [];
+        for (let i = 0; i < branch.files.length; i++) {
+            const f = branch.files[i];
+            if (targetFilesSet.has(f) && !isExcludedPath(f)) {
+                overlappingFiles.push(f);
+            }
+        }
         if (overlappingFiles.length > 0) {
             // Get highest tier for this conflict
             let maxTier = { tier: 1, label: 'WARN', icon: '🟡', action: '' };
             for (const file of overlappingFiles) {
-                const fileTier = getConflictTier(file, compiledHigh, compiledMedium);
+                const fileTier = classifyWithLabel(file, {
+                    extraTier3: compiledHigh,
+                    extraTier2: compiledMedium,
+                });
                 if (fileTier.tier > maxTier.tier) {
                     maxTier = fileTier;
                 }
@@ -435,22 +394,31 @@ export const conflictsCommand = new Command('conflicts')
     }
     // Sort by tier (highest first)
     conflicts.sort((a, b) => b.tier - a.tier);
+    let tier3Count = 0;
+    let tier2Count = 0;
+    let tier1Count = 0;
+    for (const c of conflicts) {
+        if (c.tier === 3)
+            tier3Count++;
+        else if (c.tier === 2)
+            tier2Count++;
+        else if (c.tier === 1)
+            tier1Count++;
+    }
     // Log conflict detection to activity log
     if (conflicts.length > 0) {
         logActivity({
             event: 'conflict_detected',
             branch: targetBranch,
             details: {
-                tier3: conflicts.filter(c => c.tier === 3).length,
-                tier2: conflicts.filter(c => c.tier === 2).length,
-                tier1: conflicts.filter(c => c.tier === 1).length,
+                tier3: tier3Count,
+                tier2: tier2Count,
+                tier1: tier1Count,
                 conflicting_branches: conflicts.map(c => c.branch),
             }
         });
     }
     // Check for blocking conditions
-    const tier3Count = conflicts.filter(c => c.tier === 3).length;
-    const tier2Count = conflicts.filter(c => c.tier === 2).length;
     const shouldBlock = options.strict && (tier3Count > 0 || tier2Count > 0);
     // Notify Hub if requested
     if (options.notify && (tier3Count > 0 || tier2Count > 0)) {
@@ -463,7 +431,7 @@ export const conflictsCommand = new Command('conflicts')
             summary: {
                 tier3: tier3Count,
                 tier2: tier2Count,
-                tier1: conflicts.filter(c => c.tier === 1).length,
+                tier1: tier1Count,
                 blocked: shouldBlock
             }
         }, null, 2));
@@ -483,14 +451,17 @@ export const conflictsCommand = new Command('conflicts')
     for (const conflict of conflicts) {
         console.log(`${conflict.tierInfo.icon} TIER ${conflict.tier} (${conflict.tierInfo.label}): ${conflict.branch}`);
         for (const file of conflict.files) {
-            const fileTier = getConflictTier(file, compiledHigh, compiledMedium);
+            const fileTier = classifyWithLabel(file, {
+                extraTier3: compiledHigh,
+                extraTier2: compiledMedium,
+            });
             console.log(`   ${fileTier.icon} ${file}`);
         }
         console.log(`   → ${conflict.tierInfo.action}`);
         console.log('');
     }
     console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-    console.log(`📊 Summary: 🔴 ${tier3Count} BLOCK | 🟠 ${tier2Count} PAUSE | 🟡 ${conflicts.filter(c => c.tier === 1).length} WARN`);
+    console.log(`📊 Summary: 🔴 ${tier3Count} BLOCK | 🟠 ${tier2Count} PAUSE | 🟡 ${tier1Count} WARN`);
     // Offer add/add resolution suggestions for likely add/add files
     suggestAddAddResolution(conflicts);
     // Show semantic analysis results
@@ -567,10 +538,11 @@ export const conflictsCommand = new Command('conflicts')
                         console.log('\n🔄 RE-CHECKING CONFLICTS...\n');
                         const { execFileSync } = await import('child_process');
                         try {
+                            const { getCLIPath } = await import('../lib/security.js');
                             // Security: Use execFileSync with argument array
                             const safeBranch = validateBranchName(targetBranch);
                             const tierArg = String(parseInt(options.tier, 10) || 1);
-                            execFileSync('node', [process.argv[1], 'conflicts', '--branch', safeBranch, '--tier', tierArg], {
+                            execFileSync(process.execPath, [getCLIPath(), 'conflicts', '--branch', safeBranch, '--tier', tierArg], {
                                 encoding: 'utf-8',
                                 stdio: 'inherit'
                             });