@iflow-mcp/jkheadley-instar 0.26.2

package/dist/core/Config.js

@@ -0,0 +1,332 @@
+/**
+ * Auto-detection and configuration management.
+ *
+ * Finds tmux, Claude CLI, and project structure automatically.
+ * Adapted from dawn-server's config.ts — the battle-tested version.
+ */
+import { execFileSync } from 'node:child_process';
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { mergeConfigWithSecrets } from './SecretMigrator.js';
+import os from 'node:os';
+const DEFAULT_PORT = 4040;
+const DEFAULT_MAX_SESSIONS = 10;
+const DEFAULT_MAX_PARALLEL_JOBS = 2;
+export function getInstarVersion() {
+    try {
+        // Walk up from this file to find package.json
+        let dir = path.dirname(new URL(import.meta.url).pathname);
+        for (let i = 0; i < 5; i++) {
+            const pkgPath = path.join(dir, 'package.json');
+            if (fs.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+                if (pkg.name === 'instar')
+                    return pkg.version;
+            }
+            dir = path.dirname(dir);
+        }
+    }
+    catch {
+        // @silent-fallback-ok — version detection defaults to 0.0.0
+    }
+    return '0.0.0';
+}
+export function detectGitPath() {
+    const candidates = [
+        '/usr/bin/git',
+        '/opt/homebrew/bin/git', // macOS ARM (Homebrew)
+        '/usr/local/bin/git', // macOS Intel / Linux
+    ];
+    for (const candidate of candidates) {
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    // Fallback: check PATH
+    try {
+        const result = execFileSync('which', ['git'], { encoding: 'utf-8', stdio: 'pipe' }).trim();
+        if (result && fs.existsSync(result))
+            return result;
+    }
+    catch {
+        // @silent-fallback-ok — git path detection
+    }
+    return null;
+}
+export function detectGhPath() {
+    const candidates = [
+        '/opt/homebrew/bin/gh', // macOS ARM (Homebrew)
+        '/usr/local/bin/gh', // macOS Intel / Linux
+        '/usr/bin/gh', // Linux system
+    ];
+    for (const candidate of candidates) {
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    // Fallback: check PATH
+    try {
+        const result = execFileSync('which', ['gh'], { encoding: 'utf-8', stdio: 'pipe' }).trim();
+        if (result && fs.existsSync(result))
+            return result;
+    }
+    catch {
+        // @silent-fallback-ok — gh path detection
+    }
+    return null;
+}
+export function detectTmuxPath() {
+    const candidates = [
+        '/opt/homebrew/bin/tmux', // macOS ARM (Homebrew)
+        '/usr/local/bin/tmux', // macOS Intel / Linux
+        '/usr/bin/tmux', // Linux system
+    ];
+    for (const candidate of candidates) {
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    // Fallback: check PATH
+    try {
+        const result = execFileSync('which', ['tmux'], { encoding: 'utf-8', stdio: 'pipe' }).trim();
+        if (result && fs.existsSync(result))
+            return result;
+    }
+    catch {
+        // @silent-fallback-ok — tmux path detection loop
+    }
+    return null;
+}
+export function detectClaudePath() {
+    const home = process.env.HOME || '';
+    const candidates = [
+        path.join(home, '.claude', 'local', 'claude'),
+        '/usr/local/bin/claude',
+        '/opt/homebrew/bin/claude',
+    ];
+    // Also check npm global bin directory (where `npm install -g` puts things)
+    try {
+        const npmPrefix = execFileSync('npm', ['config', 'get', 'prefix'], { encoding: 'utf-8', stdio: 'pipe' }).trim();
+        if (npmPrefix) {
+            candidates.push(path.join(npmPrefix, 'bin', 'claude'));
+        }
+    }
+    catch {
+        // @silent-fallback-ok — claude path detection loop
+    }
+    // Check nvm/fnm managed paths
+    if (process.env.NVM_BIN) {
+        candidates.push(path.join(process.env.NVM_BIN, 'claude'));
+    }
+    for (const candidate of candidates) {
+        if (fs.existsSync(candidate))
+            return candidate;
+    }
+    // Fallback: check PATH
+    try {
+        const result = execFileSync('which', ['claude'], { encoding: 'utf-8', stdio: 'pipe' }).trim();
+        if (result && fs.existsSync(result))
+            return result;
+    }
+    catch {
+        // @silent-fallback-ok — claude path detection loop
+    }
+    return null;
+}
+export function detectProjectDir(startDir) {
+    let dir = startDir || process.cwd();
+    // Walk up to find a directory with CLAUDE.md or .git
+    while (dir !== path.dirname(dir)) {
+        if (fs.existsSync(path.join(dir, 'CLAUDE.md')) || fs.existsSync(path.join(dir, '.git'))) {
+            return dir;
+        }
+        dir = path.dirname(dir);
+    }
+    return process.cwd();
+}
+/**
+ * Get the path to the standalone agents directory.
+ */
+export function standaloneAgentsDir() {
+    return path.join(os.homedir(), '.instar', 'agents');
+}
+/**
+ * Resolve an agent directory from a name or path.
+ *
+ * Resolution order:
+ * 1. If nameOrPath is an absolute path under ~/.instar/agents/ or cwd, use it
+ * 2. If nameOrPath matches a standalone agent name, return ~/.instar/agents/<name>/
+ * 3. If no argument, use detectProjectDir() (existing behavior)
+ */
+export function resolveAgentDir(nameOrPath) {
+    if (!nameOrPath) {
+        return detectProjectDir();
+    }
+    // Absolute path — verify it's under a known location
+    if (path.isAbsolute(nameOrPath)) {
+        const resolved = fs.realpathSync(nameOrPath);
+        const agentsDir = standaloneAgentsDir();
+        if (resolved.startsWith(agentsDir) || resolved === process.cwd() || resolved.startsWith(process.cwd())) {
+            return resolved;
+        }
+        // Allow any existing directory with .instar in it
+        if (fs.existsSync(path.join(resolved, '.instar', 'config.json'))) {
+            return resolved;
+        }
+        throw new Error(`Path "${nameOrPath}" does not appear to be a valid agent directory.`);
+    }
+    // Check if it's a standalone agent name
+    const agentDir = path.join(standaloneAgentsDir(), nameOrPath);
+    if (fs.existsSync(path.join(agentDir, '.instar', 'config.json'))) {
+        return agentDir;
+    }
+    // Check global registry for the name (dynamic import to avoid circular deps)
+    try {
+        const registryPath = path.join(os.homedir(), '.instar', 'registry.json');
+        if (fs.existsSync(registryPath)) {
+            const data = JSON.parse(fs.readFileSync(registryPath, 'utf-8'));
+            const entries = Array.isArray(data.entries) ? data.entries : [];
+            const entry = entries.find((e) => e.name === nameOrPath);
+            if (entry?.path)
+                return entry.path;
+        }
+    }
+    catch { /* registry may not exist yet */ }
+    throw new Error(`Agent "${nameOrPath}" not found. Check standalone agents at ${standaloneAgentsDir()}/ ` +
+        `or use an absolute path.`);
+}
+export function loadConfig(projectDir) {
+    const resolvedProjectDir = projectDir || detectProjectDir();
+    const configPath = path.join(resolvedProjectDir, '.instar', 'config.json');
+    const stateDir = path.join(resolvedProjectDir, '.instar');
+    // Load config file if it exists
+    let fileConfig = {};
+    if (fs.existsSync(configPath)) {
+        try {
+            fileConfig = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        }
+        catch (err) {
+            throw new Error(`Failed to parse ${configPath}: ${err instanceof Error ? err.message : err}\n` +
+                `Check that .instar/config.json contains valid JSON.`);
+        }
+    }
+    // Merge encrypted secrets into config (replaces { "secret": true } placeholders)
+    // This is transparent — single-machine users without a SecretStore see no change.
+    try {
+        fileConfig = mergeConfigWithSecrets(fileConfig, stateDir);
+    }
+    catch {
+        // Non-fatal — config works without secrets (just missing the secret values)
+    }
+    const tmuxPath = detectTmuxPath();
+    const claudePath = detectClaudePath();
+    if (!tmuxPath) {
+        throw new Error('tmux not found. Install with: brew install tmux (macOS) or apt install tmux (Linux)');
+    }
+    if (!claudePath) {
+        throw new Error('Claude CLI not found. Install from: https://docs.anthropic.com/en/docs/claude-code');
+    }
+    const projectName = fileConfig.projectName || path.basename(resolvedProjectDir);
+    const sessions = {
+        tmuxPath,
+        claudePath,
+        projectDir: resolvedProjectDir,
+        maxSessions: fileConfig.sessions?.maxSessions ?? DEFAULT_MAX_SESSIONS,
+        protectedSessions: fileConfig.sessions?.protectedSessions || [`${projectName}-server`],
+        completionPatterns: fileConfig.sessions?.completionPatterns || [
+            'has been automatically paused',
+            'Session ended',
+            'Interrupted by user',
+        ],
+        authToken: fileConfig.authToken,
+        port: fileConfig.port ?? 4040,
+    };
+    const scheduler = {
+        jobsFile: fileConfig.scheduler?.jobsFile || path.join(stateDir, 'jobs.json'),
+        enabled: fileConfig.scheduler?.enabled ?? false,
+        maxParallelJobs: fileConfig.scheduler?.maxParallelJobs ?? DEFAULT_MAX_PARALLEL_JOBS,
+        quotaThresholds: fileConfig.scheduler?.quotaThresholds || {
+            normal: 75,
+            elevated: 85,
+            critical: 92,
+            shutdown: 95,
+        },
+    };
+    // Auto-generate contextSigningKey if not present (persists to config file)
+    let contextSigningKey = fileConfig.contextSigningKey;
+    if (!contextSigningKey && fs.existsSync(configPath)) {
+        contextSigningKey = crypto.randomBytes(32).toString('hex');
+        try {
+            const raw = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+            raw.contextSigningKey = contextSigningKey;
+            fs.writeFileSync(configPath, JSON.stringify(raw, null, 2) + '\n');
+        }
+        catch {
+            // Non-fatal — integrity verification will be skipped if key can't be persisted
+            contextSigningKey = undefined;
+        }
+    }
+    const host = fileConfig.host || '127.0.0.1';
+    // Warn if binding to a non-loopback address without auth token
+    if (host !== '127.0.0.1' && host !== 'localhost' && host !== '::1' && !fileConfig.authToken) {
+        console.warn(`[Config] WARNING: Server binding to ${host} without authToken configured. ` +
+            `This exposes the API without authentication. Set authToken in .instar/config.json.`);
+    }
+    return {
+        projectName,
+        projectDir: resolvedProjectDir,
+        stateDir,
+        port: fileConfig.port || DEFAULT_PORT,
+        host,
+        version: getInstarVersion(),
+        sessions,
+        scheduler,
+        users: fileConfig.users || [],
+        messaging: fileConfig.messaging || [],
+        monitoring: {
+            quotaTracking: true,
+            memoryMonitoring: true,
+            healthCheckIntervalMs: 30000,
+            ...fileConfig.monitoring,
+            // Telemetry defaults: strictly opt-in
+            telemetry: fileConfig.monitoring?.telemetry ?? { enabled: false },
+        },
+        authToken: fileConfig.authToken,
+        dashboardPin: fileConfig.dashboardPin,
+        relationships: fileConfig.relationships || {
+            relationshipsDir: path.join(stateDir, 'relationships'),
+            maxRecentInteractions: 20,
+        },
+        feedback: {
+            enabled: true,
+            webhookUrl: 'https://dawn.bot-me.ai/api/instar/feedback',
+            feedbackFile: path.join(stateDir, 'feedback.json'),
+            ...fileConfig.feedback,
+        },
+        dispatches: fileConfig.dispatches,
+        updates: fileConfig.updates,
+        publishing: fileConfig.publishing,
+        tunnel: fileConfig.tunnel,
+        threadline: fileConfig.threadline,
+        agentType: resolvedProjectDir.startsWith(standaloneAgentsDir())
+            ? 'standalone'
+            : fileConfig.agentType || 'project-bound',
+        contextSigningKey,
+    };
+}
+/**
+ * Ensure the state directory structure exists.
+ */
+export function ensureStateDir(stateDir) {
+    const dirs = [
+        stateDir,
+        path.join(stateDir, 'state'),
+        path.join(stateDir, 'state', 'sessions'),
+        path.join(stateDir, 'state', 'jobs'),
+        path.join(stateDir, 'relationships'),
+        path.join(stateDir, 'views'),
+        path.join(stateDir, 'logs'),
+    ];
+    for (const dir of dirs) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+}
+//# sourceMappingURL=Config.js.map

package/dist/core/Config.js.map

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

package/dist/core/ConflictNegotiator.d.ts

@@ -0,0 +1,167 @@
+/**
+ * ConflictNegotiator — Pre-merge conflict negotiation between agents.
+ *
+ * Before committing to a merge strategy, agents can negotiate:
+ *   1. Propose a resolution strategy ("I'll take the left side of file X")
+ *   2. Counter-propose ("Actually, my changes to lines 10-50 are more recent")
+ *   3. Accept or reject proposals
+ *   4. Escalate to human if negotiation fails
+ *
+ * The negotiation protocol has a round limit to prevent deadlocks.
+ * If no agreement is reached within the limit, it falls back to
+ * the tiered conflict resolution system (LLMConflictResolver).
+ *
+ * From INTELLIGENT_SYNC_SPEC Section 7.4 and Phase 7 (Live Conflict Negotiation).
+ */
+import type { AgentBus } from './AgentBus.js';
+export type NegotiationStatus = 'pending' | 'in-progress' | 'agreed' | 'rejected' | 'timed-out' | 'escalated';
+export type ResolutionStrategy = 'take-ours' | 'take-theirs' | 'merge-by-section' | 'merge-by-line-range' | 'llm-resolve' | 'human-resolve';
+export interface NegotiationProposal {
+    /** Unique negotiation ID. */
+    negotiationId: string;
+    /** File path in conflict. */
+    filePath: string;
+    /** Proposed resolution strategy. */
+    strategy: ResolutionStrategy;
+    /** Proposed file sections (for section-based strategies). */
+    sections?: SectionClaim[];
+    /** Free-text reasoning for the proposal. */
+    reasoning: string;
+    /** Current round number. */
+    round: number;
+    /** Session ID of the proposer. */
+    sessionId?: string;
+}
+export interface SectionClaim {
+    /** Who claims this section. */
+    claimedBy: 'proposer' | 'responder';
+    /** Start line (1-indexed, inclusive). */
+    startLine: number;
+    /** End line (1-indexed, inclusive). */
+    endLine: number;
+    /** Brief description of what this section does. */
+    description: string;
+}
+export interface NegotiationResponse {
+    /** Negotiation ID being responded to. */
+    negotiationId: string;
+    /** Response decision. */
+    decision: 'accept' | 'reject' | 'counter';
+    /** Counter-proposal (only if decision is 'counter'). */
+    counterProposal?: Omit<NegotiationProposal, 'negotiationId' | 'round'>;
+    /** Reason for the decision. */
+    reason: string;
+}
+export interface NegotiationSession {
+    /** Unique negotiation ID. */
+    id: string;
+    /** File in conflict. */
+    filePath: string;
+    /** Machine that initiated the negotiation. */
+    initiator: string;
+    /** Machine being negotiated with. */
+    responder: string;
+    /** Current status. */
+    status: NegotiationStatus;
+    /** All proposals exchanged. */
+    proposals: NegotiationProposal[];
+    /** All responses exchanged. */
+    responses: NegotiationResponse[];
+    /** Current round. */
+    currentRound: number;
+    /** Maximum rounds before escalation. */
+    maxRounds: number;
+    /** When the negotiation started. */
+    startedAt: string;
+    /** When the negotiation ended. */
+    endedAt?: string;
+    /** Final agreed strategy (if agreed). */
+    agreedStrategy?: ResolutionStrategy;
+    /** Final section claims (if section-based). */
+    agreedSections?: SectionClaim[];
+}
+export interface NegotiationResult {
+    /** The negotiation ID. */
+    negotiationId: string;
+    /** Final status. */
+    status: NegotiationStatus;
+    /** Agreed strategy (if any). */
+    strategy?: ResolutionStrategy;
+    /** Agreed sections (if section-based). */
+    sections?: SectionClaim[];
+    /** Total rounds used. */
+    rounds: number;
+    /** Time elapsed in ms. */
+    elapsedMs: number;
+    /** Whether to fall back to LLM resolution. */
+    fallbackToLLM: boolean;
+}
+export interface ConflictNegotiatorConfig {
+    /** The AgentBus instance. */
+    bus: AgentBus;
+    /** This machine's ID. */
+    machineId: string;
+    /** Maximum negotiation rounds (default: 3). */
+    maxRounds?: number;
+    /** Timeout per round in ms (default: 30s). */
+    roundTimeoutMs?: number;
+    /** Total negotiation timeout in ms (default: 120s). */
+    totalTimeoutMs?: number;
+    /** Callback to evaluate an incoming proposal. */
+    onProposalReceived?: (proposal: NegotiationProposal, from: string) => NegotiationResponse;
+}
+export declare class ConflictNegotiator {
+    private bus;
+    private machineId;
+    private maxRounds;
+    private roundTimeoutMs;
+    private totalTimeoutMs;
+    private sessions;
+    private onProposalReceived?;
+    constructor(config: ConflictNegotiatorConfig);
+    /**
+     * Start a negotiation with another machine about a conflicted file.
+     * Returns the negotiation result when complete or timed out.
+     */
+    negotiate(opts: {
+        targetMachineId: string;
+        filePath: string;
+        strategy: ResolutionStrategy;
+        sections?: SectionClaim[];
+        reasoning: string;
+        sessionId?: string;
+    }): Promise<NegotiationResult>;
+    /**
+     * Get a negotiation session by ID.
+     */
+    getSession(negotiationId: string): NegotiationSession | undefined;
+    /**
+     * Get all active negotiations.
+     */
+    getActiveNegotiations(): NegotiationSession[];
+    /**
+     * Get all negotiations for a specific file.
+     */
+    getNegotiationsForFile(filePath: string): NegotiationSession[];
+    /**
+     * Get all completed negotiations.
+     */
+    getCompletedNegotiations(): NegotiationSession[];
+    /**
+     * Get negotiation statistics.
+     */
+    getStats(): {
+        total: number;
+        agreed: number;
+        rejected: number;
+        timedOut: number;
+        escalated: number;
+        inProgress: number;
+        averageRounds: number;
+    };
+    private negotiationLoop;
+    private sendProposalAndWait;
+    private registerHandlers;
+    private buildResult;
+}
+//# sourceMappingURL=ConflictNegotiator.d.ts.map

package/dist/core/ConflictNegotiator.d.ts.map

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