gsxdsm 5993264e25 feat(KB-023): add smart automatic merge conflict resolution ...

- Add conflict classification API: classifyConflict(), getConflictedFiles(), resolveWithOurs(), resolveWithTheirs(), resolveTrivialWhitespace()

- Auto-resolve lock files (ours), generated files (theirs), and trivial whitespace conflicts

- Add smartConflictResolution setting (alias for autoResolveConflicts)

- Track resolution path via resolutionMethod and autoResolvedCount in MergeResult

- Implement 3-attempt retry logic with escalating strategies in aiMergeTask

- Export pattern constants LOCKFILE_PATTERNS and GENERATED_PATTERNS

2026-03-29 18:46:57 -07:00

..

agent-logger.test.ts

feat(KB-123): add agent role tracking and expanded logging to agent system

2026-03-27 01:19:42 -04:00

agent-logger.ts

feat(KB-123): add agent role tracking and expanded logging to agent system

2026-03-27 01:19:42 -04:00

concurrency.test.ts

feat(KB-138): add priority-based scheduling to AgentSemaphore

2026-03-28 16:30:23 -04:00

concurrency.ts

feat(KB-138): add priority-based scheduling to AgentSemaphore

2026-03-28 16:30:23 -04:00

executor.test.ts

feat(KB-003): add task steering feature with UI and prompt injection

2026-03-29 17:40:42 -07:00

executor.ts

feat(KB-003): add task steering feature with UI and prompt injection

2026-03-29 17:40:42 -07:00

github.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

index.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

logger.test.ts

feat(HAI-113): add structured logger and replace console calls

2026-03-26 22:44:11 -04:00

logger.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

merger.test.ts

feat(KB-023): add smart automatic merge conflict resolution

2026-03-29 18:46:57 -07:00

merger.ts

feat(KB-023): add smart automatic merge conflict resolution

2026-03-29 18:46:57 -07:00

pi.ts

feat(KB-123): add agent role tracking and expanded logging to agent system

2026-03-27 01:19:42 -04:00

pr-comment-handler.test.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

pr-comment-handler.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

pr-monitor.test.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

pr-monitor.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

restart.integration.test.ts

feat(KB-010): add autoResolveConflicts setting with intelligent merge conflict resolution

2026-03-29 18:27:23 -07:00

reviewer.test.ts

feat(KB-172): add spec review loop to triage agent

2026-03-28 16:30:23 -04:00

reviewer.ts

feat(KB-172): add spec review loop to triage agent

2026-03-28 16:30:23 -04:00

scheduler.test.ts

feat(KB-157): add soft-pause (enginePaused) alongside hard-stop (globalPause)

2026-03-28 16:30:23 -04:00

scheduler.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

triage.test.ts

feat(KB-014): add spec editing and AI revision to dashboard

2026-03-29 18:42:41 -07:00

triage.ts

feat(KB-014): add spec editing and AI revision to dashboard

2026-03-29 18:42:41 -07:00

usage-limit-detector.test.ts

fix(KB-153): detect exhausted-retry errors from pi-coding-agent sessions

2026-03-28 16:30:23 -04:00

usage-limit-detector.ts

fix(KB-153): detect exhausted-retry errors from pi-coding-agent sessions

2026-03-28 16:30:23 -04:00

worktree-names.test.ts

refactor(HAI-116): rename kb to hai across all packages, CLI, and docs

2026-03-26 22:44:11 -04:00

worktree-names.ts

feat(HAI-052): deduplicate worktree name word lists and add uniqueness tests

2026-03-25 23:34:13 -04:00

worktree-pool.test.ts

feat(KB-154): persist worktree pool across engine restarts

2026-03-28 16:30:23 -04:00

worktree-pool.ts

feat(KB-154): persist worktree pool across engine restarts

2026-03-28 16:30:23 -04:00