Merge pull request #35 from Cai-Tang-www/fork-pr-387-1776830001

fix(tools): allow remembered low-risk external write retry

Author: Cai-Tang-www

internal/tools/manager.go

@@ -331,21 +331,23 @@ func (m *DefaultManager) Execute(ctx context.Context, input ToolCallInput) (Tool
 		return result, permissionErrorFromDecision(decision)
 	}
 
-	plan, err := m.sandbox.Check(ctx, action)
-	if err != nil {
-		if decision, decisionMatched := resolveSandboxOutsideWriteDecision(input, action, err, m.sessionDecisions); decisionMatched {
-			if decision.Decision != security.DecisionAllow {
-				result := blockedToolResult(input, decision)
-				return result, permissionErrorFromDecision(decision)
+		plan, err := m.sandbox.Check(ctx, action)
+		if err != nil {
+			if decision, decisionMatched := resolveSandboxOutsideWriteDecision(input, action, err, m.sessionDecisions); decisionMatched {
+				if decision.Decision != security.DecisionAllow {
+					result := blockedToolResult(input, decision)
+					return result, permissionErrorFromDecision(decision)
+				}
+				m.auditCapabilityDecision(action, string(security.DecisionAllow), decision.Reason)
+				return m.executor.Execute(ctx, input)
+			} else {
+				result := NewErrorResult(input.Name, "workspace sandbox rejected action", sandboxErrorDetails(action, err), actionMetadata(action))
+				result.ToolCallID = input.ID
+				return result, err
 			}
-		} else {
-			result := NewErrorResult(input.Name, "workspace sandbox rejected action", sandboxErrorDetails(action, err), actionMetadata(action))
-			result.ToolCallID = input.ID
-			return result, err
+		} else if plan != nil {
+			input.WorkspacePlan = plan
 		}
-	} else if plan != nil {
-		input.WorkspacePlan = plan
-	}
 	m.auditCapabilityDecision(action, string(security.DecisionAllow), "")
 
 	return m.executor.Execute(ctx, input)

internal/tools/manager_test.go

@@ -453,7 +453,7 @@ func TestDefaultManagerSandboxOutsideWriteSessionMemory(t *testing.T) {
 
 	_, err = manager.Execute(context.Background(), input)
 	if err != nil {
-		t.Fatalf("expected remembered allow retry to pass, got %v", err)
+		t.Fatalf("expected remembered allow retry to execute, got %v", err)
 	}
 	if writeTool.callCount != 1 {
 		t.Fatalf("expected write tool to execute after remembered allow, got %d", writeTool.callCount)