Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

fix(mobile): fully unstage renamed files (#34955)

OrcaWinfad768d9fce7
diff --git a/mobile/src/session/mobile-diff-review-git-operations.ts b/mobile/src/session/mobile-diff-review-git-operations.ts
index 24026d1363c..28f5f0399c0 100644
--- a/mobile/src/session/mobile-diff-review-git-operations.ts
+++ b/mobile/src/session/mobile-diff-review-git-operations.ts
@@ -4,7 +4,7 @@ import { reviewGitMutationSchema } from './diff-review-reply-schema'
import type { GitMutationMethod } from './mobile-diff-review-screen-model'
// Single-file refusals surface host text; bulk stage tallies failures and continues so one locked file cannot abort the sweep.
-function reviewGitMutation(name: string, method: GitMutationMethod) {
+function reviewGitMutation(name: string, method: GitMutationMethod | 'git.bulkUnstage') {
return bindDeferredRpcOperation(
defineRpcOperation({
name,
@@ -18,6 +18,7 @@ function reviewGitMutation(name: string, method: GitMutationMethod) {
export const reviewGitStage = reviewGitMutation('git.review-stage', 'git.stage')
export const reviewGitUnstage = reviewGitMutation('git.review-unstage', 'git.unstage')
+export const reviewGitBulkUnstage = reviewGitMutation('git.review-bulk-unstage', 'git.bulkUnstage')
export const reviewGitDiscard = reviewGitMutation('git.review-discard', 'git.discard')
export const reviewGitStageRun = bindDeferredRpcOperation(
diff --git a/mobile/src/session/use-mobile-diff-review-git-actions.test.ts b/mobile/src/session/use-mobile-diff-review-git-actions.test.ts
new file mode 100644
index 00000000000..40708a7564a
--- /dev/null
+++ b/mobile/src/session/use-mobile-diff-review-git-actions.test.ts
@@ -0,0 +1,78 @@
+import { createElement } from 'react'
+import { act, create } from 'react-test-renderer'
+import { describe, expect, it, vi } from 'vitest'
+import type { RpcClient } from '../transport/rpc-client'
+import type { RpcResponse } from '../transport/types'
+import type { MobileDiffReviewQueueItem } from './mobile-diff-review-queue'
+import { useMobileDiffReviewGitActions } from './use-mobile-diff-review-git-actions'
+
+vi.mock('../platform/haptics', () => ({ triggerSuccess: vi.fn(), triggerError: vi.fn() }))
+
+const RENAMED_STAGED: MobileDiffReviewQueueItem = {
+ key: 'staged:after.txt',
+ scope: 'staged',
+ area: 'staged',
+ filePath: 'after.txt',
+ oldPath: 'before.txt',
+ status: 'renamed',
+ title: 'after.txt',
+ subtitle: '',
+ canStage: false,
+ canUnstage: true,
+ canDiscard: false,
+ isGeneratedOrLockFile: false,
+ diffIdentity: 'id',
+ noteCount: 0,
+ unsentNoteCount: 0,
+ staleNoteCount: 0,
+ isReviewed: false,
+ changedSinceReview: false
+}
+
+describe('useMobileDiffReviewGitActions', () => {
+ it('unstages both sides of a staged rename in one bulk request', async () => {
+ const sendRequest = vi.fn<RpcClient['sendRequest']>(async (): Promise<RpcResponse> => ({
+ id: 'rpc',
+ ok: true,
+ result: {},
+ _meta: { runtimeId: 'r' }
+ }))
+ const client: RpcClient = {
+ sendRequest,
+ subscribe: () => () => {},
+ updateTerminalSubscriptionViewport: () => {},
+ getState: () => 'connected',
+ getReconnectAttempt: () => 0,
+ getLastConnectedAt: () => null,
+ onStateChange: () => () => {},
+ notifyForeground: () => {},
+ close: () => {}
+ }
+ const setActionError = vi.fn()
+ let actions: ReturnType<typeof useMobileDiffReviewGitActions> | null = null
+ function Probe() {
+ actions = useMobileDiffReviewGitActions({
+ client,
+ connState: 'connected',
+ worktreeId: 'wt-1',
+ queue: [RENAMED_STAGED],
+ setActionError,
+ setBusyAction: () => {},
+ loadReviewData: async () => {}
+ })
+ return null
+ }
+ await act(async () => {
+ create(createElement(Probe))
+ })
+
+ await act(async () => {
+ await actions?.runGitMutation('git.unstage', RENAMED_STAGED)
+ })
+
+ expect(sendRequest.mock.calls.map(([method, params]) => [method, params])).toEqual([
+ ['git.bulkUnstage', { worktree: 'id:wt-1', filePaths: ['after.txt', 'before.txt'] }]
+ ])
+ expect(setActionError).not.toHaveBeenCalledWith(expect.any(String))
+ })
+})
diff --git a/mobile/src/session/use-mobile-diff-review-git-actions.ts b/mobile/src/session/use-mobile-diff-review-git-actions.ts
index 0edfcb79bc5..9d5b866f154 100644
--- a/mobile/src/session/use-mobile-diff-review-git-actions.ts
+++ b/mobile/src/session/use-mobile-diff-review-git-actions.ts
@@ -5,8 +5,10 @@ import type { RpcClient } from '../transport/rpc-client'
import { interpretOrThrowRefusalMessage } from '../transport/rpc-refusal-message'
import {
MOBILE_DIFF_REVIEW_GIT_MUTATIONS,
+ reviewGitBulkUnstage,
reviewGitStageRun
} from './mobile-diff-review-git-operations'
+import { getUnstageablePaths } from '../source-control/mobile-git-status'
import { triggerError, triggerSuccess } from '../platform/haptics'
import type { MobileDiffReviewQueueItem } from './mobile-diff-review-queue'
import type { GitMutationMethod } from './mobile-diff-review-screen-model'
@@ -36,15 +38,33 @@ export function useMobileDiffReviewGitActions(input: GitActionsInput) {
setBusyAction(`${method}:${item.filePath}`)
setActionError(null)
try {
- const mutation = MOBILE_DIFF_REVIEW_GIT_MUTATIONS[method]
- const response = await mutation.request(client, {
- worktree: `id:${worktreeId}`,
- filePath: item.filePath
- })
- interpretOrThrowRefusalMessage(
- () => mutation.interpret(response),
- translate('session.useDiffReviewGitActions.actionFailed', 'Source control action failed')
+ const failureMessage = translate(
+ 'session.useDiffReviewGitActions.actionFailed',
+ 'Source control action failed'
)
+ const filePaths =
+ method === 'git.unstage' && item.area === 'staged'
+ ? getUnstageablePaths([
+ { path: item.filePath, oldPath: item.oldPath, status: item.status, area: item.area }
+ ])
+ : []
+ if (filePaths.length > 1) {
+ const response = await reviewGitBulkUnstage.request(client, {
+ worktree: `id:${worktreeId}`,
+ filePaths
+ })
+ interpretOrThrowRefusalMessage(
+ () => reviewGitBulkUnstage.interpret(response),
+ failureMessage
+ )
+ } else {
+ const mutation = MOBILE_DIFF_REVIEW_GIT_MUTATIONS[method]
+ const response = await mutation.request(client, {
+ worktree: `id:${worktreeId}`,
+ filePath: item.filePath
+ })
+ interpretOrThrowRefusalMessage(() => mutation.interpret(response), failureMessage)
+ }
triggerSuccess()
await loadReviewData()
} catch (err) {
diff --git a/mobile/src/source-control/MobileSourceControlFileRows.tsx b/mobile/src/source-control/MobileSourceControlFileRows.tsx
index 8c8691d640b..c6b8b462f2c 100644
--- a/mobile/src/source-control/MobileSourceControlFileRows.tsx
+++ b/mobile/src/source-control/MobileSourceControlFileRows.tsx
@@ -15,6 +15,7 @@ import {
import type { MobileSourceControlState } from './use-mobile-source-control-state'
import { styles } from './mobile-source-control-styles'
import { mobileConflictResolutionLabel } from './mobile-source-control-conflict-actions'
+import { getUnstageablePaths } from './mobile-git-status'
type RowState = Pick<
MobileSourceControlState,
@@ -156,9 +157,12 @@ export function makeRenderFileRow(state: RowState, t: Translate) {
pressed && styles.iconButtonPressed
]}
disabled={ioBusy}
- onPress={() =>
- void runGitAction(item.unstageActionId, 'git.unstage', { filePath: item.path })
- }
+ onPress={() => {
+ const filePaths = getUnstageablePaths([item])
+ void (filePaths.length > 1
+ ? runGitAction(item.unstageActionId, 'git.bulkUnstage', { filePaths })
+ : runGitAction(item.unstageActionId, 'git.unstage', { filePath: item.path }))
+ }}
hitSlop={8}
accessibilityLabel={t('sourceControl.fileRows.unstageFile', 'Unstage {{path}}', {
path: item.path