Skip to content

feat(classic): preserve action history across task continuations - #12673

Merged
ntindle merged 13 commits into
devfrom
feat/keep-task-context
Jun 25, 2026
Merged

feat(classic): preserve action history across task continuations#12673
ntindle merged 13 commits into
devfrom
feat/keep-task-context

Conversation

@ntindle

@ntindle ntindle commented Apr 3, 2026

Copy link
Copy Markdown
Member

Summary

Preserve action history across task continuations (the core change):

  • Stop clearing episode history when the user starts a new task after finish — the agent can build on prior work instead of starting from zero each task.
  • The compression system (4 recent episodes shown full, older ones summarized, 1024-token budget) already bounds the prompt, so keeping history doesn't bloat context.
  • Close the open finish episode with an ActionSuccessResult when AgentFinished left result=None, so the loop proposes a fresh action instead of replaying the stale finish proposal. (Restart the process for a fully clean slate.)

Review feedback addressed:

  • Moved ActionSuccessResult to the top-level forge.models.action import (Cursor Bugbot, majdyz).
  • Guarded register_result with if (ep := current_episode) and not ep.result so it can't raise if AgentFinished ever propagates without a prior register_action (majdyz).
  • Added an integration-style test wiring action → AgentFinishedregister_result → fresh proposal (majdyz).

Required fix — image generation migrated to gpt-image-1: OpenAI removed dall-e-2/dall-e-3 from the API on 2026-05-12 ("The model 'dall-e-2' does not exist"), so the classic image-generation command — and test_dalle — was fully broken. Migrating the OpenAI image provider to gpt-image-1 is required for image generation to function at all: a dalle_model config default, 1024×1024 square output, model= passed to images.generate, dropping the now-rejected response_format, and reading the image from the base64 (or URL) response.

Test plan

  • poetry run pytest forge/tests/test_action_history_cursor.py -v — 8 tests pass (cursor safety, history retention across tasks, finish→continuation flow)
  • CI: classic Forge / AutoGPT test suites green, including the live gpt-image-1 test_dalle
  • Manual: run agent, complete a task, enter a new one — agent should reference prior work

🤖 Generated with Claude Code


Note

Medium Risk
Changes agent loop behavior and prompt context after task continuation, which can affect planning quality; image API migration is localized but touches live external calls in tests.

Overview
Task continuation no longer wipes episodic history when the user starts a follow-up after finish; prior episodes stay in context (compression still caps prompt size). On that path, main.py now closes the open finish episode with an ActionSuccessResult when AgentFinished left result=None, so the loop proposes a new action instead of reusing the stale finish proposal, with a guard so register_result only runs when there is an open episode.

OpenAI image generation is updated for removed DALL·E models: default gpt-image-1, 1024×1024 square sizing, model= on images.generate, no response_format, and decoding from base64 or URL. Tests cover cursor safety, retained history, finish→continuation flow, and a fixed test_dalle at 1024.

Adds a one-line backend README heading.

Reviewed by Cursor Bugbot for commit bcf50f8. Bugbot is set up for automated code reviews on this repo. Configure here.

Stop clearing episodes when the user enters a new task after finishing.
The compression system (4 recent episodes full, older ones summarized,
1024 token budget) already handles context overflow. Keeping history
lets the agent build on prior work instead of starting from zero.

Restart the process for a clean slate.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@ntindle
ntindle requested a review from a team as a code owner April 3, 2026 17:42
@ntindle
ntindle requested review from Bentlybro and majdyz and removed request for a team April 3, 2026 17:42
@github-project-automation github-project-automation Bot moved this to 🆕 Needs initial review in AutoGPT development kanban Apr 3, 2026
@coderabbitai

coderabbitai Bot commented Apr 3, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

Event history handling during task transitions was changed to preserve event episodes (registering an ActionSuccessResult) instead of clearing episodes and resetting the cursor; tests were reorganized to validate cursor semantics and history persistence across task switches.

Changes

Cohort / File(s) Summary
Event History Preservation
classic/original_autogpt/autogpt/app/main.py
When handling the interactive AgentFinished (finish) continuation, register ActionSuccessResult(outputs=...) into agent.event_history and keep existing episodes/cursor instead of clearing episodes and resetting the cursor before starting the next task.
Test Reorganization
classic/forge/tests/test_action_history_cursor.py
Rewrote tests: removed explicit reproducer expecting IndexError; introduced TestEpisodicActionHistoryCursor (covers current_episode for empty history, end-of-cursor, valid-next-episode, cursor beyond list, and safety after episodes.clear()), and TestHistoryPreservedAcrossTasks (asserts history persists across task changes and new-episode selection when cursor points past completed episodes).

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Poem

I hop with a notebook, paw on each clue,
Episodes kept as I bound to what's new,
No clearing the trail, memories stay,
Guiding my hops through the next task's play,
A rabbit's delight in preserved to-do! 🐰✨

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 75.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically describes the main change: preserving action history across task continuations instead of clearing it.
Description check ✅ Passed The description matches the code changes by describing preserved task history and cursor-safe finish continuation behavior.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/keep-task-context

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added the size/m label Apr 3, 2026
Comment thread classic/original_autogpt/autogpt/app/main.py
Comment thread classic/original_autogpt/autogpt/app/main.py
@codecov

codecov Bot commented Apr 3, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 85.18519% with 8 lines in your changes missing coverage. Please review.
✅ Project coverage is 70.81%. Comparing base (e2711b1) to head (bcf50f8).
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev   #12673      +/-   ##
==========================================
- Coverage   74.71%   70.81%   -3.91%     
==========================================
  Files        2537     2477      -60     
  Lines      192315   199299    +6984     
  Branches    18925    18874      -51     
==========================================
- Hits       143697   141140    -2557     
- Misses      44493    54557   +10064     
+ Partials     4125     3602     -523     
Flag Coverage Δ
autogpt-agent 28.37% <33.33%> (-0.07%) ⬇️
forge 67.34% <88.23%> (?)
platform-backend 81.98% <ø> (ø)
platform-frontend-e2e 31.90% <ø> (-0.47%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
Platform Backend 81.98% <ø> (ø)
Platform Frontend 19.51% <ø> (-28.04%) ⬇️
AutoGPT Libs ∅ <ø> (∅)
Classic AutoGPT 56.58% <85.18%> (+28.14%) ⬆️
🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@classic/original_autogpt/autogpt/app/main.py`:
- Around line 757-759: Before assigning agent.state.task = next_task, check for
an active "finish" episode (agent.state.finish) whose result is still None and
finalize it so it can't be reused; either call the existing episode finalizer
(e.g., agent.finalize_episode(), agent.finish_episode(), or
agent.state.finish.complete()) if available, or set agent.state.finish.result to
a non-None sentinel (e.g., an empty result or "skipped") to mark it complete,
then proceed to set agent.state.task = next_task so the new loop iteration won't
reuse the stale finish episode.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: dc487d41-454a-4fd6-ae7c-789b7bd6d6b6

📥 Commits

Reviewing files that changed from the base of the PR and between f6ddcbc and 17e1578.

📒 Files selected for processing (2)
  • classic/forge/tests/test_action_history_cursor.py
  • classic/original_autogpt/autogpt/app/main.py
📜 Review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (11)
  • GitHub Check: build (dev)
  • GitHub Check: test
  • GitHub Check: build (release)
  • GitHub Check: test
  • GitHub Check: test
  • GitHub Check: benchmark-tests
  • GitHub Check: Analyze (python)
  • GitHub Check: Analyze (typescript)
  • GitHub Check: Check PR Status
  • GitHub Check: Seer Code Review
  • GitHub Check: Cursor Bugbot
🧰 Additional context used
🧠 Learnings (2)
📚 Learning: 2026-03-17T10:57:12.953Z
Learnt from: majdyz
Repo: Significant-Gravitas/AutoGPT PR: 12440
File: autogpt_platform/backend/backend/copilot/workflow_import/converter.py:0-0
Timestamp: 2026-03-17T10:57:12.953Z
Learning: In Significant-Gravitas/AutoGPT PR `#12440`, `autogpt_platform/backend/backend/copilot/workflow_import/converter.py` was fully rewritten (commit 732960e2d) to no longer make direct LLM/OpenAI API calls. The converter now builds a structured text prompt for AutoPilot/CoPilot instead. There is no `response.choices` access or any direct LLM client usage in this file. Do not flag `response.choices` access or LLM client initialization patterns as issues in this file.

Applied to files:

  • classic/original_autogpt/autogpt/app/main.py
📚 Learning: 2026-03-19T15:10:50.676Z
Learnt from: majdyz
Repo: Significant-Gravitas/AutoGPT PR: 12483
File: autogpt_platform/backend/backend/copilot/tools/test_dry_run.py:298-303
Timestamp: 2026-03-19T15:10:50.676Z
Learning: When using Python’s `unittest.mock.patch` in tests, choose the patch target based on how the imported name is resolved:
- If the code under test uses an **eager/module-level import** (e.g., `from foo.bar import baz` at module top), patch **the module where the name is looked up** (i.e., where it is used in the SUT), e.g. `patch("mymodule.baz")`.
- If the code under test uses a **lazy import** executed later (e.g., `from foo.bar import baz` inside a function/branch), patch **the source module** (e.g., `patch("foo.bar.baz")`) because the late `from ... import` will read the (potentially patched) name from the source module at call time.

For a concrete example: if `simulate_block` is imported inside an `if dry_run:` block in the SUT, then the correct test patch target is the source module path for `simulate_block` as it exists at call time (e.g., `patch("backend.executor.simulator.simulate_block")`), not the test file’s import location.

Applied to files:

  • classic/forge/tests/test_action_history_cursor.py
🔇 Additional comments (1)
classic/forge/tests/test_action_history_cursor.py (1)

42-54: Good coverage additions for cursor safety and task-continuation history behavior.

These tests clearly pin the current_episode bounds behavior and the “preserve history across task changes” contract.

Also applies to: 57-81

Comment thread classic/original_autogpt/autogpt/app/main.py
AgentFinished is caught before execute() registers a result, leaving
the finish episode with result=None. The interaction loop sees this as
"episode in progress" and reuses the old finish proposal instead of
calling the LLM for the new task. Register a success result before
continuing so the loop calls propose_action() for the new task.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@github-actions github-actions Bot added the size/l label Apr 4, 2026

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 6aed43d. Configure here.

Comment thread classic/original_autogpt/autogpt/app/main.py Outdated
Comment thread classic/original_autogpt/autogpt/app/main.py Outdated
Comment thread classic/original_autogpt/autogpt/app/main.py Outdated
Comment thread classic/forge/tests/test_action_history_cursor.py
majdyz
majdyz previously approved these changes Apr 5, 2026

@majdyz majdyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. The fix correctly closes the dangling finish episode via register_result so the main loop's if not (_ep := current_episode) or _ep.result check proposes a fresh action on the next task rather than replaying the stored finish proposal. Verified the flow:

  1. propose_actionafter_parseregister_action creates episode with result=None
  2. execute → finish tool raises AgentFinished before after_execute runs → episode left with result=None
  3. main.py catches AgentFinished, calls register_result(ActionSuccessResult(...)), cursor advances to len(episodes)
  4. Next iteration: current_episode is None → proposes fresh action ✓

Preserving history across task continuations is the right call — the token-budget trimming in ActionHistoryComponent.get_messages (max_tokens=1024) bounds prompt size even if episodes grows, and compression summarizes older entries lazily.

Left a few minor comments (defensive guard on register_result, inline-import nit echoing Cursor, and a suggestion for integration-level test coverage) — none blocking.

@github-project-automation github-project-automation Bot moved this from 🆕 Needs initial review to 👍🏼 Mergeable in AutoGPT development kanban Apr 5, 2026
@CLAassistant

CLAassistant commented May 11, 2026

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions Bot removed the size/m label May 20, 2026
ntindle and others added 2 commits June 25, 2026 11:35
CI black --check flagged this line; collapse the register_result call
onto a single line (87 chars, under the 88 limit) to match black.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
- Move ActionSuccessResult to the top-level forge.models.action import
  instead of importing it inline (flagged by Cursor Bugbot and majdyz).
- Guard register_result with `if (ep := current_episode) and not ep.result`
  so it never raises RuntimeError if AgentFinished ever propagates from a
  path where register_action didn't run first (defensive, per majdyz).
- Add an integration-style test mirroring the AgentFinished -> new-task
  flow in main.py: finish episode closed via register_result, next
  current_episode is None (fresh proposal), prior history preserved.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
ntindle and others added 5 commits June 25, 2026 11:51
Access finish_episode.result directly instead of current_episode.result —
the current_episode property returns Episode | None, which pyright cannot
narrow (reportOptionalMemberAccess). Same object, type-safe.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
OpenAI's images.generate now requires an explicit `model`; the call
omitted it and failed with 400 "Missing required parameter: 'model'",
breaking test_dalle. Add a configurable `dalle_model` (default
"dall-e-2", which supports the 256/512/1024 sizes and b64_json output
this component uses) and pass it through.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
The live images.generate API rejects response_format ("Unknown
parameter"), so stop sending it. Without it the image comes back as
either base64 JSON or a temporary URL depending on the model — handle
both: decode b64_json when present, otherwise download the url.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
OpenAI removed dall-e-2 and dall-e-3 from the API on 2026-05-12
("The model 'dall-e-2' does not exist"), so DALL-E image generation was
fully broken for real users, not just CI. Migrate the OpenAI image
provider to gpt-image-1 (the current recommended model):

- Default model -> gpt-image-1
- gpt-image-1 returns base64 PNGs and supports 1024x1024 square output
  (it rejects response_format and the old 256/512 sizes), so clamp the
  square size to 1024 and read b64_json from the response
- test_dalle now exercises the only supported square size (1024)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
…ward)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
@github-actions

github-actions Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

🔍 PR Overlap Detection

This check compares your PR against all other open PRs targeting the same branch to detect potential merge conflicts early.

🔴 Merge Conflicts Detected

The following PRs have been tested and will have merge conflicts if merged after this PR. Consider coordinating with the authors.

  • refactor(frontend/copilot): remove ARTIFACTS feature flag #13113 (ntindle · updated 1m ago)

    • autogpt_platform/backend/.env.default (1 conflict, ~17 lines)
    • autogpt_platform/backend/backend/api/external/fastapi_app.py (2 conflicts, ~14 lines)
    • autogpt_platform/backend/backend/api/external/v1/routes.py (3 conflicts, ~22 lines)
    • autogpt_platform/backend/backend/api/features/admin/rate_limit_admin_routes.py (3 conflicts, ~12 lines)
    • autogpt_platform/backend/backend/api/features/admin/rate_limit_admin_routes_test.py (2 conflicts, ~9 lines)
    • autogpt_platform/backend/backend/api/features/builder/db.py (1 conflict, ~22 lines)
    • autogpt_platform/backend/backend/api/features/integrations/router_test.py (1 conflict, ~75 lines)
    • autogpt_platform/backend/backend/api/features/library/db.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/api/features/library/db_test.py (1 conflict, ~270 lines)
    • autogpt_platform/backend/backend/api/features/search/content_handlers.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/api/features/store/db.py (2 conflicts, ~74 lines)
    • autogpt_platform/backend/backend/api/features/store/db_test.py (3 conflicts, ~56 lines)
    • autogpt_platform/backend/backend/api/features/store/embeddings.py (1 conflict, ~544 lines)
    • autogpt_platform/backend/backend/api/features/store/hybrid_search.py (1 conflict, ~394 lines)
    • autogpt_platform/backend/backend/api/features/store/hybrid_search_test.py (1 conflict, ~360 lines)
    • autogpt_platform/backend/backend/api/features/v1.py (2 conflicts, ~16 lines)
    • autogpt_platform/backend/backend/api/features/v1_test.py (3 conflicts, ~139 lines)
    • autogpt_platform/backend/backend/api/features/workspace/routes.py (1 conflict, ~32 lines)
    • autogpt_platform/backend/backend/api/rest_api.py (2 conflicts, ~12 lines)
    • autogpt_platform/backend/backend/blocks/_base.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/blocks/exa/helpers.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/blocks/llm.py (3 conflicts, ~402 lines)
    • autogpt_platform/backend/backend/blocks/replicate/replicate_block.py (1 conflict, ~26 lines)
    • autogpt_platform/backend/backend/copilot/baseline/service.py (5 conflicts, ~51 lines)
    • autogpt_platform/backend/backend/copilot/config.py (4 conflicts, ~37 lines)
    • autogpt_platform/backend/backend/copilot/config_test.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/copilot/executor/processor.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/model.py (1 conflict, ~17 lines)
    • autogpt_platform/backend/backend/copilot/permissions.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/response_model.py (1 conflict, ~6 lines)
    • autogpt_platform/backend/backend/copilot/sdk/agent_generation_guide.md (6 conflicts, ~184 lines)
    • autogpt_platform/backend/backend/copilot/sdk/env_test.py (1 conflict, ~30 lines)
    • autogpt_platform/backend/backend/copilot/sdk/mcp_tool_guide.md (1 conflict, ~10 lines)
    • autogpt_platform/backend/backend/copilot/service.py (4 conflicts, ~31 lines)
    • autogpt_platform/backend/backend/copilot/stream_registry.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/tools/__init__.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_generator/validator.py (2 conflicts, ~23 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_generator/validator_test.py (1 conflict, ~68 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_search.py (2 conflicts, ~73 lines)
    • autogpt_platform/backend/backend/copilot/tools/find_library_agent.py (3 conflicts, ~29 lines)
    • autogpt_platform/backend/backend/copilot/tools/models.py (1 conflict, ~35 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_agent.py (2 conflicts, ~33 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_agent_test.py (2 conflicts, ~260 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_block_test.py (1 conflict, ~94 lines)
    • autogpt_platform/backend/backend/copilot/tools/tool_schema_test.py (1 conflict, ~22 lines)
    • autogpt_platform/backend/backend/copilot/tools/workspace_files.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/data/credit.py (2 conflicts, ~49 lines)
    • autogpt_platform/backend/backend/data/credit_metadata_test.py (1 conflict, ~9 lines)
    • autogpt_platform/backend/backend/data/db_accessors.py (1 conflict, ~16 lines)
    • autogpt_platform/backend/backend/data/db_manager.py (2 conflicts, ~8 lines)
    • autogpt_platform/backend/backend/data/tally.py (3 conflicts, ~18 lines)
    • autogpt_platform/backend/backend/data/user.py (1 conflict, ~27 lines)
    • autogpt_platform/backend/backend/executor/activity_status_generator.py (1 conflict, ~19 lines)
    • autogpt_platform/backend/backend/executor/scheduler.py (3 conflicts, ~66 lines)
    • autogpt_platform/backend/backend/executor/scheduler_test.py (2 conflicts, ~441 lines)
    • autogpt_platform/backend/backend/executor/simulator.py (3 conflicts, ~24 lines)
    • autogpt_platform/backend/backend/util/exceptions.py (1 conflict, ~7 lines)
    • autogpt_platform/backend/backend/util/feature_flag.py (1 conflict, ~23 lines)
    • autogpt_platform/backend/backend/util/feature_flag_test.py (1 conflict, ~89 lines)
    • autogpt_platform/backend/backend/util/settings.py (2 conflicts, ~24 lines)
    • autogpt_platform/backend/poetry.lock (4 conflicts, ~177 lines)
    • autogpt_platform/backend/pyproject.toml (1 conflict, ~4 lines)
    • autogpt_platform/backend/schema.prisma (1 conflict, ~47 lines)
    • autogpt_platform/backend/test/e2e_test_data.py (1 conflict, ~11 lines)
    • autogpt_platform/backend/test/test_migrate_webhook_presets.py (6 conflicts, ~30 lines)
    • autogpt_platform/frontend/.storybook/main.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/pnpm-lock.yaml (2 conflicts, ~12 lines)
    • autogpt_platform/frontend/src/app/(no-navbar)/onboarding/store.ts (1 conflict, ~22 lines)
    • autogpt_platform/frontend/src/app/(no-navbar)/onboarding/useOnboardingPage.ts (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/layout.tsx (2 conflicts, ~16 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/rate-limits/components/RateLimitDisplay.tsx (2 conflicts, ~10 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/rate-limits/components/useRateLimitManager.ts (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/CopilotPage.tsx (2 conflicts, ~35 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/__tests__/low-credit-banner.test.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/AgentSavedCard/AgentSavedCard.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/ChatContainer.tsx (4 conflicts, ~25 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/__tests__/ChatContainer.test.tsx (2 conflicts, ~12 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/useAutoOpenArtifacts.test.ts (1 conflict, ~114 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx (3 conflicts, ~13 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/__tests__/helpers.test.ts (3 conflicts, ~113 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessageAttachments.tsx (4 conflicts, ~40 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessagePartRenderer.tsx (2 conflicts, ~9 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/helpers.ts (1 conflict, ~19 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatSidebar/ChatSidebar.tsx (7 conflicts, ~372 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/EmptySession/EmptySession.tsx (1 conflict, ~6 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/MobileDrawer/MobileDrawer.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/MobileHeader/MobileHeader.tsx (2 conflicts, ~11 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/store.ts (1 conflict, ~6 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/ConnectIntegrationTool/ConnectIntegrationTool.tsx (1 conflict, ~7 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/RunBlock.tsx (1 conflict, ~7 lines)
    • autogpt_platform/frontend/src/app/api/mutators/custom-mutator.ts (2 conflicts, ~8 lines)
    • autogpt_platform/frontend/src/app/api/openapi.json (12 conflicts, ~554 lines)
    • autogpt_platform/frontend/src/components/ai-elements/conversation.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/PublishAgentModal.tsx (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/AgentSelectStep.tsx (3 conflicts, ~39 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/useAgentSelectStep.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/components/layout/TopUpPrompt/LowCreditBanner/LowCreditBanner.tsx (1 conflict, ~10 lines)
    • autogpt_platform/frontend/src/components/layout/TopUpPrompt/TopUpForm/useTopUpForm.ts (2 conflicts, ~9 lines)
    • autogpt_platform/frontend/src/lib/supabase/actions.ts (2 conflicts, ~14 lines)
    • autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts (6 conflicts, ~54 lines)
    • autogpt_platform/frontend/src/services/storage/local-storage.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/tailwind.config.ts (2 conflicts, ~17 lines)
    • docs/integrations/block-integrations/misc.md (1 conflict, ~5 lines)
    • docs/integrations/block-integrations/replicate/replicate_block.md (1 conflict, ~5 lines)
  • docs(blocks): document integration icon, auth patterns, auto-discovery, docs sync, and test patterns #13048 (ntindle · updated just now)

    • autogpt_platform/backend/.env.default (1 conflict, ~17 lines)
    • autogpt_platform/backend/backend/api/external/fastapi_app.py (2 conflicts, ~14 lines)
    • autogpt_platform/backend/backend/api/external/v1/routes.py (3 conflicts, ~22 lines)
    • autogpt_platform/backend/backend/api/features/admin/rate_limit_admin_routes.py (3 conflicts, ~12 lines)
    • autogpt_platform/backend/backend/api/features/admin/rate_limit_admin_routes_test.py (2 conflicts, ~9 lines)
    • autogpt_platform/backend/backend/api/features/builder/db.py (1 conflict, ~22 lines)
    • autogpt_platform/backend/backend/api/features/integrations/router_test.py (1 conflict, ~75 lines)
    • autogpt_platform/backend/backend/api/features/library/db.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/api/features/library/db_test.py (1 conflict, ~270 lines)
    • autogpt_platform/backend/backend/api/features/search/content_handlers.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/api/features/store/db.py (2 conflicts, ~74 lines)
    • autogpt_platform/backend/backend/api/features/store/db_test.py (3 conflicts, ~56 lines)
    • autogpt_platform/backend/backend/api/features/store/embeddings.py (1 conflict, ~544 lines)
    • autogpt_platform/backend/backend/api/features/store/hybrid_search.py (1 conflict, ~394 lines)
    • autogpt_platform/backend/backend/api/features/store/hybrid_search_test.py (1 conflict, ~360 lines)
    • autogpt_platform/backend/backend/api/features/v1.py (2 conflicts, ~16 lines)
    • autogpt_platform/backend/backend/api/features/v1_test.py (3 conflicts, ~139 lines)
    • autogpt_platform/backend/backend/api/features/workspace/routes.py (1 conflict, ~32 lines)
    • autogpt_platform/backend/backend/api/rest_api.py (2 conflicts, ~12 lines)
    • autogpt_platform/backend/backend/blocks/_base.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/blocks/exa/helpers.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/blocks/llm.py (3 conflicts, ~402 lines)
    • autogpt_platform/backend/backend/blocks/replicate/replicate_block.py (1 conflict, ~26 lines)
    • autogpt_platform/backend/backend/copilot/baseline/service.py (5 conflicts, ~51 lines)
    • autogpt_platform/backend/backend/copilot/config.py (4 conflicts, ~37 lines)
    • autogpt_platform/backend/backend/copilot/config_test.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/copilot/executor/processor.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/model.py (1 conflict, ~17 lines)
    • autogpt_platform/backend/backend/copilot/permissions.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/response_model.py (1 conflict, ~6 lines)
    • autogpt_platform/backend/backend/copilot/sdk/agent_generation_guide.md (6 conflicts, ~184 lines)
    • autogpt_platform/backend/backend/copilot/sdk/env_test.py (1 conflict, ~30 lines)
    • autogpt_platform/backend/backend/copilot/sdk/mcp_tool_guide.md (1 conflict, ~10 lines)
    • autogpt_platform/backend/backend/copilot/service.py (4 conflicts, ~31 lines)
    • autogpt_platform/backend/backend/copilot/stream_registry.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/tools/__init__.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_generator/validator.py (2 conflicts, ~23 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_generator/validator_test.py (1 conflict, ~68 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_search.py (2 conflicts, ~73 lines)
    • autogpt_platform/backend/backend/copilot/tools/find_library_agent.py (3 conflicts, ~29 lines)
    • autogpt_platform/backend/backend/copilot/tools/models.py (1 conflict, ~35 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_agent.py (2 conflicts, ~33 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_agent_test.py (2 conflicts, ~260 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_block_test.py (1 conflict, ~94 lines)
    • autogpt_platform/backend/backend/copilot/tools/tool_schema_test.py (1 conflict, ~22 lines)
    • autogpt_platform/backend/backend/copilot/tools/workspace_files.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/data/credit.py (2 conflicts, ~49 lines)
    • autogpt_platform/backend/backend/data/credit_metadata_test.py (1 conflict, ~9 lines)
    • autogpt_platform/backend/backend/data/db_accessors.py (1 conflict, ~16 lines)
    • autogpt_platform/backend/backend/data/db_manager.py (2 conflicts, ~8 lines)
    • autogpt_platform/backend/backend/data/tally.py (3 conflicts, ~18 lines)
    • autogpt_platform/backend/backend/data/user.py (1 conflict, ~27 lines)
    • autogpt_platform/backend/backend/executor/activity_status_generator.py (1 conflict, ~19 lines)
    • autogpt_platform/backend/backend/executor/scheduler.py (3 conflicts, ~66 lines)
    • autogpt_platform/backend/backend/executor/scheduler_test.py (2 conflicts, ~441 lines)
    • autogpt_platform/backend/backend/executor/simulator.py (3 conflicts, ~24 lines)
    • autogpt_platform/backend/backend/util/exceptions.py (1 conflict, ~7 lines)
    • autogpt_platform/backend/backend/util/feature_flag.py (1 conflict, ~23 lines)
    • autogpt_platform/backend/backend/util/feature_flag_test.py (1 conflict, ~89 lines)
    • autogpt_platform/backend/backend/util/settings.py (2 conflicts, ~24 lines)
    • autogpt_platform/backend/poetry.lock (4 conflicts, ~177 lines)
    • autogpt_platform/backend/pyproject.toml (1 conflict, ~4 lines)
    • autogpt_platform/backend/schema.prisma (1 conflict, ~47 lines)
    • autogpt_platform/backend/test/e2e_test_data.py (1 conflict, ~11 lines)
    • autogpt_platform/backend/test/test_migrate_webhook_presets.py (6 conflicts, ~30 lines)
    • autogpt_platform/frontend/.storybook/main.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/pnpm-lock.yaml (2 conflicts, ~12 lines)
    • autogpt_platform/frontend/src/app/(no-navbar)/onboarding/store.ts (1 conflict, ~22 lines)
    • autogpt_platform/frontend/src/app/(no-navbar)/onboarding/useOnboardingPage.ts (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/layout.tsx (2 conflicts, ~16 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/rate-limits/components/RateLimitDisplay.tsx (2 conflicts, ~10 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/rate-limits/components/useRateLimitManager.ts (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/CopilotPage.tsx (2 conflicts, ~33 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/AgentSavedCard/AgentSavedCard.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/ChatContainer.tsx (2 conflicts, ~15 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/__tests__/helpers.test.ts (3 conflicts, ~113 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessagePartRenderer.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/helpers.ts (1 conflict, ~19 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatSidebar/ChatSidebar.tsx (7 conflicts, ~372 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/EmptySession/EmptySession.tsx (1 conflict, ~6 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/MobileDrawer/MobileDrawer.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/MobileHeader/MobileHeader.tsx (2 conflicts, ~11 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/store.ts (1 conflict, ~6 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/ConnectIntegrationTool/ConnectIntegrationTool.tsx (1 conflict, ~7 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/RunBlock.tsx (1 conflict, ~7 lines)
    • autogpt_platform/frontend/src/app/api/mutators/custom-mutator.ts (2 conflicts, ~8 lines)
    • autogpt_platform/frontend/src/app/api/openapi.json (12 conflicts, ~554 lines)
    • autogpt_platform/frontend/src/components/ai-elements/conversation.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/PublishAgentModal.tsx (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/AgentSelectStep.tsx (3 conflicts, ~39 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/useAgentSelectStep.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/components/layout/TopUpPrompt/LowCreditBanner/LowCreditBanner.tsx (1 conflict, ~10 lines)
    • autogpt_platform/frontend/src/components/layout/TopUpPrompt/TopUpForm/useTopUpForm.ts (2 conflicts, ~9 lines)
    • autogpt_platform/frontend/src/lib/supabase/actions.ts (2 conflicts, ~14 lines)
    • autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts (2 conflicts, ~24 lines)
    • autogpt_platform/frontend/src/services/storage/local-storage.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/tailwind.config.ts (2 conflicts, ~17 lines)
    • docs/integrations/block-integrations/misc.md (1 conflict, ~5 lines)
    • docs/integrations/block-integrations/replicate/replicate_block.md (1 conflict, ~5 lines)
    • docs/platform/block-sdk-guide.md (1 conflict, ~23 lines)
  • docs(platform): sync GitBook documentation into dev #13055 (ntindle · updated 1m ago)

    • autogpt_platform/backend/.env.default (1 conflict, ~17 lines)
    • autogpt_platform/backend/backend/api/external/fastapi_app.py (2 conflicts, ~14 lines)
    • autogpt_platform/backend/backend/api/external/v1/routes.py (3 conflicts, ~22 lines)
    • autogpt_platform/backend/backend/api/features/admin/rate_limit_admin_routes.py (3 conflicts, ~12 lines)
    • autogpt_platform/backend/backend/api/features/admin/rate_limit_admin_routes_test.py (2 conflicts, ~9 lines)
    • autogpt_platform/backend/backend/api/features/builder/db.py (1 conflict, ~22 lines)
    • autogpt_platform/backend/backend/api/features/integrations/router_test.py (1 conflict, ~75 lines)
    • autogpt_platform/backend/backend/api/features/library/db.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/api/features/library/db_test.py (1 conflict, ~270 lines)
    • autogpt_platform/backend/backend/api/features/search/content_handlers.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/api/features/store/db.py (2 conflicts, ~74 lines)
    • autogpt_platform/backend/backend/api/features/store/db_test.py (3 conflicts, ~56 lines)
    • autogpt_platform/backend/backend/api/features/store/embeddings.py (1 conflict, ~544 lines)
    • autogpt_platform/backend/backend/api/features/store/hybrid_search.py (1 conflict, ~394 lines)
    • autogpt_platform/backend/backend/api/features/store/hybrid_search_test.py (1 conflict, ~360 lines)
    • autogpt_platform/backend/backend/api/features/v1.py (2 conflicts, ~16 lines)
    • autogpt_platform/backend/backend/api/features/v1_test.py (3 conflicts, ~139 lines)
    • autogpt_platform/backend/backend/api/features/workspace/routes.py (1 conflict, ~32 lines)
    • autogpt_platform/backend/backend/api/rest_api.py (2 conflicts, ~12 lines)
    • autogpt_platform/backend/backend/blocks/_base.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/blocks/exa/helpers.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/blocks/llm.py (3 conflicts, ~402 lines)
    • autogpt_platform/backend/backend/blocks/replicate/replicate_block.py (1 conflict, ~26 lines)
    • autogpt_platform/backend/backend/copilot/baseline/service.py (5 conflicts, ~51 lines)
    • autogpt_platform/backend/backend/copilot/config.py (4 conflicts, ~37 lines)
    • autogpt_platform/backend/backend/copilot/config_test.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/copilot/executor/processor.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/model.py (1 conflict, ~17 lines)
    • autogpt_platform/backend/backend/copilot/permissions.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/response_model.py (1 conflict, ~6 lines)
    • autogpt_platform/backend/backend/copilot/sdk/agent_generation_guide.md (6 conflicts, ~184 lines)
    • autogpt_platform/backend/backend/copilot/sdk/env_test.py (1 conflict, ~30 lines)
    • autogpt_platform/backend/backend/copilot/sdk/mcp_tool_guide.md (1 conflict, ~10 lines)
    • autogpt_platform/backend/backend/copilot/service.py (4 conflicts, ~31 lines)
    • autogpt_platform/backend/backend/copilot/stream_registry.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/tools/__init__.py (1 conflict, ~4 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_generator/validator.py (2 conflicts, ~23 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_generator/validator_test.py (1 conflict, ~68 lines)
    • autogpt_platform/backend/backend/copilot/tools/agent_search.py (2 conflicts, ~73 lines)
    • autogpt_platform/backend/backend/copilot/tools/find_library_agent.py (3 conflicts, ~29 lines)
    • autogpt_platform/backend/backend/copilot/tools/models.py (1 conflict, ~35 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_agent.py (2 conflicts, ~33 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_agent_test.py (2 conflicts, ~260 lines)
    • autogpt_platform/backend/backend/copilot/tools/run_block_test.py (1 conflict, ~94 lines)
    • autogpt_platform/backend/backend/copilot/tools/tool_schema_test.py (1 conflict, ~22 lines)
    • autogpt_platform/backend/backend/copilot/tools/workspace_files.py (1 conflict, ~5 lines)
    • autogpt_platform/backend/backend/data/credit.py (2 conflicts, ~49 lines)
    • autogpt_platform/backend/backend/data/credit_metadata_test.py (1 conflict, ~9 lines)
    • autogpt_platform/backend/backend/data/db_accessors.py (1 conflict, ~16 lines)
    • autogpt_platform/backend/backend/data/db_manager.py (2 conflicts, ~8 lines)
    • autogpt_platform/backend/backend/data/tally.py (3 conflicts, ~18 lines)
    • autogpt_platform/backend/backend/data/user.py (1 conflict, ~27 lines)
    • autogpt_platform/backend/backend/executor/activity_status_generator.py (1 conflict, ~19 lines)
    • autogpt_platform/backend/backend/executor/scheduler.py (3 conflicts, ~66 lines)
    • autogpt_platform/backend/backend/executor/scheduler_test.py (2 conflicts, ~441 lines)
    • autogpt_platform/backend/backend/executor/simulator.py (3 conflicts, ~24 lines)
    • autogpt_platform/backend/backend/util/exceptions.py (1 conflict, ~7 lines)
    • autogpt_platform/backend/backend/util/feature_flag.py (1 conflict, ~23 lines)
    • autogpt_platform/backend/backend/util/feature_flag_test.py (1 conflict, ~89 lines)
    • autogpt_platform/backend/backend/util/settings.py (2 conflicts, ~24 lines)
    • autogpt_platform/backend/poetry.lock (4 conflicts, ~177 lines)
    • autogpt_platform/backend/pyproject.toml (1 conflict, ~4 lines)
    • autogpt_platform/backend/schema.prisma (1 conflict, ~47 lines)
    • autogpt_platform/backend/test/e2e_test_data.py (1 conflict, ~11 lines)
    • autogpt_platform/backend/test/test_migrate_webhook_presets.py (6 conflicts, ~30 lines)
    • autogpt_platform/frontend/.storybook/main.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/pnpm-lock.yaml (2 conflicts, ~12 lines)
    • autogpt_platform/frontend/src/app/(no-navbar)/onboarding/store.ts (1 conflict, ~22 lines)
    • autogpt_platform/frontend/src/app/(no-navbar)/onboarding/useOnboardingPage.ts (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/layout.tsx (2 conflicts, ~16 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/rate-limits/components/RateLimitDisplay.tsx (2 conflicts, ~10 lines)
    • autogpt_platform/frontend/src/app/(platform)/admin/rate-limits/components/useRateLimitManager.ts (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/CopilotPage.tsx (2 conflicts, ~33 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/AgentSavedCard/AgentSavedCard.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatContainer/ChatContainer.tsx (2 conflicts, ~15 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/ChatMessagesContainer.tsx (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/__tests__/helpers.test.ts (3 conflicts, ~113 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/components/MessagePartRenderer.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatMessagesContainer/helpers.ts (1 conflict, ~19 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/ChatSidebar/ChatSidebar.tsx (7 conflicts, ~372 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/EmptySession/EmptySession.tsx (1 conflict, ~6 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/MobileDrawer/MobileDrawer.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/components/MobileHeader/MobileHeader.tsx (2 conflicts, ~11 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/store.ts (1 conflict, ~6 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/ConnectIntegrationTool/ConnectIntegrationTool.tsx (1 conflict, ~7 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/GenericTool/GenericTool.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/app/(platform)/copilot/tools/RunBlock/RunBlock.tsx (1 conflict, ~7 lines)
    • autogpt_platform/frontend/src/app/api/mutators/custom-mutator.ts (2 conflicts, ~8 lines)
    • autogpt_platform/frontend/src/app/api/openapi.json (12 conflicts, ~554 lines)
    • autogpt_platform/frontend/src/components/ai-elements/conversation.tsx (1 conflict, ~5 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/PublishAgentModal.tsx (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/AgentSelectStep.tsx (3 conflicts, ~39 lines)
    • autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentSelectStep/useAgentSelectStep.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/src/components/layout/TopUpPrompt/LowCreditBanner/LowCreditBanner.tsx (1 conflict, ~10 lines)
    • autogpt_platform/frontend/src/components/layout/TopUpPrompt/TopUpForm/useTopUpForm.ts (2 conflicts, ~9 lines)
    • autogpt_platform/frontend/src/lib/supabase/actions.ts (2 conflicts, ~14 lines)
    • autogpt_platform/frontend/src/services/feature-flags/use-get-flag.ts (2 conflicts, ~24 lines)
    • autogpt_platform/frontend/src/services/storage/local-storage.ts (1 conflict, ~4 lines)
    • autogpt_platform/frontend/tailwind.config.ts (2 conflicts, ~17 lines)
    • docs/integrations/block-integrations/misc.md (1 conflict, ~5 lines)
    • docs/integrations/block-integrations/replicate/replicate_block.md (1 conflict, ~5 lines)
  • docs: consolidate backend README files to point to official docs site #13375 (xizhilanre · updated 20h ago)

    • 📁 autogpt_platform/backend/
      • README.md (1 conflict, ~33 lines)
  • docs(platform): consolidate README files to point to docs site #13176 (CodeAgentCN · updated 11d ago)

    • 📁 autogpt_platform/backend/
      • README.md (1 conflict, ~18 lines)

🟢 Low Risk — File Overlap Only

These PRs touch the same files but different sections (click to expand)

Summary: 5 conflict(s), 0 medium risk, 3 low risk (out of 8 PRs with file overlap)


Auto-generated on push. Ignores: openapi.json, lock files.

ntindle and others added 2 commits June 25, 2026 13:38
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01V2WvfqfXHpq4CpSypnu9f9
@ntindle
ntindle enabled auto-merge June 25, 2026 20:47
@ntindle
ntindle added this pull request to the merge queue Jun 25, 2026
Merged via the queue into dev with commit 98acc4b Jun 25, 2026
47 checks passed
@ntindle
ntindle deleted the feat/keep-task-context branch June 25, 2026 21:08
@github-project-automation github-project-automation Bot moved this from 👍🏼 Mergeable to ✅ Done in AutoGPT development kanban Jun 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

4 participants