clawdbot 30f607e03a Implement :conflicts selector for read_file tool ...

- Add real git merge conflict extraction matching GJC behavior
- Extract unresolved conflict blocks (<<<<<<, =======, >>>>>>>)
- Support 3-way conflicts with diff3 markers (|||||||)
- Format conflicts as indexed summary with line ranges and labels
- Return clear 'No unresolved git merge conflicts' when clean
- Add comprehensive behavior tests for 2-way, 3-way, and no-conflicts cases
- Update documentation to mark :conflicts as implemented
- Closes #3323

Tests:
- read_with_selector_conflicts_no_conflicts: verifies clean file message
- read_with_selector_conflicts_two_way: verifies multiple conflict detection
- read_with_selector_conflicts_three_way: verifies diff3 marker support

2026-10-12 23:57:50 +00:00

..

gjc-compat

Implement :conflicts selector for read_file tool

2026-10-12 23:57:50 +00:00

anti-slop-triage.md

omx(team): auto-checkpoint worker-3 [6]

2026-05-15 11:41:03 +09:00

container.md

Document a repeatable container workflow for the Rust workspace

2026-04-05 18:11:25 +00:00

g002-security-verification-map.md

Document G002 security verification ownership for integration

2026-05-14 17:29:33 +09:00

g003-boot-session-verification-map.md

Map G003 boot session verification

2026-05-14 17:50:30 +09:00

g004-events-reports-contract.md

omx(team): auto-checkpoint worker-4 [unknown]

2026-05-14 17:58:49 +09:00

g004-events-reports-verification-map.md

map g004 event report verification lanes

2026-05-14 18:14:24 +09:00

g005-branch-recovery-verification-map.md

map branch recovery verification evidence

2026-05-14 18:40:16 +09:00

g006-task-policy-board-verification-map.md

Make G006 task policy state machine executable

2026-05-15 09:29:26 +09:00

g007-mcp-lifecycle-mapping.md

map MCP lifecycle maturity surfaces

2026-05-15 10:14:05 +09:00

g007-plugin-mcp-verification-map.md

omx(team): auto-checkpoint worker-2 [2]

2026-05-15 09:55:43 +09:00

g009-windows-docs-release-verification-map.md

Preserve Windows checksum verification after docs merge

2026-05-15 10:56:47 +09:00

g010-clone-disambiguation-metadata.md

omx(team): auto-checkpoint worker-2 [5]

2026-05-15 11:03:40 +09:00

g010-session-hygiene-verification-map.md

omx(team): auto-checkpoint worker-1 [1]

2026-05-15 11:08:59 +09:00

g011-acp-json-rpc-status-contract.md

omx(team): auto-checkpoint worker-1 [1]

2026-05-15 11:40:54 +09:00

g011-ecosystem-ops-ux-verification-map.md

Keep G011 verification commands runnable

2026-05-15 11:49:12 +09:00

g012-final-release-readiness-report.md

omx(team): auto-checkpoint worker-1 [1]

2026-05-15 12:00:26 +09:00

g013-roadmap-pinpoints-693-695-verification-map.md

Prevent pre-push contract drift (#3113)

2026-05-26 06:00:45 +08:00

local-openai-compatible-providers.md

Merge pull request #3317 from ultraworkers/lane/cc-issue-3283

2026-10-13 08:02:26 +09:00

MODEL_COMPATIBILITY.md

fix: route local OpenAI-compatible models

2026-06-03 23:16:46 +09:00

navigation-file-context.md

omx(team): auto-checkpoint worker-2 [4]

2026-05-15 11:39:06 +09:00

nix-development.md

build: add Nix flake dev shell and claw package (#3247)

2026-10-12 23:35:06 +00:00

personal-assistant-roadmap.md

docs: personal assistant roadmap

2026-05-25 11:24:55 +09:00

pr-issue-resolution-gate.md

Record PR gate evidence to avoid unsafe final merges

2026-05-15 12:34:00 +09:00

pr-triage-g012-final-gate.json

omx(team): auto-checkpoint worker-3 [unknown]

2026-05-15 12:01:32 +09:00

rag-web-ui.md

feat(rag): add claw-rag-service

2026-05-25 11:25:25 +09:00

roadmap-pr-goals.md

Make roadmap PR intake durable for CC2

2026-05-14 17:36:15 +09:00

windows-install-release.md

Preserve Windows checksum verification after docs merge

2026-05-15 10:56:47 +09:00