fix: use-active-conversation updates when agent checks out new branch by HeyItsChloe · Pull Request #1324 · OpenHands/agent-canvas

HeyItsChloe · 2026-06-12T03:27:46Z

Why

The Changes tab and git control bar were not updating when the agent checked out to a new branch mid-conversation. Several layers were not reacting to branch changes:

useLocalGitInfo probes the live branch via git rev-parse --abbrev-ref HEAD every 10s but never invalidated the conversation query when it diverged from conversation.selected_branch
useActiveConversation effect did not track selected_branch so ConversationService.setCurrentConversation never fired on branch switch
getGitPath lacked a fallback to localGitInfo.repository for agent-autonomous clones where selected_repository isn't set yet
useUnifiedGitDiff / useUnifiedGetGitChanges weren't passing the local git probe's repo to getGitPath, so the Changes tab used stale paths

Changes

use-local-git-info.ts: Added useQueryClient.invalidateQueries when live branch diverges from recorded branch — forces immediate conversation refetch instead of waiting up to 30s for the next poll cycle
use-active-conversation.ts: Added userConversation?.data?.selected_branch to useEffect deps so ConversationService.setCurrentConversation fires on branch change
get-git-path.ts: Added localGitDetectedRepo 3rd parameter as fallback for agent-autonomous clones
use-unified-git-diff.ts / use-unified-get-git-changes.ts: Pass localGitInfo?.repository to getGitPath so Changes tab uses correct workspace
Added tests for localGitDetectedRepo fallback behavior

Test Results

get-git-path.test.ts: 14 tests passed
use-active-conversation.test.ts: 5 tests passed
git-control-bar.test.tsx: 11 tests passed

🐳 Docker images for this PR

• GHCR package: https://github.com/OpenHands/agent-canvas/pkgs/container/agent-canvas

Component	Value
Image	`ghcr.io/openhands/agent-canvas`
Architectures	amd64, arm64
Agent Server	`ghcr.io/openhands/agent-server:1.26.0-python`
Automation	`openhands-automation==1.0.0a6`
Commit	`9216274c1f8a84665bcb5e534e6c21ef9a379933`

Pull (multi-arch manifest)

# Multi-arch manifest — Docker automatically pulls the correct architecture
docker pull ghcr.io/openhands/agent-canvas:sha-9216274

Run

docker run -it --rm \
  -p 8000:8000 \
  ghcr.io/openhands/agent-canvas:sha-9216274

All tags pushed for this build

ghcr.io/openhands/agent-canvas:sha-9216274-amd64
ghcr.io/openhands/agent-canvas:fix-use-active-conversation-branch-update-amd64
ghcr.io/openhands/agent-canvas:pr-1324-amd64
ghcr.io/openhands/agent-canvas:sha-9216274-arm64
ghcr.io/openhands/agent-canvas:fix-use-active-conversation-branch-update-arm64
ghcr.io/openhands/agent-canvas:pr-1324-arm64
ghcr.io/openhands/agent-canvas:sha-9216274
ghcr.io/openhands/agent-canvas:fix-use-active-conversation-branch-update
ghcr.io/openhands/agent-canvas:pr-1324

About Multi-Architecture Support

Each tag (e.g., sha-9216274) is a multi-arch manifest supporting both amd64 and arm64
Docker automatically pulls the correct architecture for your platform
Individual architecture tags (e.g., sha-9216274-amd64) are also available if needed

This fix addresses issues #1193 and #1182 where the Changes/Diffs tab was not displaying the correct workspace directory when switching repos. Root cause: getGitPath() prioritized workingDir over selectedRepository, but workingDir is updated asynchronously by the agent after cloning. During repo switches, workingDir would be stale while selectedRepository was immediately updated. Changes: - get-git-path.ts: Prioritize selectedRepository over workingDir when a repo is selected. This ensures the Changes tab uses the correct workspace immediately when a user selects a repository. - git-control-bar.tsx: Show repo button when localGitInfo detects a repository (even if selected_repository wasn't set via UI). This handles the case where the agent autonomously clones a repo. - Updated tests to reflect new priority behavior and added tests for localGitDetectedRepo functionality. Fixes #1193 Fixes #1182

…mid-conversation - useLocalGitInfo: invalidate conversation query when live branch diverges from recorded selected_branch (immediate refetch instead of 30s poll) - useActiveConversation: add selected_branch to useEffect deps so ConversationService.setCurrentConversation fires on branch change - getGitPath: add localGitDetectedRepo fallback param for agent-autonomous clones where git info is detected before selected_repository is set - useUnifiedGitDiff / useUnifiedGetGitChanges: pass localGitInfo.repository to getGitPath so Changes tab uses correct workspace after repo switch - add tests for localGitDetectedRepo fallback behavior

vercel · 2026-06-12T03:27:52Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
agent-canvas	Ready	Preview, Comment	Jun 12, 2026 3:28am

github-actions · 2026-06-12T03:37:13Z

✅ Mock-LLM E2E Tests

53/53 passed

Commit: 9216274c · Workflow run · Test artifacts

Status	Test	Duration
✅	mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 1: configure ACP agent via Settings → Agent UI	13.7s
✅	mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 2: reload and verify ACP settings are persisted in UI	5.5s
✅	mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 3: start ACP conversation and verify agent reply	6.7s
✅	mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 4: resume ACP conversation from sidebar after navigating away	5.7s
✅	mock-llm-auth-modes.spec.ts › auth mode: fresh install with runtime-injected key › reaches the onboarding modal without pre-seeded localStorage	1.3s
✅	mock-llm-auth-modes.spec.ts › auth mode: non-public key rotation › recovers when localStorage has a stale session API key	5.3s
✅	mock-llm-auth-modes.spec.ts › auth mode: public gate › shows the auth screen when no key is configured	1.1s
✅	mock-llm-auth-modes.spec.ts › auth mode: public gate › rejects an incorrect key with an inline error	1.4s
✅	mock-llm-auth-modes.spec.ts › auth mode: public gate › allows access after pasting the correct key	1.4s
✅	mock-llm-auth-modes.spec.ts › auth mode: public gate › skips auth screen for returning user with valid stored key	760ms
✅	mock-llm-auth-modes.spec.ts › auth mode: public gate › re-prompts when the server rotates its key (stale localStorage)	1.5s
✅	mock-llm-automation.spec.ts › mock-LLM automation lifecycle › step 1: setup LLM profile and register automation trajectory	7.1s
✅	mock-llm-automation.spec.ts › mock-LLM automation lifecycle › step 2: create automation and dispatch run via the UI	30.5s
✅	mock-llm-automation.spec.ts › mock-LLM automation lifecycle › step 3: verify automation and run on the automations page	6.2s
✅	mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 1: create an LLM profile pointing at the mock LLM server	6.2s
✅	mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 2: activate the mock-llm profile and verify settings API	6.2s
✅	mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 3: run a conversation with the mock LLM	6.5s
✅	mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 4: resume conversation from sidebar after navigating away	5.7s
✅	mock-llm-cross-connect.spec.ts › cross-connect: frontend-only → backend-only › frontend-only connects to a separate backend-only instance	15.8s
✅	mock-llm-cross-connect.spec.ts › cross-connect: frontend-only → multiple backends › connects to two separate backends and switches between them	20.7s
✅	mock-llm-files-and-git.spec.ts › files tab, git control bar, and browser tab › step 1: ensure mock LLM profile is configured	199ms
✅	mock-llm-files-and-git.spec.ts › files tab, git control bar, and browser tab › step 2: start conversation and attach workspace metadata	11.8s
✅	mock-llm-files-and-git.spec.ts › files tab, git control bar, and browser tab › step 3: git control bar shows workspace pill and git actions	25.3s
✅	mock-llm-files-and-git.spec.ts › files tab, git control bar, and browser tab › step 4: files tab defaults to diff view for attached workspace	5.9s
✅	mock-llm-files-and-git.spec.ts › files tab, git control bar, and browser tab › step 5: browser tab shows empty state	6.3s
✅	mock-llm-files-and-git.spec.ts › files tab, git control bar, and browser tab › step 6: files tab defaults to file-tree view without attached workspace	7.5s
✅	mock-llm-folder-workspace.spec.ts › mock-LLM folder browser → workspace → conversation › step 1: browse to a folder, add it as a workspace, and launch a conversation with the correct working_dir	7.8s
✅	mock-llm-image-upload.spec.ts › mock-LLM image upload › attaching an image embeds it as base64 in the LLM completion call	13.5s
✅	mock-llm-mcp-github.spec.ts › MCP GitHub server install flow › step 1: GitHub card is visible on the MCP marketplace page	5.5s
✅	mock-llm-mcp-github.spec.ts › MCP GitHub server install flow › step 2: clicking GitHub card opens the install modal with correct fields	5.7s
✅	mock-llm-mcp-github.spec.ts › MCP GitHub server install flow › step 3: full install flow — fill PAT, submit, verify installed	12.7s
✅	mock-llm-mcp-github.spec.ts › MCP GitHub server install flow › step 4: installed GitHub server can be deleted	5.8s
✅	mock-llm-model-switch.spec.ts › mock-LLM /model slash command › step 1: configure LLM, create switch-target profile, register trajectory	13.0s
✅	mock-llm-model-switch.spec.ts › mock-LLM /model slash command › step 2: start conversation, switch profile via /model, verify switch	6.8s
✅	mock-llm-onboarding-happy-path.spec.ts › onboarding happy path › completes the full onboarding flow and launches a conversation	3.7s
✅	mock-llm-onboarding-regressions.spec.ts › onboarding recent regressions › keeps the modal open on backdrop click and Escape	1.4s
✅	mock-llm-onboarding-regressions.spec.ts › onboarding recent regressions › defaults the LLM setup step to OpenAI GPT-5.5	1.6s
✅	mock-llm-partial-stack.spec.ts › partial stack: --frontend-only › serves the frontend but returns 503 for backend routes	7.4s
✅	mock-llm-partial-stack.spec.ts › partial stack: --backend-only › serves backend APIs but returns 503 for the frontend root	13.1s
✅	mock-llm-partial-stack.spec.ts › partial stack: port conflict › fails with a clear error when the ingress port is occupied	106ms
✅	mock-llm-partial-stack.spec.ts › partial stack: port conflict › starts successfully on a free port after a conflict	6.0s
✅	mock-llm-preset-automation.spec.ts › preset automation → slash command conversation › automation card sends the correct slash command to a conversation	15.9s
✅	mock-llm-preset-automation.spec.ts › preset automation → slash command conversation › direct slash command from home page triggers skill activation	13.5s
✅	mock-llm-profile-management.spec.ts › active profile deletion + reconciliation › active profile is deletable and reconciliation activates another profile	8.5s
✅	mock-llm-profile-management.spec.ts › same-model profile identity › chat header shows the correct profile when two profiles share the same model	15.1s
✅	mock-llm-skills.spec.ts › skill loading: project, user, and deletion › project skill in workspace/.agents/skills/ triggers on matching keyword	13.7s
✅	mock-llm-skills.spec.ts › skill loading: project, user, and deletion › user skill in ~/.openhands/skills/ triggers on matching keyword	13.5s
✅	mock-llm-skills.spec.ts › skill loading: project, user, and deletion › deleting a user skill removes it from subsequent conversations	13.7s
✅	mock-llm-ui-regressions.spec.ts › UI regressions › scopes standalone styles to the agent-server-ui shell	1.3s
✅	mock-llm-ui-regressions.spec.ts › UI regressions › renders critic results on agent messages and finish actions	1.5s
✅	mock-llm-ui-regressions.spec.ts › UI regressions › loads older events when scrolling up	1.6s
✅	mock-llm-ui-regressions.spec.ts › UI regressions › selected workspace persists after navigating away and returning	2.4s
✅	mock-llm-ui-regressions.spec.ts › UI regressions › cleared sessionStorage yields empty workspace selection	951ms

_{Posted by the Mock-LLM E2E workflow · results are deterministic (scripted LLM responses)}

github-actions · 2026-06-12T03:37:32Z

📸 Snapshot Test Report

Warning

Snapshot comparison step crashed (timeout, OOM, or runner error) — diff results below may be incomplete or absent.
Check the CI logs for the full error output (look for the "Run snapshot comparison" step).

❌ 8 snapshots differ from the main branch baselines. Add the update-snapshots label to acknowledge intentional changes.

Category	Count
🔴 Changed	8
🆕 New	0
✅ Unchanged	66
Total	74

How to resolve:

Unintentional diffs — the baselines on main may have moved since this branch was created. Merge the latest main into this branch and re-run CI.

Intentional changes — add the update-snapshots label. CI will pass and the new screenshots become the baseline when this PR merges.

🔴 Changed snapshots (8)

`archived-conversation`

conversation-view-archived

Expected (main)	Actual (PR)	Diff

`automations`

automations-no-automations

Expected (main)	Actual (PR)	Diff

`changes-tab`

changes-empty

Expected (main)	Actual (PR)	Diff

`collapsible-thinking`

think-action-collapsed

Expected (main)	Actual (PR)	Diff

`onboarding`

onboarding-step-3-say-hello

Expected (main)	Actual (PR)	Diff

`settings-page` — 2 snapshots

analytics-consent-modal

Expected (main)	Actual (PR)	Diff

settings-app-page

Expected (main)	Actual (PR)	Diff

`skills-page`

skills-no-match

Expected (main)	Actual (PR)	Diff

✅ Unchanged snapshots (66)

archived-conversation

conversation-panel-with-archived-badges
conversation-view-sandbox-error

automations

automations-delete-modal
automations-list-active-inactive
automations-search-no-results

backends-extended

backend-add-blank-disabled
backend-add-cloud-advanced-open
backend-add-cloud-no-key-disabled
backend-add-cloud-with-key-enabled
backend-add-form-partially-filled
backend-add-invalid-url-disabled
backend-add-local-ready
backend-add-name-only-disabled
backend-add-two-column-layout
backend-add-whitespace-host-disabled
backend-after-switch
backend-cancel-nothing-saved
backend-dropdown-two-backends
backend-edit-prefilled
backend-manage-after-removal
backend-manage-two-listed
backend-remove-cancelled
backend-remove-confirmation
backend-switch-overlay

backends

backend-add-modal
backend-manage-modal
backend-selector-open

changes-tab

changes-deleted-file
changes-diff-viewer

collapsible-thinking

reasoning-content-collapsed
reasoning-content-expanded
think-action-expanded

mcp-page

mcp-custom-server-1-editor-open
mcp-custom-server-2-url-filled
mcp-custom-server-3-all-filled
mcp-custom-server-4-installed
mcp-custom-server-editor
mcp-empty-installed
mcp-search-filtered
mcp-slack-install-1-marketplace
mcp-slack-install-2-modal
mcp-slack-install-3-filled
mcp-slack-install-4-installed

onboarding

onboarding-step-0-check-backend
onboarding-step-1-choose-agent
onboarding-step-2-setup-llm

projects-workspace-browser

projects-workspace-browser

settings-page

add-backend-modal
home-screen
settings-page

settings-secrets

secrets-add-form-filled
secrets-add-form
secrets-after-save
secrets-delete-confirm
secrets-list

settings-verification

condenser-settings
verification-settings-critic-enabled
verification-settings-off
verification-settings-on

sidebar

sidebar-collapsed
sidebar-conversation-panel
sidebar-filter-menu

skills-page

skills-empty
skills-loaded
skills-search-filtered
skills-type-filter

Generated by the Snapshot Tests workflow. This comment was created by an AI agent (OpenHands) on behalf of the repo maintainers.

github-actions · 2026-06-12T03:43:07Z

🛑 Mock-LLM Docker E2E Test Results

30/35 passed · 5 skipped · ⚠️ 8 not run (process killed at 35/43)

Commit: 9216274c · Workflow run · Test artifacts

Status	Test	Duration
✅	chromium › mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 1: configure ACP agent via Settings → Agent UI	13.7s
✅	chromium › mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 2: reload and verify ACP settings are persisted in UI	5.6s
✅	chromium › mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 3: start ACP conversation and verify agent reply	6.7s
✅	chromium › mock-llm-acp-agent.spec.ts › mock-LLM ACP agent conversation › step 4: resume ACP conversation from sidebar after navigating away	5.7s
✅	chromium › mock-llm-auth-modes.spec.ts › auth mode: fresh install with runtime-injected key › reaches the onboarding modal without pre-seeded localStorage	1.3s
✅	chromium › mock-llm-auth-modes.spec.ts › auth mode: non-public key rotation › recovers when localStorage has a stale session API key	5.3s
✅	chromium › mock-llm-auth-modes.spec.ts › auth mode: public gate › shows the auth screen when no key is configured	1.2s
✅	chromium › mock-llm-auth-modes.spec.ts › auth mode: public gate › rejects an incorrect key with an inline error	1.3s
✅	chromium › mock-llm-auth-modes.spec.ts › auth mode: public gate › allows access after pasting the correct key	1.7s
✅	chromium › mock-llm-auth-modes.spec.ts › auth mode: public gate › skips auth screen for returning user with valid stored key	752ms
✅	chromium › mock-llm-auth-modes.spec.ts › auth mode: public gate › re-prompts when the server rotates its key (stale localStorage)	1.5s
✅	chromium › mock-llm-automation.spec.ts › mock-LLM automation lifecycle › step 1: setup LLM profile and register automation trajectory	8.9s
✅	chromium › mock-llm-automation.spec.ts › mock-LLM automation lifecycle › step 2: create automation and dispatch run via the UI	32.5s
✅	chromium › mock-llm-automation.spec.ts › mock-LLM automation lifecycle › step 3: verify automation and run on the automations page	6.2s
✅	chromium › mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 1: create an LLM profile pointing at the mock LLM server	6.3s
✅	chromium › mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 2: activate the mock-llm profile and verify settings API	6.1s
✅	chromium › mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 3: run a conversation with the mock LLM	6.3s
✅	chromium › mock-llm-conversation.spec.ts › mock-LLM agent-server conversation › step 4: resume conversation from sidebar after navigating away	5.7s
⏭️	chromium › mock-llm-cross-connect.spec.ts › cross-connect: frontend-only → backend-only › frontend-only connects to a separate backend-only instance	192ms
⏭️	chromium › mock-llm-cross-connect.spec.ts › cross-connect: frontend-only → multiple backends › connects to two separate backends and switches between them	178ms
✅	chromium › mock-llm-image-upload.spec.ts › mock-LLM image upload › attaching an image embeds it as base64 in the LLM completion call	13.3s
✅	chromium › mock-llm-model-switch.spec.ts › mock-LLM /model slash command › step 1: configure LLM, create switch-target profile, register trajectory	13.2s
✅	chromium › mock-llm-model-switch.spec.ts › mock-LLM /model slash command › step 2: start conversation, switch profile via /model, verify switch	6.7s
✅	chromium › mock-llm-onboarding-happy-path.spec.ts › onboarding happy path › completes the full onboarding flow and launches a conversation	3.4s
✅	chromium › mock-llm-onboarding-regressions.spec.ts › onboarding recent regressions › keeps the modal open on backdrop click and Escape	1.4s
✅	chromium › mock-llm-onboarding-regressions.spec.ts › onboarding recent regressions › defaults the LLM setup step to OpenAI GPT-5.5	1.6s
⏭️	chromium › mock-llm-partial-stack.spec.ts › partial stack: --frontend-only › serves the frontend but returns 503 for backend routes	180ms
✅	chromium › mock-llm-partial-stack.spec.ts › partial stack: --backend-only › serves backend APIs but returns 503 for the frontend root	26.2s
⏭️	chromium › mock-llm-partial-stack.spec.ts › partial stack: port conflict › fails with a clear error when the ingress port is occupied	0ms
⏭️	chromium › mock-llm-partial-stack.spec.ts › partial stack: port conflict › starts successfully on a free port after a conflict	9ms
✅	chromium › mock-llm-preset-automation.spec.ts › preset automation → slash command conversation › automation card sends the correct slash command to a conversation	16.2s
✅	chromium › mock-llm-preset-automation.spec.ts › preset automation → slash command conversation › direct slash command from home page triggers skill activation	13.3s
✅	chromium › mock-llm-profile-management.spec.ts › active profile deletion + reconciliation › active profile is deletable and reconciliation activates another profile	8.5s
✅	chromium › mock-llm-profile-management.spec.ts › same-model profile identity › chat header shows the correct profile when two profiles share the same model	14.7s
✅	chromium › mock-llm-profile-management.spec.ts › litellm_proxy proxy base_url preservation › re-saving a litellm_proxy profile from Basic view preserves the proxy base_url	8.3s

_{Posted by the Mock-LLM E2E workflow · results are deterministic (scripted LLM responses)}

HeyItsChloe added 2 commits June 8, 2026 12:39

vercel Bot deployed to Preview June 12, 2026 03:28 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: use-active-conversation updates when agent checks out new branch#1324

fix: use-active-conversation updates when agent checks out new branch#1324
HeyItsChloe wants to merge 2 commits into
mainfrom
fix/use-active-conversation-branch-update

HeyItsChloe commented Jun 12, 2026 •

edited by github-actions Bot

Loading

Uh oh!

vercel Bot commented Jun 12, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 12, 2026

Uh oh!

github-actions Bot commented Jun 12, 2026

`archived-conversation`

`automations`

`changes-tab`

`collapsible-thinking`

`onboarding`

`settings-page` — 2 snapshots

`skills-page`

Uh oh!

github-actions Bot commented Jun 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

HeyItsChloe commented Jun 12, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why

Changes

Test Results

Uh oh!

vercel Bot commented Jun 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jun 12, 2026

✅ Mock-LLM E2E Tests

Uh oh!

github-actions Bot commented Jun 12, 2026

📸 Snapshot Test Report

archived-conversation

automations

changes-tab

collapsible-thinking

onboarding

settings-page — 2 snapshots

skills-page

Uh oh!

github-actions Bot commented Jun 12, 2026

🛑 Mock-LLM Docker E2E Test Results

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

HeyItsChloe commented Jun 12, 2026 •

edited by github-actions Bot

Loading

vercel Bot commented Jun 12, 2026 •

edited

Loading

`archived-conversation`

`automations`

`changes-tab`

`collapsible-thinking`

`onboarding`

`settings-page` — 2 snapshots

`skills-page`