adam/open-swe
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/open-swe.git synced 2026-10-01 23:13:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
open-swe/docs/upstream-sync/domain-reorg/merge-tree-now.txt
Adam Moussa 373d888426
docs: land reorg in ledger, fix path refs, ship plan artifacts (C7) 
C7 of the domain-reorg adoption (build plan docs/upstream-sync/domain-reorg/
reorg-build-plan.md, step C7):

- CLAUDE.md / AGENTS.md: retarget architecture path references to the new
  layout — graph entrypoints via agent.graphs.* shims, the agent/api/ +
  agent/webhooks/*_routes.py FastAPI split (webapp.py now a shim),
  agent/review/ package, tests/<domain>/ test paths, and the new-graph/
  test conventions. README.md already pointed at docs/ (C1) — no change.
- triage.jsonl: flip 8356eb34 (#1726) to landed on branch
  refactor/domain-reorg-adoption; add re-triage notes to the 8 unblocked
  rows (#1732/#1761/#1744/#1748/#1742 clean, #1736/#1758/#1760 near-clean).
  triage.md regenerated via make triage-render.
- Ship the plan, scoping report, move-map artifacts, and the
  domain-reorg-adoption workflow so the exercise is reproducible.

Memory + Confluence handled out-of-band (not in this commit): project
memory updated with the new module layout; Confluence check found no IT
page documents the repo module map — no Confluence change required.
2026-07-17 15:01:45 -04:00

435 lines
23 KiB
Text
Raw Permalink Blame History

2e93de8920fab3ba052901838106fa250708e1f0
.github/workflows/ci.yml
.github/workflows/promote_main_to_prod.yml
.github/workflows/reviewer-eval.yml
AGENTS.md
CLAUDE.md
Dockerfile
Makefile
README.md
agent/analyzer.py
agent/chat.py
agent/ci_autofix.py
agent/completion.py
agent/dashboard/__init__.py
agent/dashboard/eval_jobs.py
agent/dashboard/options.py
agent/dashboard/plan_api.py
agent/dashboard/review_api.py
agent/dashboard/review_chat_api.py
agent/dashboard/schedules.py
agent/dashboard/team_settings.py
agent/dashboard/thread_api.py
agent/dashboard/workflow_approval.py
agent/dashboard/workflow_approval_api.py
agent/dispatch.py
agent/middleware/__init__.py
agent/middleware/ensure_no_empty_msg.py
agent/middleware/model_fallback.py
agent/middleware/pr_creation_guard.py
agent/middleware/sanitize_fireworks_messages.py
agent/middleware/subdir_agents.py
agent/middleware/timeout_wrapup.py
agent/middleware/workflow_push_guard.py
agent/prompt.py
agent/review/findings.py
agent/reviewer.py
agent/server.py
agent/tools/__init__.py
agent/tools/add_finding.py
agent/tools/fetch_url.py
agent/tools/http_request.py
agent/tools/open_pull_request.py
agent/tools/publish_review.py
agent/tools/request_pr_review.py
agent/tools/slack_start_new_thread.py
agent/tools/slack_thread_reply.py
agent/tools/update_finding.py
agent/tools/web_search.py
agent/utils/analyzer_skills.py
agent/utils/auth.py
agent/utils/deferred_model.py
agent/utils/gateway.py
agent/utils/github_app.py
agent/utils/github_proxy.py
agent/utils/github_token.py
agent/utils/model.py
agent/utils/multimodal.py
agent/utils/sandbox.py
agent/utils/sandbox_state.py
agent/utils/slack.py
agent/utils/url_safety.py
agent/webapp.py
agent/webhooks/github.py
agent/webhooks/linear.py
agent/webhooks/slack.py
docs/INSTALLATION.md
evals/reviewer/config.toml
evals/reviewer/judge.py
evals/reviewer/run_eval.py
evals/reviewer/target.py
pyproject.toml
tests/auth/test_auth_sources.py
tests/auth/test_github_token_ttl.py
tests/conftest.py
tests/dashboard/test_dashboard_thread_api.py
tests/dashboard/test_dashboard_web_handoff.py
tests/dashboard/test_team_settings_grouping.py
tests/dashboard/test_team_settings_org_guidelines.py
tests/e2e/fake_llm.py
tests/e2e/harness.py
tests/e2e/tests/dashboard.spec.ts
tests/e2e/tests/full_flow.spec.ts
tests/github/test_github_comment_prompts.py
tests/github/test_github_issue_webhook.py
tests/github/test_open_pull_request.py
tests/middleware/test_model_fallback_middleware.py
tests/middleware/test_sanitize_thinking_blocks.py
tests/models/test_agent_subagent_models.py
tests/models/test_google_model.py
tests/reviewer/test_pr_ready_auto_review.py
tests/reviewer/test_reviewer.py
tests/reviewer/test_reviewer_findings.py
tests/reviewer/test_reviewer_publish.py
tests/reviewer/test_reviewer_tools.py
tests/reviewer/test_reviewer_watch.py
tests/sandbox/test_local_integration.py
tests/sandbox/test_proxy_auth.py
tests/slack/test_slack_context.py
tests/slack/test_slack_thread_reply_tool.py
tests/test_autofix_webhook.py
tests/test_ci_autofix.py
tests/test_http_security.py
tests/test_model_fallback_resolution.py
tests/test_plan_review.py
ui/AGENTS.md
ui/bun.lock
ui/package.json
ui/src/client.tsx
ui/src/components/agents/PlanReview.tsx
ui/src/features/agents/components/AgentGitPanel.tsx
ui/src/features/agents/components/AgentThreadView.tsx
ui/src/features/agents/components/AgentsSidebar.tsx
ui/src/features/agents/components/PrHeader.tsx
ui/src/features/agents/components/SidebarFilterMenu.tsx
ui/src/features/agents/components/WorkflowApprovalCard.tsx
ui/src/features/agents/components/messages/AgentMessage.tsx
ui/src/features/agents/components/messages/MessageTimestamp.tsx
ui/src/features/agents/components/messages/UserMessage.tsx
ui/src/features/agents/components/messages/types.ts
ui/src/features/agents/lib/api.ts
ui/src/features/agents/lib/messageTimestamps.ts
ui/src/features/agents/lib/queries.ts
ui/src/features/agents/lib/sidebarFilter.test.ts
ui/src/features/agents/lib/sidebarFilter.ts
ui/src/features/agents/lib/sidebarPrefs.ts
ui/src/features/agents/lib/streamMessagesToUi.ts
ui/src/features/agents/lib/types.ts
ui/src/features/reviews/components/ReviewMainBody.tsx
ui/src/lib/agents/provider/useSubmitAgentMessage.ts
ui/src/lib/auth-redirect-core.ts
ui/src/lib/auth-redirect.test.ts
ui/src/routes/admin.tsx
ui/src/routes/agents.tsx
ui/src/routes/agents/$threadId_.plan.tsx
ui/vercel.json
ui/vite.config.ts
uv.lock
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
CONFLICT (modify/delete): .github/workflows/promote_main_to_prod.yml deleted in HEAD and modified in upstream/main. Version upstream/main of .github/workflows/promote_main_to_prod.yml left in tree.
Auto-merging .github/workflows/reviewer-eval.yml
CONFLICT (content): Merge conflict in .github/workflows/reviewer-eval.yml
Auto-merging .gitignore
Auto-merging AGENTS.md
CONFLICT (content): Merge conflict in AGENTS.md
Auto-merging CLAUDE.md
CONFLICT (content): Merge conflict in CLAUDE.md
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging agent/analyzer.py
CONFLICT (content): Merge conflict in agent/analyzer.py
Auto-merging agent/chat.py
CONFLICT (content): Merge conflict in agent/chat.py
CONFLICT (modify/delete): agent/ci_autofix.py deleted in upstream/main and modified in HEAD. Version HEAD of agent/ci_autofix.py left in tree.
Auto-merging agent/completion.py
CONFLICT (add/add): Merge conflict in agent/completion.py
Auto-merging agent/dashboard/__init__.py
CONFLICT (content): Merge conflict in agent/dashboard/__init__.py
Auto-merging agent/dashboard/eval_jobs.py
CONFLICT (content): Merge conflict in agent/dashboard/eval_jobs.py
Auto-merging agent/dashboard/options.py
CONFLICT (content): Merge conflict in agent/dashboard/options.py
Auto-merging agent/dashboard/plan_api.py
CONFLICT (content): Merge conflict in agent/dashboard/plan_api.py
Auto-merging agent/dashboard/review_api.py
CONFLICT (content): Merge conflict in agent/dashboard/review_api.py
Auto-merging agent/dashboard/review_chat_api.py
CONFLICT (content): Merge conflict in agent/dashboard/review_chat_api.py
Auto-merging agent/dashboard/routes.py
Auto-merging agent/dashboard/schedules.py
CONFLICT (content): Merge conflict in agent/dashboard/schedules.py
Auto-merging agent/dashboard/team_settings.py
CONFLICT (content): Merge conflict in agent/dashboard/team_settings.py
Auto-merging agent/dashboard/thread_api.py
CONFLICT (content): Merge conflict in agent/dashboard/thread_api.py
Auto-merging agent/dashboard/workflow_approval.py
CONFLICT (add/add): Merge conflict in agent/dashboard/workflow_approval.py
Auto-merging agent/dashboard/workflow_approval_api.py
CONFLICT (add/add): Merge conflict in agent/dashboard/workflow_approval_api.py
Auto-merging agent/dispatch.py
CONFLICT (add/add): Merge conflict in agent/dispatch.py
Auto-merging agent/middleware/__init__.py
CONFLICT (content): Merge conflict in agent/middleware/__init__.py
Auto-merging agent/middleware/check_message_queue.py
Auto-merging agent/middleware/ensure_no_empty_msg.py
CONFLICT (add/add): Merge conflict in agent/middleware/ensure_no_empty_msg.py
Auto-merging agent/middleware/model_fallback.py
CONFLICT (content): Merge conflict in agent/middleware/model_fallback.py
Auto-merging agent/middleware/plan_mode.py
Auto-merging agent/middleware/pr_creation_guard.py
CONFLICT (add/add): Merge conflict in agent/middleware/pr_creation_guard.py
Auto-merging agent/middleware/refresh_slack_status.py
Auto-merging agent/middleware/sanitize_fireworks_messages.py
CONFLICT (add/add): Merge conflict in agent/middleware/sanitize_fireworks_messages.py
Auto-merging agent/middleware/sanitize_thinking_blocks.py
Auto-merging agent/middleware/subdir_agents.py
CONFLICT (add/add): Merge conflict in agent/middleware/subdir_agents.py
Auto-merging agent/middleware/timeout_wrapup.py
CONFLICT (add/add): Merge conflict in agent/middleware/timeout_wrapup.py
Auto-merging agent/middleware/workflow_push_guard.py
CONFLICT (add/add): Merge conflict in agent/middleware/workflow_push_guard.py
Auto-merging agent/prompt.py
CONFLICT (content): Merge conflict in agent/prompt.py
Auto-merging agent/review/findings.py
CONFLICT (content): Merge conflict in agent/review/findings.py
Auto-merging agent/review/publish.py
Auto-merging agent/review/reconcile.py
Auto-merging agent/reviewer.py
CONFLICT (content): Merge conflict in agent/reviewer.py
Auto-merging agent/server.py
CONFLICT (content): Merge conflict in agent/server.py
Auto-merging agent/tools/__init__.py
CONFLICT (content): Merge conflict in agent/tools/__init__.py
Auto-merging agent/tools/add_finding.py
CONFLICT (content): Merge conflict in agent/tools/add_finding.py
Auto-merging agent/tools/fetch_url.py
CONFLICT (content): Merge conflict in agent/tools/fetch_url.py
Auto-merging agent/tools/http_request.py
CONFLICT (content): Merge conflict in agent/tools/http_request.py
Auto-merging agent/tools/list_findings.py
Auto-merging agent/tools/list_review_findings.py
Auto-merging agent/tools/open_pull_request.py
CONFLICT (content): Merge conflict in agent/tools/open_pull_request.py
Auto-merging agent/tools/publish_review.py
CONFLICT (content): Merge conflict in agent/tools/publish_review.py
Auto-merging agent/tools/reply_to_finding_thread.py
Auto-merging agent/tools/request_pr_review.py
CONFLICT (content): Merge conflict in agent/tools/request_pr_review.py
Auto-merging agent/tools/resolve_finding_thread.py
Auto-merging agent/tools/schedule_thread_wakeup.py
Auto-merging agent/tools/slack_read_thread_messages.py
Auto-merging agent/tools/slack_start_new_thread.py
CONFLICT (add/add): Merge conflict in agent/tools/slack_start_new_thread.py
Auto-merging agent/tools/slack_thread_reply.py
CONFLICT (content): Merge conflict in agent/tools/slack_thread_reply.py
Auto-merging agent/tools/update_finding.py
CONFLICT (content): Merge conflict in agent/tools/update_finding.py
Auto-merging agent/tools/web_search.py
CONFLICT (content): Merge conflict in agent/tools/web_search.py
Auto-merging agent/utils/analyzer_skills.py
CONFLICT (content): Merge conflict in agent/utils/analyzer_skills.py
Auto-merging agent/utils/auth.py
CONFLICT (content): Merge conflict in agent/utils/auth.py
Auto-merging agent/utils/deferred_model.py
CONFLICT (add/add): Merge conflict in agent/utils/deferred_model.py
Auto-merging agent/utils/gateway.py
CONFLICT (add/add): Merge conflict in agent/utils/gateway.py
Auto-merging agent/utils/github_app.py
CONFLICT (content): Merge conflict in agent/utils/github_app.py
Auto-merging agent/utils/github_comments.py
Auto-merging agent/utils/github_org_membership.py
Auto-merging agent/utils/github_proxy.py
CONFLICT (content): Merge conflict in agent/utils/github_proxy.py
Auto-merging agent/utils/github_token.py
CONFLICT (content): Merge conflict in agent/utils/github_token.py
Auto-merging agent/utils/linear.py
Auto-merging agent/utils/model.py
CONFLICT (content): Merge conflict in agent/utils/model.py
Auto-merging agent/utils/multimodal.py
CONFLICT (content): Merge conflict in agent/utils/multimodal.py
Auto-merging agent/utils/sandbox.py
CONFLICT (content): Merge conflict in agent/utils/sandbox.py
Auto-merging agent/utils/sandbox_state.py
CONFLICT (content): Merge conflict in agent/utils/sandbox_state.py
Auto-merging agent/utils/slack.py
CONFLICT (content): Merge conflict in agent/utils/slack.py
Auto-merging agent/utils/url_safety.py
CONFLICT (add/add): Merge conflict in agent/utils/url_safety.py
Auto-merging agent/webapp.py
CONFLICT (content): Merge conflict in agent/webapp.py
Auto-merging agent/webhooks/github.py
CONFLICT (add/add): Merge conflict in agent/webhooks/github.py
Auto-merging agent/webhooks/linear.py
CONFLICT (add/add): Merge conflict in agent/webhooks/linear.py
Auto-merging agent/webhooks/slack.py
CONFLICT (add/add): Merge conflict in agent/webhooks/slack.py
Auto-merging docs/CUSTOMIZATION.md
Auto-merging docs/INSTALLATION.md
CONFLICT (content): Merge conflict in docs/INSTALLATION.md
Auto-merging evals/reviewer/README.md
Auto-merging evals/reviewer/config.toml
CONFLICT (content): Merge conflict in evals/reviewer/config.toml
Auto-merging evals/reviewer/judge.py
CONFLICT (content): Merge conflict in evals/reviewer/judge.py
Auto-merging evals/reviewer/run_eval.py
CONFLICT (content): Merge conflict in evals/reviewer/run_eval.py
Auto-merging evals/reviewer/target.py
CONFLICT (content): Merge conflict in evals/reviewer/target.py
Auto-merging pyproject.toml
CONFLICT (content): Merge conflict in pyproject.toml
Auto-merging tests/agent/test_agent_schedules.py
Auto-merging tests/agent/test_plan_mode.py
Auto-merging tests/auth/test_auth_sources.py
CONFLICT (content): Merge conflict in tests/auth/test_auth_sources.py
Auto-merging tests/auth/test_github_token_ttl.py
CONFLICT (content): Merge conflict in tests/auth/test_github_token_ttl.py
Auto-merging tests/conftest.py
CONFLICT (content): Merge conflict in tests/conftest.py
Auto-merging tests/dashboard/test_dashboard_thread_api.py
CONFLICT (content): Merge conflict in tests/dashboard/test_dashboard_thread_api.py
Auto-merging tests/dashboard/test_dashboard_web_handoff.py
CONFLICT (content): Merge conflict in tests/dashboard/test_dashboard_web_handoff.py
Auto-merging tests/dashboard/test_team_settings_grouping.py
CONFLICT (content): Merge conflict in tests/dashboard/test_team_settings_grouping.py
Auto-merging tests/dashboard/test_team_settings_org_guidelines.py
CONFLICT (content): Merge conflict in tests/dashboard/test_team_settings_org_guidelines.py
Auto-merging tests/e2e/fake_llm.py
CONFLICT (content): Merge conflict in tests/e2e/fake_llm.py
Auto-merging tests/e2e/harness.py
CONFLICT (content): Merge conflict in tests/e2e/harness.py
Auto-merging tests/e2e/patches.py
Auto-merging tests/e2e/tests/dashboard.spec.ts
CONFLICT (content): Merge conflict in tests/e2e/tests/dashboard.spec.ts
Auto-merging tests/e2e/tests/full_flow.spec.ts
CONFLICT (content): Merge conflict in tests/e2e/tests/full_flow.spec.ts
Auto-merging tests/e2e/tests/plan_review.spec.ts
Auto-merging tests/github/test_github_app.py
Auto-merging tests/github/test_github_comment_prompts.py
CONFLICT (content): Merge conflict in tests/github/test_github_comment_prompts.py
Auto-merging tests/github/test_github_issue_webhook.py
CONFLICT (content): Merge conflict in tests/github/test_github_issue_webhook.py
Auto-merging tests/github/test_github_proxy_refresh.py
Auto-merging tests/github/test_open_pull_request.py
CONFLICT (content): Merge conflict in tests/github/test_open_pull_request.py
Auto-merging tests/middleware/test_model_fallback_middleware.py
CONFLICT (content): Merge conflict in tests/middleware/test_model_fallback_middleware.py
Auto-merging tests/middleware/test_sanitize_thinking_blocks.py
CONFLICT (content): Merge conflict in tests/middleware/test_sanitize_thinking_blocks.py
Auto-merging tests/models/test_agent_subagent_models.py
CONFLICT (content): Merge conflict in tests/models/test_agent_subagent_models.py
Auto-merging tests/models/test_fireworks_model.py
CONFLICT (rename/delete): tests/test_google_model.py renamed to tests/models/test_google_model.py in upstream/main, but deleted in HEAD.
CONFLICT (modify/delete): tests/models/test_google_model.py deleted in HEAD and modified in upstream/main. Version upstream/main of tests/models/test_google_model.py left in tree.
Auto-merging tests/reviewer/test_pr_ready_auto_review.py
CONFLICT (content): Merge conflict in tests/reviewer/test_pr_ready_auto_review.py
Auto-merging tests/reviewer/test_review_chat.py
Auto-merging tests/reviewer/test_reviewer.py
CONFLICT (content): Merge conflict in tests/reviewer/test_reviewer.py
Auto-merging tests/reviewer/test_reviewer_eval_target.py
Auto-merging tests/reviewer/test_reviewer_findings.py
CONFLICT (content): Merge conflict in tests/reviewer/test_reviewer_findings.py
Auto-merging tests/reviewer/test_reviewer_publish.py
CONFLICT (content): Merge conflict in tests/reviewer/test_reviewer_publish.py
Auto-merging tests/reviewer/test_reviewer_reconcile.py
Auto-merging tests/reviewer/test_reviewer_tools.py
CONFLICT (content): Merge conflict in tests/reviewer/test_reviewer_tools.py
Auto-merging tests/reviewer/test_reviewer_watch.py
CONFLICT (content): Merge conflict in tests/reviewer/test_reviewer_watch.py
Auto-merging tests/sandbox/test_local_integration.py
CONFLICT (content): Merge conflict in tests/sandbox/test_local_integration.py
Auto-merging tests/sandbox/test_proxy_auth.py
CONFLICT (content): Merge conflict in tests/sandbox/test_proxy_auth.py
Auto-merging tests/slack/test_slack_assistants_status.py
Auto-merging tests/slack/test_slack_context.py
CONFLICT (content): Merge conflict in tests/slack/test_slack_context.py
Auto-merging tests/slack/test_slack_thread_reply_tool.py
CONFLICT (content): Merge conflict in tests/slack/test_slack_thread_reply_tool.py
CONFLICT (modify/delete): tests/test_autofix_webhook.py deleted in upstream/main and modified in HEAD. Version HEAD of tests/test_autofix_webhook.py left in tree.
CONFLICT (modify/delete): tests/test_ci_autofix.py deleted in upstream/main and modified in HEAD. Version HEAD of tests/test_ci_autofix.py left in tree.
CONFLICT (modify/delete): tests/test_http_security.py deleted in upstream/main and modified in HEAD. Version HEAD of tests/test_http_security.py left in tree.
CONFLICT (modify/delete): tests/test_model_fallback_resolution.py deleted in upstream/main and modified in HEAD. Version HEAD of tests/test_model_fallback_resolution.py left in tree.
CONFLICT (modify/delete): tests/test_plan_review.py deleted in upstream/main and modified in HEAD. Version HEAD of tests/test_plan_review.py left in tree.
Auto-merging tests/tools/test_corridor_mcp.py
Auto-merging ui/AGENTS.md
CONFLICT (add/add): Merge conflict in ui/AGENTS.md
CONFLICT (modify/delete): ui/bun.lock deleted in upstream/main and modified in HEAD. Version HEAD of ui/bun.lock left in tree.
Auto-merging ui/package.json
CONFLICT (content): Merge conflict in ui/package.json
Auto-merging ui/src/client.tsx
CONFLICT (content): Merge conflict in ui/src/client.tsx
CONFLICT (modify/delete): ui/src/components/agents/PlanReview.tsx deleted in upstream/main and modified in HEAD. Version HEAD of ui/src/components/agents/PlanReview.tsx left in tree.
Auto-merging ui/src/features/agents/components/AgentGitPanel.tsx
CONFLICT (content): Merge conflict in ui/src/features/agents/components/AgentGitPanel.tsx
Auto-merging ui/src/features/agents/components/AgentThreadView.tsx
CONFLICT (content): Merge conflict in ui/src/features/agents/components/AgentThreadView.tsx
Auto-merging ui/src/features/agents/components/AgentsSidebar.tsx
CONFLICT (content): Merge conflict in ui/src/features/agents/components/AgentsSidebar.tsx
CONFLICT (file location): ui/src/components/agents/PrHeader.tsx added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/components/PrHeader.tsx.
CONFLICT (file location): ui/src/components/agents/SidebarFilterMenu.tsx added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/components/SidebarFilterMenu.tsx.
Auto-merging ui/src/features/agents/components/SidebarFilterMenu.tsx
CONFLICT (add/add): Merge conflict in ui/src/features/agents/components/SidebarFilterMenu.tsx
CONFLICT (file location): ui/src/components/agents/WorkflowApprovalCard.tsx added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/components/WorkflowApprovalCard.tsx.
Auto-merging ui/src/features/agents/components/WorkflowApprovalCard.tsx
CONFLICT (add/add): Merge conflict in ui/src/features/agents/components/WorkflowApprovalCard.tsx
Auto-merging ui/src/features/agents/components/messages/AgentMessage.tsx
CONFLICT (content): Merge conflict in ui/src/features/agents/components/messages/AgentMessage.tsx
CONFLICT (file location): ui/src/components/agents/messages/MessageTimestamp.tsx added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/components/messages/MessageTimestamp.tsx.
Auto-merging ui/src/features/agents/components/messages/Messages.tsx
Auto-merging ui/src/features/agents/components/messages/UserMessage.tsx
CONFLICT (content): Merge conflict in ui/src/features/agents/components/messages/UserMessage.tsx
Auto-merging ui/src/features/agents/components/messages/types.ts
CONFLICT (content): Merge conflict in ui/src/features/agents/components/messages/types.ts
Auto-merging ui/src/features/agents/lib/api.ts
CONFLICT (content): Merge conflict in ui/src/features/agents/lib/api.ts
CONFLICT (file location): ui/src/lib/agents/messageTimestamps.ts added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/lib/messageTimestamps.ts.
Auto-merging ui/src/features/agents/lib/queries.ts
CONFLICT (content): Merge conflict in ui/src/features/agents/lib/queries.ts
CONFLICT (file location): ui/src/lib/agents/sidebarFilter.test.ts added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/lib/sidebarFilter.test.ts.
CONFLICT (file location): ui/src/lib/agents/sidebarFilter.ts added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/lib/sidebarFilter.ts.
CONFLICT (file location): ui/src/lib/agents/sidebarPrefs.ts added in HEAD inside a directory that was renamed in upstream/main, suggesting it should perhaps be moved to ui/src/features/agents/lib/sidebarPrefs.ts.
Auto-merging ui/src/features/agents/lib/sidebarPrefs.ts
CONFLICT (add/add): Merge conflict in ui/src/features/agents/lib/sidebarPrefs.ts
Auto-merging ui/src/features/agents/lib/streamMessagesToUi.ts
CONFLICT (content): Merge conflict in ui/src/features/agents/lib/streamMessagesToUi.ts
Auto-merging ui/src/features/agents/lib/types.ts
CONFLICT (content): Merge conflict in ui/src/features/agents/lib/types.ts
Auto-merging ui/src/features/automations/components/AutomationEditor.tsx
Auto-merging ui/src/features/reviews/components/ReviewMainBody.tsx
CONFLICT (content): Merge conflict in ui/src/features/reviews/components/ReviewMainBody.tsx
Auto-merging ui/src/features/reviews/components/ReviewSidebar.tsx
CONFLICT (modify/delete): ui/src/lib/agents/provider/useSubmitAgentMessage.ts deleted in upstream/main and modified in HEAD. Version HEAD of ui/src/lib/agents/provider/useSubmitAgentMessage.ts left in tree.
Auto-merging ui/src/lib/api.ts
Auto-merging ui/src/lib/auth-redirect-core.ts
CONFLICT (add/add): Merge conflict in ui/src/lib/auth-redirect-core.ts
Auto-merging ui/src/lib/auth-redirect.test.ts
CONFLICT (add/add): Merge conflict in ui/src/lib/auth-redirect.test.ts
Auto-merging ui/src/routes/admin.tsx
CONFLICT (content): Merge conflict in ui/src/routes/admin.tsx
Auto-merging ui/src/routes/agents.tsx
CONFLICT (content): Merge conflict in ui/src/routes/agents.tsx
Auto-merging ui/src/routes/agents/$threadId_.plan.tsx
CONFLICT (content): Merge conflict in ui/src/routes/agents/$threadId_.plan.tsx
Auto-merging ui/src/routes/agents/reviews/$owner.$repo.$number.tsx
Auto-merging ui/src/routes/cloud-agents.tsx
Auto-merging ui/vercel.json
CONFLICT (content): Merge conflict in ui/vercel.json
Auto-merging ui/vite.config.ts
CONFLICT (content): Merge conflict in ui/vite.config.ts
Auto-merging uv.lock
CONFLICT (content): Merge conflict in uv.lock
Reference in a new issue View git blame Copy permalink