diff --git a/Codev.Avalonia.Tests/MainWindowTests.cs b/Codev.Avalonia.Tests/MainWindowTests.cs
index dc734119..f239fd3d 100644
--- a/Codev.Avalonia.Tests/MainWindowTests.cs
+++ b/Codev.Avalonia.Tests/MainWindowTests.cs
@@ -26,7 +26,7 @@ namespace Codev.Avalonia.Tests;
 public sealed class MainWindowTests
 {
     [AvaloniaFact]
-    public async Task Child_session_rows_show_running_state_collapse_and_reopen_the_child()
+    public async Task Child_session_rows_show_running_state_can_be_reordered_and_collapse()
     {
         var root = Path.Combine(Path.GetTempPath(), "Codev-auto-mode-ui", Guid.NewGuid().ToString("N"));
         MainViewModel? viewModel = null;
@@ -40,12 +40,22 @@ public async Task Child_session_rows_show_running_state_collapse_and_reopen_the_
             {
                 Title = "Parallel child fixture",
                 ParentConversationId = parent.Id,
+                SidebarOrder = 0,
                 IsChildTaskRunning = true
             };
+            var secondChild = new Conversation
+            {
+                Title = "Second child fixture",
+                ParentConversationId = parent.Id,
+                SidebarOrder = 1
+            };
             var conversations = Assert.IsType<System.Collections.ObjectModel.ObservableCollection<Conversation>>(
                 typeof(MainViewModel).GetField("_conversations", BindingFlags.Instance | BindingFlags.NonPublic)?.GetValue(viewModel));
             conversations.Add(child);
+            conversations.Add(secondChild);
             typeof(MainViewModel).GetMethod("RebuildLists", BindingFlags.Instance | BindingFlags.NonPublic)!.Invoke(viewModel, null);
+            Assert.True(viewModel.ReorderConversation(secondChild.Id, child, insertAfter: false));
+            Assert.Equal(new[] { secondChild.Id, child.Id }, parent.ChildConversations.Select(item => item.Id));
 
             window = new MainWindow { DataContext = viewModel };
             window.Show();
@@ -55,11 +65,13 @@ public async Task Child_session_rows_show_running_state_collapse_and_reopen_the_
                 item.DataContext is Conversation conversation && conversation.Id == parent.Id);
             Assert.True(expander.IsVisible);
             Assert.True(expander.IsExpanded);
-            Assert.Equal("Child sessions · 1 · 1 running", expander.Header?.ToString());
+            Assert.Equal("Child sessions · 2 · 1 running", expander.Header?.ToString());
 
             var childRow = Assert.Single(window.GetVisualDescendants().OfType<Button>(), button =>
                 button.Content?.ToString() == "Parallel child fixture · running");
             Assert.True(childRow.IsVisible);
+            Assert.True(DragDrop.GetAllowDrop(childRow));
+            Assert.Equal("Drag to reorder within this conversation", ToolTip.GetTip(childRow));
             await Dispatcher.UIThread.InvokeAsync(() => expander.IsExpanded = false);
             window.UpdateLayout();
             Assert.False(childRow.IsEffectivelyVisible);
@@ -1856,7 +1868,7 @@ await File.WriteAllTextAsync(Path.Combine(project, "README.md"),
     }
 
     [AvaloniaFact]
-    public async Task Auto_stops_repeated_tool_loop_without_opening_confirmation_modal()
+    public async Task Auto_approves_repeated_tool_loop_without_opening_confirmation_modal()
     {
         var root = Path.Combine(Path.GetTempPath(), "Codev-auto-mode-ui", Guid.NewGuid().ToString("N"));
         var project = Path.Combine(root, "project");
@@ -1876,7 +1888,7 @@ public async Task Auto_stops_repeated_tool_loop_without_opening_confirmation_mod
             var confirm = typeof(MainViewModel).GetMethod("ConfirmRepeatedToolCallForProjectAsync", BindingFlags.Instance | BindingFlags.NonPublic)!;
             var pending = Assert.IsAssignableFrom<Task<bool>>(confirm.Invoke(viewModel, [project, "read_file"]));
 
-            Assert.False(await pending);
+            Assert.True(await pending);
             Assert.Equal(0, confirmationRequests);
         }
         finally
diff --git a/Codev.Avalonia/ViewModels/MainViewModel.cs b/Codev.Avalonia/ViewModels/MainViewModel.cs
index 6b19b8a8..6441cc6b 100644
--- a/Codev.Avalonia/ViewModels/MainViewModel.cs
+++ b/Codev.Avalonia/ViewModels/MainViewModel.cs
@@ -1598,11 +1598,11 @@ public bool ToggleConversationArchive(Codev.Conversation conversation)
 
     public bool ReorderConversation(Guid draggedId, Codev.Conversation target, bool insertAfter)
     {
+        if (!CanReorderConversation(draggedId, target)) return false;
         var dragged = _conversations.FirstOrDefault(item => item.Id == draggedId);
-        if (dragged is null || !_conversations.Contains(target) || dragged.IsPinned != target.IsPinned ||
-            dragged.IsArchived != target.IsArchived || dragged.ParentConversationId is not null || target.ParentConversationId is not null) return false;
+        if (dragged is null) return false;
 
-        var section = _conversations.Where(item => item.ParentConversationId is null &&
+        var section = _conversations.Where(item => item.ParentConversationId == dragged.ParentConversationId &&
             item.IsPinned == dragged.IsPinned && item.IsArchived == dragged.IsArchived)
             .OrderBy(item => item.SidebarOrder ?? int.MaxValue)
             .ThenByDescending(item => item.UpdatedAt).ToList();
@@ -1612,6 +1612,14 @@ public bool ReorderConversation(Guid draggedId, Codev.Conversation target, bool
         return true;
     }
 
+    public bool CanReorderConversation(Guid draggedId, Codev.Conversation target)
+    {
+        var dragged = _conversations.FirstOrDefault(item => item.Id == draggedId);
+        return dragged is not null && dragged.Id != target.Id && _conversations.Contains(target) &&
+            dragged.IsPinned == target.IsPinned && dragged.IsArchived == target.IsArchived &&
+            dragged.ParentConversationId == target.ParentConversationId;
+    }
+
     public async Task<bool> DeleteConversationAsync(Codev.Conversation conversation)
     {
         if (!_conversations.Contains(conversation)) return false;
@@ -1982,6 +1990,7 @@ public async Task<bool> RecoverChildWorktreeAsync(Codev.Conversation child)
             {
                 Id = childId,
                 ParentConversationId = parent.Id,
+                SidebarOrder = NextSidebarOrder(isPinned: false, isArchived: false, parentConversationId: parent.Id),
                 ChildWorktreeBranch = worktree.Branch,
                 ChildWorktreeStartCommit = worktree.StartCommit,
                 Title = title,
@@ -3746,11 +3755,11 @@ await Dispatcher.UIThread.InvokeAsync(() =>
 
     private async Task<bool> ConfirmRepeatedToolCallForProjectAsync(string? projectPath, string name)
     {
-        // Auto never interrupts a task with a modal. Stop the repeated-call loop at the runner's
-        // guard threshold; the runner records the stop in its transcript and asks for follow-up.
+        // OpenCode-style Auto approves the loop guard unless an explicit deny blocks a tool call.
+        // The runner still enforces the configured per-turn model-step limit.
         if (!string.IsNullOrWhiteSpace(projectPath) &&
             GetProjectCommandPermissionMode(projectPath) == Codev.ProjectCommandPermissionMode.Auto)
-            return false;
+            return true;
 
         return await Dispatcher.UIThread.InvokeAsync(async () =>
             await (ConfirmRepeatedToolCallAsync?.Invoke(name) ?? Task.FromResult(false)));
@@ -5018,7 +5027,8 @@ private void RebuildLists()
         foreach (var child in _conversations.Where(conversation => conversation.ParentConversationId is not null))
             if (conversationsById.TryGetValue(child.ParentConversationId!.Value, out var parent)) parent.ChildConversations.Add(child);
         foreach (var parent in _conversations.Where(conversation => conversation.ParentConversationId is null))
-            parent.ChildConversations = parent.ChildConversations.OrderByDescending(child => child.UpdatedAt).ToList();
+            parent.ChildConversations = parent.ChildConversations.OrderBy(child => child.SidebarOrder ?? int.MaxValue)
+                .ThenByDescending(child => child.UpdatedAt).ToList();
 
         var matched = _conversations.Where(conversation => conversation.IsArchived == _showArchived &&
             Codev.ConversationSearch.Matches(conversation, SearchText)).ToArray();
@@ -5086,8 +5096,8 @@ private static void Reset<T>(ObservableCollection<T> target, IEnumerable<T> sour
         foreach (var item in source) target.Add(item);
     }
 
-    private int NextSidebarOrder(bool isPinned, bool isArchived) => _conversations
-        .Where(item => item.ParentConversationId is null && item.IsPinned == isPinned && item.IsArchived == isArchived)
+    private int NextSidebarOrder(bool isPinned, bool isArchived, Guid? parentConversationId = null) => _conversations
+        .Where(item => item.ParentConversationId == parentConversationId && item.IsPinned == isPinned && item.IsArchived == isArchived)
         .Select(item => item.SidebarOrder ?? int.MaxValue)
         .DefaultIfEmpty(0)
         .Min() - 1;
diff --git a/Codev.Avalonia/Views/MainWindow.axaml b/Codev.Avalonia/Views/MainWindow.axaml
index 1203d5d4..404c64b5 100644
--- a/Codev.Avalonia/Views/MainWindow.axaml
+++ b/Codev.Avalonia/Views/MainWindow.axaml
@@ -104,7 +104,7 @@
                         <ItemsControl x:Name="PinnedConversationsList" ItemsSource="{Binding PinnedConversations}" IsVisible="{Binding PinnedConversationsExpanded}">
                             <ItemsControl.ItemTemplate><DataTemplate x:DataType="core:Conversation">
                                 <StackPanel>
-                                    <Button Classes="nav" Content="{Binding Title}" ToolTip.Tip="Drag to reorder within this section" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}" PointerPressed="Conversation_PointerPressed" DragDrop.AllowDrop="True" DragDrop.DragOver="Conversation_DragOver" DragDrop.Drop="Conversation_Drop">
+                                    <Button Classes="nav" Content="{Binding Title}" ToolTip.Tip="Drag to reorder within this section" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}" PointerPressed="Conversation_PointerPressed" PointerMoved="Conversation_PointerMoved" PointerReleased="Conversation_PointerReleased" DragDrop.AllowDrop="True" DragDrop.DragOver="Conversation_DragOver" DragDrop.Drop="Conversation_Drop">
                                         <Button.ContextMenu>
                                             <ContextMenu>
                                                 <MenuItem Header="Fork conversation" Tag="{Binding}" Click="ForkConversation_Click" />
@@ -118,7 +118,7 @@
                                     <Expander Header="{Binding ChildConversationsLabel}" IsExpanded="{Binding ChildConversationsExpanded, Mode=TwoWay}" IsVisible="{Binding HasChildConversations}" Margin="10,0,0,3" FontSize="10">
                                         <ItemsControl ItemsSource="{Binding ChildConversations}">
                                             <ItemsControl.ItemTemplate><DataTemplate x:DataType="core:Conversation">
-                                                <Button Classes="nav" Content="{Binding ChildConversationLabel}" Padding="12,5" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}">
+                                                <Button Classes="nav" Content="{Binding ChildConversationLabel}" ToolTip.Tip="Drag to reorder within this conversation" Padding="12,5" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}" PointerPressed="Conversation_PointerPressed" PointerMoved="Conversation_PointerMoved" PointerReleased="Conversation_PointerReleased" DragDrop.AllowDrop="True" DragDrop.DragOver="Conversation_DragOver" DragDrop.Drop="Conversation_Drop">
                                                     <Button.ContextMenu>
                                                         <ContextMenu>
                                                             <MenuItem Header="Rename…" Tag="{Binding}" Click="RenameConversation_Click" />
@@ -137,7 +137,7 @@
                         <ItemsControl x:Name="RecentConversationsList" ItemsSource="{Binding RecentConversations}" IsVisible="{Binding RecentConversationsExpanded}">
                             <ItemsControl.ItemTemplate><DataTemplate x:DataType="core:Conversation">
                                 <StackPanel>
-                                    <Button Classes="nav" Content="{Binding Title}" ToolTip.Tip="Drag to reorder within this section" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}" PointerPressed="Conversation_PointerPressed" DragDrop.AllowDrop="True" DragDrop.DragOver="Conversation_DragOver" DragDrop.Drop="Conversation_Drop">
+                                    <Button Classes="nav" Content="{Binding Title}" ToolTip.Tip="Drag to reorder within this section" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}" PointerPressed="Conversation_PointerPressed" PointerMoved="Conversation_PointerMoved" PointerReleased="Conversation_PointerReleased" DragDrop.AllowDrop="True" DragDrop.DragOver="Conversation_DragOver" DragDrop.Drop="Conversation_Drop">
                                         <Button.ContextMenu>
                                             <ContextMenu>
                                                 <MenuItem Header="Fork conversation" Tag="{Binding}" Click="ForkConversation_Click" />
@@ -151,7 +151,7 @@
                                     <Expander Header="{Binding ChildConversationsLabel}" IsExpanded="{Binding ChildConversationsExpanded, Mode=TwoWay}" IsVisible="{Binding HasChildConversations}" Margin="10,0,0,3" FontSize="10">
                                         <ItemsControl ItemsSource="{Binding ChildConversations}">
                                             <ItemsControl.ItemTemplate><DataTemplate x:DataType="core:Conversation">
-                                                <Button Classes="nav" Content="{Binding ChildConversationLabel}" Padding="12,5" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}">
+                                                <Button Classes="nav" Content="{Binding ChildConversationLabel}" ToolTip.Tip="Drag to reorder within this conversation" Padding="12,5" Command="{Binding $parent[Window].DataContext.SelectConversationCommand}" CommandParameter="{Binding}" PointerPressed="Conversation_PointerPressed" PointerMoved="Conversation_PointerMoved" PointerReleased="Conversation_PointerReleased" DragDrop.AllowDrop="True" DragDrop.DragOver="Conversation_DragOver" DragDrop.Drop="Conversation_Drop">
                                                     <Button.ContextMenu>
                                                         <ContextMenu>
                                                             <MenuItem Header="Rename…" Tag="{Binding}" Click="RenameConversation_Click" />
diff --git a/Codev.Avalonia/Views/MainWindow.axaml.cs b/Codev.Avalonia/Views/MainWindow.axaml.cs
index 363ba823..3eb81341 100644
--- a/Codev.Avalonia/Views/MainWindow.axaml.cs
+++ b/Codev.Avalonia/Views/MainWindow.axaml.cs
@@ -16,6 +16,11 @@ namespace Codev.Avalonia.Views;
 public partial class MainWindow : Window
 {
     private static readonly DataFormat<string> ConversationDragFormat = DataFormat.CreateStringApplicationFormat("Codev.ConversationId");
+    private Button? _conversationDragSource;
+    private Codev.Conversation? _conversationDragCandidate;
+    private IPointer? _conversationDragPointer;
+    private PointerPressedEventArgs? _conversationDragTrigger;
+    private Point _conversationDragStart;
     private INotifyCollectionChanged? _observedMessages;
     private bool _followOutput = true;
     private bool _scrollPending;
@@ -150,20 +155,53 @@ private void Composer_Drop(object? sender, DragEventArgs e)
         viewModel.AddContextFiles(paths);
     }
 
-    private async void Conversation_PointerPressed(object? sender, PointerPressedEventArgs e)
+    private void Conversation_PointerPressed(object? sender, PointerPressedEventArgs e)
     {
         if (sender is not Button { DataContext: Codev.Conversation conversation } button ||
             !e.GetCurrentPoint(button).Properties.IsLeftButtonPressed) return;
 
+        _conversationDragSource = button;
+        _conversationDragCandidate = conversation;
+        _conversationDragPointer = e.Pointer;
+        _conversationDragTrigger = e;
+        _conversationDragStart = e.GetPosition(button);
+    }
+
+    private async void Conversation_PointerMoved(object? sender, PointerEventArgs e)
+    {
+        if (_conversationDragSource is not { } button || _conversationDragCandidate is not { } conversation ||
+            _conversationDragTrigger is not { } trigger ||
+            !ReferenceEquals(_conversationDragPointer, e.Pointer) || !e.GetCurrentPoint(button).Properties.IsLeftButtonPressed) return;
+
+        var position = e.GetPosition(button);
+        var delta = position - _conversationDragStart;
+        if (delta.X * delta.X + delta.Y * delta.Y < 36) return;
+
         var transfer = new DataTransfer();
         transfer.Add(DataTransferItem.Create(ConversationDragFormat, conversation.Id.ToString("D")));
-        await DragDrop.DoDragDropAsync(e, transfer, DragDropEffects.Move);
+        ClearConversationDragCandidate();
+        await DragDrop.DoDragDropAsync(trigger, transfer, DragDropEffects.Move);
+    }
+
+    private void Conversation_PointerReleased(object? sender, PointerReleasedEventArgs e)
+    {
+        if (ReferenceEquals(_conversationDragPointer, e.Pointer)) ClearConversationDragCandidate();
+    }
+
+    private void ClearConversationDragCandidate()
+    {
+        _conversationDragSource = null;
+        _conversationDragCandidate = null;
+        _conversationDragPointer = null;
+        _conversationDragTrigger = null;
     }
 
     private void Conversation_DragOver(object? sender, DragEventArgs e)
     {
-        e.DragEffects = e.DataTransfer.Contains(ConversationDragFormat) && sender is Button { DataContext: Codev.Conversation }
-            ? DragDropEffects.Move : DragDropEffects.None;
+        e.DragEffects = e.DataTransfer.TryGetValue(ConversationDragFormat) is { } rawId && Guid.TryParse(rawId, out var draggedId) &&
+            sender is Button { DataContext: Codev.Conversation target } &&
+            DataContext is ViewModels.MainViewModel viewModel && viewModel.CanReorderConversation(draggedId, target)
+                ? DragDropEffects.Move : DragDropEffects.None;
     }
 
     private void Conversation_Drop(object? sender, DragEventArgs e)
diff --git a/Codev.Tests/OllamaCodeTaskRunnerTests.cs b/Codev.Tests/OllamaCodeTaskRunnerTests.cs
index 4bd15936..71925850 100644
--- a/Codev.Tests/OllamaCodeTaskRunnerTests.cs
+++ b/Codev.Tests/OllamaCodeTaskRunnerTests.cs
@@ -216,6 +216,33 @@ [new OllamaCodeTaskMessage("user", "list files")], [],
         Assert.Contains("same tool call repeated", result.Transcript);
     }
 
+    [Fact]
+    public async Task Auto_approves_repeated_identical_tool_calls_until_the_shared_step_limit()
+    {
+        var requests = 0;
+        using var http = new HttpClient(new ResponseHandler(_ =>
+        {
+            requests++;
+            return Json("""{"message":{"role":"assistant","content":"","tool_calls":[{"function":{"name":"list_files","arguments":{}}}]}}""");
+        }));
+        var executed = 0;
+        var autoApprovals = 0;
+        var runner = new OllamaCodeTaskRunner(http);
+
+        var result = await runner.RunAsync(new Uri("http://127.0.0.1:11434/"), "qwen-test",
+            [new OllamaCodeTaskMessage("user", "list files")], [],
+            think: false, numCtx: 0, temperature: null, topP: null, topK: null,
+            presencePenalty: null, repeatPenalty: null, numPredict: null,
+            executeTool: (_, _, _) => { executed++; return Task.FromResult("entries"); },
+            confirmRepeatedToolCall: (_, _, _) => { autoApprovals++; return Task.FromResult(true); });
+
+        Assert.Equal(CodeTaskLimits.MaxModelStepsPerTurn, requests);
+        Assert.Equal(requests, executed);
+        Assert.Equal(2, autoApprovals);
+        Assert.True(result.ReachedStepLimit);
+        Assert.Contains($"{CodeTaskLimits.MaxModelStepsPerTurn}-step limit", result.Transcript);
+    }
+
     [Fact]
     public async Task Cancellation_after_tool_execution_prevents_another_request()
     {
diff --git a/Codev.Tests/OpenAiCodeTaskRunnerTests.cs b/Codev.Tests/OpenAiCodeTaskRunnerTests.cs
index 35270d28..5c4538b4 100644
--- a/Codev.Tests/OpenAiCodeTaskRunnerTests.cs
+++ b/Codev.Tests/OpenAiCodeTaskRunnerTests.cs
@@ -140,7 +140,7 @@ public async Task Repeated_identical_function_call_stops_after_user_declines()
     }
 
     [Fact]
-    public async Task Allowing_one_repeated_call_resets_guard_before_prompting_again()
+    public async Task Auto_approves_repeated_function_calls_until_the_shared_step_limit()
     {
         var requests = 0;
         using var http = new HttpClient(new ResponseHandler(_ =>
@@ -156,12 +156,12 @@ public async Task Allowing_one_repeated_call_resets_guard_before_prompting_again
         var result = await runner.RunAsync("gpt-test", [new { role = "user", content = "list files" }], [],
             (_, _, _) => Task.FromResult("key"),
             (_, _, _) => { toolExecutions++; return Task.FromResult("[]"); },
-            (_, _, _) => Task.FromResult(++repeatedPrompts == 1));
+            (_, _, _) => { repeatedPrompts++; return Task.FromResult(true); });
 
-        Assert.Equal(6, requests);
-        Assert.Equal(5, toolExecutions);
+        Assert.Equal(OpenAiCodeTaskLimits.MaxModelStepsPerTurn, requests);
+        Assert.Equal(requests, toolExecutions);
         Assert.Equal(2, repeatedPrompts);
-        Assert.Contains("same tool call repeated", result.Transcript);
+        Assert.Contains($"{OpenAiCodeTaskLimits.MaxModelStepsPerTurn}-request limit", result.Transcript);
     }
 
     [Fact]
diff --git a/DESIGN.md b/DESIGN.md
index 9d5baa4b..fbb66fd6 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -294,7 +294,7 @@ X-items are from section 7. Items in phase 1 to 3 do not depend on the Avalonia
 - **Queue/MCP cross-platform validation (2026-10-01).** At `109ca68`, [Windows CI #36883076376](https://github.com/jay23606/codev/actions/runs/36883076376) passed portable and Avalonia UI checks on Windows, Linux, and macOS, with the Windows build and native OAuth smoke also passing. [Desktop preview #36883077216](https://github.com/jay23606/codev/actions/runs/36883077216) passed self-contained packaging and launch checks for win-x64, linux-x64, osx-arm64, and osx-x64. GitHub Release publishing correctly skipped for the manual validation run.
 - **B2 Structured tool calls (partially implemented in Avalonia Code task).** Avalonia uses Ollama's native function calls with JSON-schema tool definitions. OpenAI Responses tools are converted to strict function schemas: object fields are required, nested objects disallow extra fields, and Codev's runtime argument validator retains the authoritative length/count limits. Every project tool rejects non-object arguments, non-string or missing fields, unknown fields, and values beyond per-field limits before file review or command approval; checklist arguments follow the same closed-field and size contract. Ollama conversation compaction requests a JSON Schema object containing the summary, validates the response and falls back to bounded plain text when schema formatting is rejected or malformed; status reports which path ran. Avalonia local-model Plan mode requests a bounded JSON Schema plan, validates and formats it, and retries with bounded plain text when structured output is unsupported or malformed. The five focused `OllamaStructuredPlanClientTests` passed on Windows Release, and an opt-in live Qwen3.6 Avalonia Plan-mode workflow passed 1/1; the app surfaced either structured output or its text fallback. The full Avalonia headless suite then passed 29/29, and after adding live Auto-path regressions passed 30/30. Cross-model compatibility and native UI QA remain. Hosted summaries remain provider-native text. Ollama documents a JSON Schema in the chat `format` field and recommends validating the returned content ([structured outputs](https://docs.ollama.com/capabilities/structured-outputs)).
 - **B3 Diff edits (implemented for Avalonia Code task).** The agent can propose a strict, single-file unified-hunk patch or a whole-file replacement. Patches are applied in memory with exact line/context checks and no fuzzy matching; malformed, mismatched, or file-header patches fail before review and leave the workspace unchanged. Valid patches show the original, proposed patch, and complete resulting file in one review, then use the same approval, checkpoint, and hash concurrency check as replacement edits. [Aider supports several edit formats](https://aider.chat/docs/) for the same token-efficiency motivation.
-- **B4 Step limit and loop detection (implemented in Avalonia and OpenAI Code task; manual QA remains).** Every Code task is capped at eight model steps per turn. A shared Core limit keeps the local Avalonia loop and hosted OpenAI loop aligned. Three consecutive identical tool requests, compared using canonicalized JSON arguments, pause for user confirmation; declining stops the task, and approval allows one more before the guard resets. Tests cover the OpenAI request cap, stopping on decline, reordered JSON properties, changed arguments, and allowing one repeated call before prompting again after three further identical calls. OpenCode's `doom_loop` permission uses the same three-identical-calls threshold ([permissions docs](https://opencode.ai/docs/permissions/)).
+- **B4 Step limit and loop detection (implemented in Avalonia and OpenAI Code task; manual QA remains).** Every Code task is capped at eight model steps per turn. A shared Core limit keeps the local Avalonia loop and hosted OpenAI loop aligned. Three consecutive identical tool requests, compared using canonicalized JSON arguments, reach the loop guard. Ask and Allowlist modes pause for confirmation; Auto approves the guard unless an exact saved project deny rule blocks the tool, then continues only up to the configured per-turn step limit. Tests cover both provider runners' step caps, stopping on decline, reordered JSON properties, changed arguments, and Auto continuation bounded by the shared cap. OpenCode's `doom_loop` permission uses the same three-identical-calls threshold, and Auto approves requests that are not explicitly denied ([permissions docs](https://opencode.ai/docs/permissions/)).
 - **B5 Test and lint loop (implemented in Avalonia Code task).** The model can propose a test or lint command through a distinct `verify_command` tool. Codev reports the exit code and bounded output in the transcript, and only identifies exit code 0 as a pass. In Auto, verification commands follow the same rule as other shell commands: they run without approval unless an exact saved deny rule blocks them. They may execute project-controlled code with full account access. In Ask-every-time and Allowlist modes, verification commands require approval unless an exact allow rule applies. Failure output returns to the model; up to two reviewed repair cycles are allowed, after which file edits and commands are blocked for that task. Verification is optional, not silently selected or run.
 - **B6 Show model thinking (implemented in Avalonia).** The per-conversation Think control sends Ollama's boolean `think` setting, captured with queued turns and backups. Returned `message.thinking` deltas are saved separately from the assistant answer and displayed in a collapsed, selectable Markdown section. Thinking text is omitted from subsequent prompts; hosted providers do not show it. Models that do not support a boolean thinking control follow Ollama's documented model default.
 - **B7 Sandbox research.** Codex separates *what a process may physically do* (read-only, workspace-write, full access) from *when it must ask*; Codev has only the second. Real sandboxing needs a different mechanism on each OS, and [Codex's own Windows sandbox write-up](https://openai.com/index/building-codex-windows-sandbox/) shows it is hard to get right. This item is research first: write down what each OS offers, prototype, and only then add a mode. No mode is described as safe until tested. The simplest cross-platform candidate to prototype first is running commands in a Docker or Podman container with the project mounted, which is what Gemini CLI offers as its sandbox option. It needs a container runtime installed, so make it optional and detect it.
diff --git a/docs/release-notes.md b/docs/release-notes.md
index d11f4776..c463d005 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -26,7 +26,8 @@ On Windows, extract the complete ZIP and run `Codev.Avalonia.exe`. On macOS or L
 - MCP settings are easier to recover when the saved file is malformed, oversized, duplicated, or blocked by a directory at the settings path. MCP tool, prompt, resource, and resource-template activity is grouped into readable, expandable transcript details.
 - Linux accessibility support is improved through Avalonia 12 and an AT-SPI tree. The sidebar search has an associated accessible label, and the Markdown renderer has been updated.
 - Regression coverage now exercises Auto-mode file application and command execution, MCP activity, and scoped profile behavior across hosted Windows, Linux, and macOS checks.
-- Auto falls back to Ask when saved project permission data cannot be read or safely written, and the review explains why. Conversations can be dragged to reorder within Pinned or Recents, with order remembered after restart.
+- Auto falls back to Ask when saved project permission data cannot be read or safely written, and the review explains why. Repeated identical tool calls no longer trigger an extra prompt in Auto; the shared per-turn step limit and exact project Deny rules still apply.
+- Conversations and child sessions can be dragged to reorder within their sidebar group, with order remembered after restart.
 
 ## Included capabilities
 
diff --git a/scripts/smoke-packaged-windows-app.ps1 b/scripts/smoke-packaged-windows-app.ps1
index 5ef8c6ac..9f03d942 100644
--- a/scripts/smoke-packaged-windows-app.ps1
+++ b/scripts/smoke-packaged-windows-app.ps1
@@ -1050,9 +1050,33 @@ function Invoke-MoreSubmenuItem($Window, [string]$SectionName, [string]$ItemName
         Start-Sleep -Milliseconds 50
     } while ([DateTime]::UtcNow -lt $deadline)
     if ($null -eq $item) { throw "The '$SectionName' submenu did not expose '$ItemName'." }
-    $itemBounds = $item.Current.BoundingRectangle
-    if ($itemBounds.IsEmpty -or $itemBounds.Width -le 0 -or $itemBounds.Height -le 0) {
-        throw "The '$SectionName' submenu item '$ItemName' has no clickable screen bounds."
+    # Native menu flyouts can still be moving when UI Automation first reports
+    # the submenu item. Reacquire it until its screen bounds are stable so the
+    # pointer does not click where the item was before the flyout settled.
+    $itemBounds = $null
+    $previousBounds = $null
+    $stableBoundsDeadline = [DateTime]::UtcNow.AddSeconds(3)
+    do {
+        Start-Sleep -Milliseconds 100
+        $freshItems = Find-AppElementsWithRetry -ProcessId $Window.Current.ProcessId -Condition $menuCondition -TimeoutMilliseconds 500
+        foreach ($freshItem in $freshItems) {
+            try {
+                if ($freshItem.Current.Name -ne $ItemName -or $freshItem.Current.IsOffscreen) { continue }
+                $freshBounds = $freshItem.Current.BoundingRectangle
+                if ($freshBounds.IsEmpty -or $freshBounds.Width -le 0 -or $freshBounds.Height -le 0) { continue }
+                if ($null -ne $previousBounds -and $freshBounds.Equals($previousBounds)) {
+                    $item = $freshItem
+                    $itemBounds = $freshBounds
+                    break
+                }
+                $previousBounds = $freshBounds
+            }
+            catch { }
+        }
+        if ($null -ne $itemBounds) { break }
+    } while ([DateTime]::UtcNow -lt $stableBoundsDeadline)
+    if ($null -eq $itemBounds) {
+        throw "The '$SectionName' submenu item '$ItemName' did not settle at a clickable screen position."
     }
     # Avalonia's native MenuFlyout items have intermittently accepted focus plus
     # Enter without raising Click (the persisted setting then remains unchanged).