Nick PismenkovandClaude Haiku 4.5 b50eddfe0a Merge branch 'main' into fix/resolve-conflicts ...

Resolved merge conflicts in 5 files:

1. src/agent/job_monitor.rs - Used is_internal flag approach (HEAD) for safe internal message marking. Removed metadata-based approach which could be spoofed by external channels.

2. src/agent/agent_loop.rs - Used is_internal check (HEAD) for routing internal messages, consistent with security model where is_internal field cannot be spoofed.

3. src/agent/dispatcher.rs - Included notify_metadata in job context (main), needed for job routing through JobMonitorRoute.

4. src/setup/wizard.rs - Added build_nearai_model_fetch_config() function (main) for model selection during setup.

5. src/tools/builtin/job.rs - Used both comments from HEAD (clarifying notify_channel and notify_user logic) while removing metadata field from JobMonitorRoute (consistent with job_monitor.rs).

All conflicts resolved with security-first approach: use is_internal boolean field for internal message marking (cannot be spoofed), while passing routing metadata through context.

Co-Authored-By: Claude Haiku 4.5 <[email protected]>

2026-03-16 14:47:07 -07:00

..

agent_loop.rs

Refactor owner scope across channels and fix default routing fallback (#1151)

2026-03-16 13:31:03 -07:00

agentic_loop.rs

feat(web): add follow-up suggestion chips and ghost text (#1156)

2026-03-14 18:57:24 +00:00

attachments.rs

feat: WASM channel attachments with LLM pipeline integration (#596)

2026-03-07 18:01:40 +00:00

CLAUDE.md

merge: resolve conflicts for PR #800 and #822 into staging (#881)

2026-03-10 11:19:23 -07:00

commands.rs

Refactor owner scope across channels and fix default routing fallback (#1151)

2026-03-16 13:31:03 -07:00

compaction.rs

Revert "Feat/docker shell edition" + fix fmt/clippy (#886)

2026-03-10 11:57:50 -07:00

context_monitor.rs

Load tools at launch

2026-02-03 00:48:22 -08:00

cost_guard.rs

fix: prevent Instant duration overflow on Windows (#657) (#664)

2026-03-07 20:00:40 +00:00

dispatcher.rs

Merge branch 'main' into fix/resolve-conflicts

2026-03-16 14:47:07 -07:00

heartbeat.rs

Refactor owner scope across channels and fix default routing fallback (#1151)

2026-03-16 13:31:03 -07:00

job_monitor.rs

fix(security): prevent metadata spoofing of internal job monitor flag (#1195)

2026-03-15 21:33:04 +00:00

mod.rs

style(agent): remove unnecessary Worker re-export (#923)

2026-03-12 11:29:02 -07:00

router.rs

Replace hardcoded intent patterns with job tools

2026-02-04 22:09:52 -08:00

routine_engine.rs

Refactor owner scope across channels and fix default routing fallback (#1151)

2026-03-16 13:31:03 -07:00

routine.rs

Refactor owner scope across channels and fix default routing fallback (#1151)

2026-03-16 13:31:03 -07:00

scheduler.rs

Fix schema-guided tool parameter coercion (#1143)

2026-03-14 16:27:18 -07:00

self_repair.rs

fix: agent logging (#888)

2026-03-10 13:55:06 -07:00

session_manager.rs

Add automated QA: schema validator, CI matrix, Docker build, and P1 test coverage (#353)

2026-02-27 09:09:45 +04:00

session.rs

fix(mcp): handle 400 auth errors, clear auth mode after OAuth, trim tokens (#1158)

2026-03-15 05:42:49 +00:00

submission.rs

feat: restart (#531)

2026-03-05 17:12:49 -08:00

task.rs

fix: persist turns after approval and add agent-level tests (#250)

2026-02-20 02:28:15 +00:00

thread_ops.rs

Refactor owner scope across channels and fix default routing fallback (#1151)

2026-03-16 13:31:03 -07:00

undo.rs

fix: persist turns after approval and add agent-level tests (#250)

2026-02-20 02:28:15 +00:00