fix: roll back target on adopt retire failure · Entire

fix: roll back target on adopt retire failure

3734030→main· peyton-alt·2w ago·2 files·+215 added/-0 removed

Sessions

0ed46044b4c8View transcript

?\ Session Adoption and Worktree Management FixesCodex·1 step

Changes

2

173 unmodified lines

174
175
176
177
178
179
180
181
182
6 unmodified lines

189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207

173 unmodified lines

}
        retired := retireAdoptedSourceSession(sourceState, next)
        if err := sourceStore.Save(ctx, &retired); err != nil {
            if rollbackErr := rollbackExternalAdoptTarget(ctx, targetStore, next.SessionID, existing); rollbackErr != nil {
                return fmt.Errorf("retire source session state: %w; rollback adopted target session state: %w", err, rollbackErr)
            }
            return fmt.Errorf("retire source session state: %w", err)
        }
        adopted = next
6 unmodified lines

return adopted, filesTouched, nil
}

func rollbackExternalAdoptTarget(ctx context.Context, targetStore *session.StateStore, sessionID string, previous *session.State) error {
    if previous == nil {
        if err := targetStore.Clear(ctx, sessionID); err != nil {
            return fmt.Errorf("clear adopted target session state: %w", err)
        }
        return nil
    }
    if err := targetStore.Save(ctx, previous); err != nil {
        return fmt.Errorf("restore previous target session state: %w", err)
    }
    return nil
}

func retireAdoptedSourceSession(source, target *session.State) session.State {
    now := time.Now()
    retired := cloneAdoptSourceState(source)

Mcmd/entire/cli/session_adopt.go+16

248 unmodified lines

249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453

248 unmodified lines

}

func TestSessionAdopt_ExternalStoreRollsBackTargetWhenSourceRetireFails(t *testing.T) {
    if runtime.GOOS == windowsGOOS {
        t.Skip("uses POSIX directory permissions to force source save failure")
    }

sourceRepo := setupAdoptRepo(t)
    targetRepo := setupAdoptRepo(t)

sessionID := "test-adopt-retire-rollback"
    lastInteraction := time.Now().Add(-1 * time.Minute)
    sourceStateDir := filepath.Join(sourceRepo, ".git", session.SessionStateDirName)
    sourceStore := session.NewStateStoreWithDir(sourceStateDir)
    if err := sourceStore.Save(context.Background(), &session.State{
        SessionID:             sessionID,
        AgentType:             agent.AgentTypeClaudeCode,
        StartedAt:             time.Now().Add(-5 * time.Minute),
        LastInteractionTime:   &lastInteraction,
        Phase:                 session.PhaseActive,
        BaseCommit:            testutil.GetHeadHash(t, sourceRepo),
        AttributionBaseCommit: testutil.GetHeadHash(t, sourceRepo),
        WorktreePath:          sourceRepo,
        LastPrompt:            "move this session",
    }); err != nil {
        t.Fatal(err)
    }

testutil.WriteFile(t, targetRepo, "feature.txt", "agent change\n")
    t.Chdir(targetRepo)
targetStore, err := session.NewStateStore(context.Background())
    if err != nil {
        t.Fatal(err)
    }
    if err := targetStore.Save(context.Background(), &session.State{
        SessionID:             sessionID,
        AgentType:             agent.AgentTypeClaudeCode,
        StartedAt:             time.Now().Add(-10 * time.Minute),
        Phase:                 session.PhaseIdle,
        BaseCommit:            testutil.GetHeadHash(t, targetRepo),
        AttributionBaseCommit: testutil.GetHeadHash(t, targetRepo),
        WorktreePath:          targetRepo,
        LastPrompt:            "preexisting target state",
    }); err != nil {
        t.Fatal(err)
    }

_, _, sourceCommonDir, err := stateStoreForWorktree(context.Background(), sourceRepo)
    if err != nil {
        t.Fatal(err)
    }
    _, _, targetCommonDir, err := stateStoreForWorktree(context.Background(), targetRepo)
    if err != nil {
        t.Fatal(err)
    }

info, err := os.Stat(sourceStateDir)
    if err != nil {
        t.Fatal(err)
    }
    restoreSourceStateDir := func() error {
        return os.Chmod(sourceStateDir, info.Mode().Perm())
    }
    if err := os.Chmod(sourceStateDir, 0o500); err != nil {
        t.Fatal(err)
    }
    t.Cleanup(func() {
        if err := restoreSourceStateDir(); err != nil {
            t.Logf("restore source state dir permissions: %v", err)
        }
    })

_, _, err = adoptFromExternalSessionStore(
        context.Background(),
        sourceStore,
        sourceRepo,
        sourceCommonDir,
        targetStore,
        targetCommonDir,
        sessionID,
        adoptOptions{Force: true},
    )
    if err := restoreSourceStateDir(); err != nil {
        t.Fatalf("restore source state dir permissions: %v", err)
    }
    if err == nil {
        t.Fatal("adoptFromExternalSessionStore succeeded, want source-retire failure")
    }
    if !strings.Contains(err.Error(), "retire source session state") {
        t.Fatalf("adoptFromExternalSessionStore error = %v, want source-retire failure", err)
    }

loadedTarget, err := targetStore.Load(context.Background(), sessionID)
    if err != nil {
        t.Fatal(err)
    }
    if loadedTarget == nil {
        t.Fatal("target rollback removed preexisting state, want restore")
    }
    if loadedTarget.LastPrompt != "preexisting target state" {
        t.Fatalf("target LastPrompt after rollback = %q, want preexisting target state", loadedTarget.LastPrompt)
    }
    if loadedTarget.Phase != session.PhaseIdle {
        t.Fatalf("target Phase after rollback = %q, want idle", loadedTarget.Phase)
    }

sourceAfter, err := sourceStore.Load(context.Background(), sessionID)
    if err != nil {
        t.Fatal(err)
    }
    if sourceAfter == nil || sourceAfter.Phase != session.PhaseActive {
        t.Fatalf("source state after failed adoption = %#v, want original active state", sourceAfter)
    }
}

func TestSessionAdopt_ExternalStoreClearsNewTargetWhenSourceRetireFails(t *testing.T) {
    if runtime.GOOS == windowsGOOS {
        t.Skip("uses POSIX directory permissions to force source save failure")
    }

sourceRepo := setupAdoptRepo(t)
    targetRepo := setupAdoptRepo(t)

sessionID := "test-adopt-retire-clear-target"
    lastInteraction := time.Now().Add(-1 * time.Minute)
    sourceStateDir := filepath.Join(sourceRepo, ".git", session.SessionStateDirName)
    sourceStore := session.NewStateStoreWithDir(sourceStateDir)
    if err := sourceStore.Save(context.Background(), &session.State{
        SessionID:             sessionID,
        AgentType:             agent.AgentTypeClaudeCode,
        StartedAt:             time.Now().Add(-5 * time.Minute),
        LastInteractionTime:   &lastInteraction,
        Phase:                 session.PhaseActive,
        BaseCommit:            testutil.GetHeadHash(t, sourceRepo),
        AttributionBaseCommit: testutil.GetHeadHash(t, sourceRepo),
        WorktreePath:          sourceRepo,
        LastPrompt:            "move this session",
    }); err != nil {
        t.Fatal(err)
    }

testutil.WriteFile(t, targetRepo, "feature.txt", "agent change\n")
    t.Chdir(targetRepo)
targetStore, err := session.NewStateStore(context.Background())
    if err != nil {
        t.Fatal(err)
    }
    _, _, sourceCommonDir, err := stateStoreForWorktree(context.Background(), sourceRepo)
    if err != nil {
        t.Fatal(err)
    }
    _, _, targetCommonDir, err := stateStoreForWorktree(context.Background(), targetRepo)
    if err != nil {
        t.Fatal(err)
    }

loadedTarget, err := targetStore.Load(context.Background(), sessionID)
    if err != nil {
        t.Fatal(err)
    }
    if loadedTarget != nil {
        t.Fatalf("target state after rollback = %#v, want nil", loadedTarget)
    }
}

func TestSessionAdopt_ClearsSourceOwner(t *testing.T) {
    sourceRepo := setupAdoptRepo(t)
    targetRepo := setupAdoptRepo(t)