Cache default branch resolution#733
Closed
cschubiner wants to merge 35 commits intogeneralaction:mainfrom
Closed
Conversation
Fix agent switch hotkeys
Add Cmd+Shift+J and Cmd+Shift+K to cycle through agents (conversations) working on the same task. This complements the existing Cmd+Arrow keys that switch between tasks. - Add cmd+shift compound modifier support to keyboard shortcuts - Add NEXT_AGENT/PREV_AGENT shortcuts in useKeyboardShortcuts - Use custom events to communicate between App and ChatInterface - Fix duplicate ShortcutModifier type in CommandPalette Co-Authored-By: Claude Opus 4.5 <[email protected]>
Add Next Agent and Previous Agent commands to the command palette for discoverability of the Cmd+Shift+J/K shortcuts. Co-Authored-By: Claude Opus 4.5 <[email protected]>
The shortcut display was only showing the key without the modifiers for compound modifiers like cmd+shift. Co-Authored-By: Claude Opus 4.5 <[email protected]>
Add agent switch hotkeys + palette entries
# Conflicts: # src/renderer/components/AppKeyboardShortcuts.tsx # src/renderer/hooks/useKeyboardShortcuts.ts
Co-Authored-By: Claude Opus 4.5 <[email protected]>
Sort repositories by most recent task activity (descending) and tasks within each repository by updatedAt (descending). This replaces the previous localStorage-based custom drag-and-drop ordering. Co-Authored-By: Claude Opus 4.5 <[email protected]>
…#709) * fix: build each mac architecture separately to fix native module mismatch (generalaction#706) * fix: fail verification if no app bundles found
…neralaction#711) Removes the ensureClaudeAutoApprove functionality since auto-approve is already handled via CLI flags when launching agents. Fixes generalaction#708
* feat: add task archive functionality - Add archivedAt column to tasks table with migration - Add archive/restore/getArchivedTasks methods to DatabaseService - Add IPC handlers and expose via preload - Add Archive option to task context menu in sidebar - Add collapsible Archived section showing archived tasks per project - Add restore button on hover for archived tasks - Archived tasks are hidden from main list but preserved in database - Restored tasks appear at top of list (updatedAt is refreshed) * feat: add delete button for archived tasks - Add delete button next to restore button in archived tasks section - Use same Trash icon and styling as other delete buttons - Add proper Radix UI tooltips for both restore and delete buttons * feat: add archive button to ProjectMainView - Add archive button next to delete for individual tasks - Add bulk archive in select mode (Archive button next to Delete) - Pass onArchiveTask prop from App to ProjectMainView - Edge case already handled: archiving active task clears active state * format * fix: address bugbot issues for archive feature - Add silent option to handleArchiveTask for bulk operations - Pass silent: true from bulk archive to prevent duplicate toasts - Add restoringTaskIdsRef to prevent duplicate restore operations * format * fix: handle archive edge cases - Add background PTY cleanup on archive (kills running agents) - Return boolean from handleArchiveTask for bulk error detection - Add taskSnapshot fallback if refresh fails after archive error * fix: add confirmation dialog and restore fallback - Use TaskDeleteButton for archived task deletion (adds confirmation dialog) - Add fallback to manually add task to active list if getTasks fails after restore * fix: archive refresh race condition and status reset - Add archivedTasksVersion to trigger sidebar refresh after archive completes - Fixes race condition where sidebar refetched before DB was updated - Reset task status to 'idle' on archive since PTY processes are killed * fix: fetch archived tasks when projects load * fix: add archive guard and restore fallback order
Rebase local commits atop upstream main
Co-authored-by: rokt-clayschubiner <[email protected]>
Co-authored-by: rokt-clayschubiner <[email protected]>
…itial-prompt Persist last task agents and expose initial prompt
Fix task agent defaults fallback
Co-authored-by: rokt-clayschubiner <[email protected]>
Brings in upstream changes including: - Terminal keybindings module - Open-in menu improvements - Telemetry updates - Various UI enhancements Resolved conflicts: - package.json/package-lock.json: took upstream version (0.4.1) - App.tsx: kept sortByRecency feature for left sidebar - MultiAgentTask.tsx: kept split-view implementation Co-Authored-By: Claude Opus 4.5 <[email protected]>
Merge upstream (generalaction:main) into main
Co-authored-by: rokt-clayschubiner <[email protected]>
|
@rokt-clayschubiner is attempting to deploy a commit to the General Action Team on Vercel. A member of the Team first needs to authorize it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary\n- add a small in-memory cache for default branch lookups\n- reuse cached default branch in git commit-and-push\n\n## Testing\n- not run (not requested)